Commit4abb633

authored and

committed

InlineRenameService adds/removes double backtickes automatically (dotnet#2236)

1 parentf0e945c commit4abb633Copy full SHA for 4abb633

File tree

+12

-7

lines changed

+12

-7

lines changed

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -342,12 +342,16 @@ module Keywords =`
`342`	`342`	`\|_->`
`343`	`343`	`IdentifierToken args lexbuf s`
`344`	`344`
	`345`	`+let inlineprivateDoesIdentifierNeedQuotation(s:string):bool=`
	`346`	`+not(String.forall IsIdentifierPartCharacter s)// if it has funky chars`
	`347`	`+\|\| s.Length>0&&(not(IsIdentifierFirstCharacter s.[0]))// or if it starts with a non-(letter-or-underscore)`
	`348`	`+\|\| keywordTable.ContainsKey s// or if it's a language keyword like "type"`
	`349`	`+`
`345`	`350`	`/// A utility to help determine if an identifier needs to be quoted`
`346`	`351`	`letQuoteIdentifierIfNeeded(s:string):string=`
`347`		`-ifnot(String.forall IsIdentifierPartCharacter s)// if it has funky chars`
`348`		`-\|\| s.Length>0&&(not(IsIdentifierFirstCharacter s.[0]))// or if it starts with a non-(letter-or-underscore)`
`349`		`-\|\| keywordTable.ContainsKey s// or if it's a language keyword like "type"`
`350`		-then"``"+s+"``"// then it needs to be ``quoted``
`351`		`-else s`
`352`		`-`
	`352`	+if DoesIdentifierNeedQuotation sthen"``"+ s+"``"else s
`353`	`353`
	`354`	`+/// Quote identifier with double backticks if needed, remove unnecessary double backticks quotation.`
	`355`	`+letNormalizeIdentifierBackticks(s:string):string=`
	`356`	+lets=if s.StartsWith"``"&& s.EndsWith"``"then s.[2..s.Length-3]else s
	`357`	`+ QuoteIdentifierIfNeeded s`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,6 @@ module Keywords =`
`67`	`67`	`valKeywordOrIdentifierToken:lexargs->UnicodeLexing.Lexbuf->string->Parser.token`
`68`	`68`	`valIdentifierToken:lexargs->UnicodeLexing.Lexbuf->string->Parser.token`
`69`	`69`	`valQuoteIdentifierIfNeeded:string->string`
	`70`	`+valNormalizeIdentifierBackticks:string->string`
`70`	`71`	`valkeywordNames:string list`
`71`	`72`	`valkeywordTypes:Set<string>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ type internal InlineRenameInfo`
`105`	`105`	`member__.DisplayName= symbolUse.Symbol.DisplayName`
`106`	`106`	`member__.FullDisplayName=try symbolUse.Symbol.FullNamewith_-> symbolUse.Symbol.DisplayName`
`107`	`107`	`member__.Glyph= Glyph.MethodPublic`
`108`		`-member__.GetFinalSymbolName replacementText= replacementText`
	`108`	`+member__.GetFinalSymbolName replacementText=Lexhelp.Keywords.NormalizeIdentifierBackticksreplacementText`
`109`	`109`
`110`	`110`	`member__.GetReferenceEditSpan(location,cancellationToken)=`
`111`	`111`	`lettext= getDocumentText location.Document cancellationToken`

Comments

(0)