Skip to content

A perf improvement in a code fix #15617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2023
Merged

A perf improvement in a code fix #15617

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions vsintegration/src/FSharp.Editor/CodeFixes/ChangePrefixNegationToInfixSubtraction.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Microsoft.VisualStudio.FSharp.Editor

open System
open System.Composition
open System.Collections.Immutable
open System.Text.RegularExpressions

open Microsoft.CodeAnalysis.Text
open Microsoft.CodeAnalysis.CodeFixes
Expand All @@ -17,6 +17,12 @@ type internal ChangePrefixNegationToInfixSubtractionCodeFixProvider() =

static let title = SR.ChangePrefixNegationToInfixSubtraction()

static let rec findNextNonWhitespacePos (sourceText: SourceText) pos =
if pos < sourceText.Length && Char.IsWhiteSpace sourceText[pos] then
findNextNonWhitespacePos sourceText (pos + 1)
else
pos

override _.FixableDiagnosticIds = ImmutableArray.Create "FS0003"

override this.RegisterCodeFixesAsync context = context.RegisterFsharpFix this
Expand All @@ -28,19 +34,16 @@ type internal ChangePrefixNegationToInfixSubtractionCodeFixProvider() =

// in a line like "... x -1 ...",
// squiggly goes for "x", not for "-", hence we search for "-"
let remainingText = $"{sourceText.GetSubText(context.Span.End)}"
let pattern = @"^\s+(-)"

match Regex.Match(remainingText, pattern) with
| m when m.Success ->
let spacePlace = context.Span.End + m.Groups[1].Index + 1
let pos = findNextNonWhitespacePos sourceText (context.Span.End + 1)

if sourceText[pos] <> '-' then
return None
else
return
Some
{
Name = CodeFix.ChangePrefixNegationToInfixSubtraction
Message = title
Changes = [ TextChange(TextSpan(spacePlace, 0), " ") ]
Changes = [ TextChange(TextSpan(pos + 1, 0), " ") ]
}
| _ -> return None
}