Commitb2f3b4d

vasily-kirichenko

authored and

KevinRansom

committed

PrefixUnusedValueWithUnderscore Code Fix does not trigger on operators and backticked identifiers (dotnet#2424)

1 parent09a8c60 commitb2f3b4dCopy full SHA for b2f3b4d

File tree

2 files changed

+14

-5

lines changed

vsintegration/src/FSharp.Editor
- CodeFix
  - PrefixUnusedValueWithUnderscore.fs
- DocumentHighlights
  - DocumentHighlightsService.fs

2 files changed

+14

-5

lines changed

`‎vsintegration/src/FSharp.Editor/CodeFix/PrefixUnusedValueWithUnderscore.fs‎`

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ open Microsoft.CodeAnalysis.Text`
`12`	`12`	`openMicrosoft.CodeAnalysis.CodeFixes`
`13`	`13`	`openMicrosoft.CodeAnalysis.CodeActions`
`14`	`14`
	`15`	`+openMicrosoft.FSharp.Compiler`
	`16`	`+`
`15`	`17`	`[<ExportCodeFixProvider(FSharpCommonConstants.FSharpLanguageName, Name="PrefixUnusedValueWithUnderscore"); Shared>]`
`16`	`18`	`typeinternalFSharpPrefixUnusedValueWithUnderscoreCodeFixProvider()=`
`17`	`19`	`inherit CodeFixProvider()`
`@@ -30,8 +32,14 @@ type internal FSharpPrefixUnusedValueWithUnderscoreCodeFixProvider() =`
`30`	`32`	`override__.FixableDiagnosticIds= fixableDiagnosticIds.ToImmutableArray()`
`31`	`33`
`32`	`34`	`override__.RegisterCodeFixesAsync context:Task=`
`33`		`-async{`
`34`		`-letdiagnostics=(context.Diagnostics\|> Seq.filter(fun x-> fixableDiagnosticIds\|> List.contains x.Id)).ToImmutableArray()`
`35`		`- context.RegisterCodeFix(createCodeFix(SR.PrefixValueNameWithUnderscore.Value, context, TextChange(TextSpan(context.Span.Start,0),"_")), diagnostics)`
`36`		`- context.RegisterCodeFix(createCodeFix(SR.RenameValueToUnderscore.Value, context, TextChange(context.Span,"_")), diagnostics)`
	`35`	`+async{`
	`36`	`+let!sourceText= context.Document.GetTextAsync()`
	`37`	`+letident= sourceText.ToString(context.Span)`
	`38`	`+// Prefixing operators and backticked identifiers does not make sense.`
	`39`	+// We have to use the additional check for backtickes because `IsOperatorOrBacktickedName` operates on display names
	`40`	`+// where backtickes are replaced with parens.`
	`41`	+ifnot(PrettyNaming.IsOperatorOrBacktickedName ident)&&not(ident.StartsWith"``")then
	`42`	`+letdiagnostics=(context.Diagnostics\|> Seq.filter(fun x-> fixableDiagnosticIds\|> List.contains x.Id)).ToImmutableArray()`
	`43`	`+ context.RegisterCodeFix(createCodeFix(SR.PrefixValueNameWithUnderscore.Value, context, TextChange(TextSpan(context.Span.Start,0),"_")), diagnostics)`
	`44`	`+ context.RegisterCodeFix(createCodeFix(SR.RenameValueToUnderscore.Value, context, TextChange(context.Span,"_")), diagnostics)`
`37`	`45`	`}\|> CommonRoslynHelpers.StartAsyncUnitAsTask(context.CancellationToken)`

`‎vsintegration/src/FSharp.Editor/DocumentHighlights/DocumentHighlightsService.fs‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ open Microsoft.CodeAnalysis.Host.Mef`
`15`	`15`	`openMicrosoft.CodeAnalysis.Text`
`16`	`16`
`17`	`17`	`openMicrosoft.FSharp.Compiler.SourceCodeServices`
	`18`	`+openMicrosoft.FSharp.Compiler.Range`
`18`	`19`
`19`	`20`	`typeinternalFSharpHighlightSpan=`
`20`	`21`	`{ IsDefinition:bool`
`@@ -56,7 +57,7 @@ type internal FSharpDocumentHighlightsService [<ImportingConstructor>] (checkerP`
`56`	`57`	`asyncMaybe{`
`57`	`58`	`lettextLine= sourceText.Lines.GetLineFromPosition(position)`
`58`	`59`	`lettextLinePos= sourceText.Lines.GetLinePosition(position)`
`59`		`-letfcsTextLineNumber= textLinePos.Line+1`
	`60`	`+letfcsTextLineNumber=Line.fromZtextLinePos.Line`
`60`	`61`	`let!symbol= CommonHelpers.getSymbolAtPosition(documentKey, sourceText, position, filePath, defines, SymbolLookupKind.Greedy)`
`61`	`62`	`let!_,_,checkFileResults= checker.ParseAndCheckDocument(filePath, textVersionHash, sourceText.ToString(), options, allowStaleResults=true)`
`62`	`63`	`let!symbolUse= checkFileResults.GetSymbolUseAtLocation(fcsTextLineNumber, symbol.Ident.idRange.EndColumn, textLine.ToString(), symbol.FullIsland)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb2f3b4d

File tree

2 files changed

2 files changed

`‎vsintegration/src/FSharp.Editor/CodeFix/PrefixUnusedValueWithUnderscore.fs‎`

`‎vsintegration/src/FSharp.Editor/DocumentHighlights/DocumentHighlightsService.fs‎`

0 commit comments