Make matched brace highlighting work exactly as in C# editor (dotnet#…

…5049) * make matched brace highlighting work exactly as in C# editor * fix tests * Add optional param for formatting * revert matching braces logic in FSharpEditorFormattingService * add missing test attributes * Revert "revert matching braces logic in FSharpEditorFormattingService" This reverts commit 5ddaba3.
xamarin · Jun 5, 2018 · 05d3884 · 05d3884
1 parent 6542cca
commit 05d3884
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Formatting/BraceMatchingService.fs b/Formatting/BraceMatchingService.fs
@@ -2,10 +2,10 @@
 
 namespace Microsoft.VisualStudio.FSharp.Editor
 
-open System
 open System.ComponentModel.Composition
 open Microsoft.CodeAnalysis.Editor
 open Microsoft.FSharp.Compiler.SourceCodeServices
+open System.Runtime.InteropServices
 
 [<ExportBraceMatcher(FSharpConstants.FSharpLanguageName)>]
 type internal FSharpBraceMatchingService 
@@ -14,19 +14,21 @@ type internal FSharpBraceMatchingService
         checkerProvider: FSharpCheckerProvider,
         projectInfoManager: FSharpProjectOptionsManager
     ) =
-
 
     static let defaultUserOpName = "BraceMatching"
 
-    static member GetBraceMatchingResult(checker: FSharpChecker, sourceText, fileName, parsingOptions: FSharpParsingOptions, position: int, userOpName: string) = 
+    static member GetBraceMatchingResult(checker: FSharpChecker, sourceText, fileName, parsingOptions: FSharpParsingOptions, position: int, userOpName: string, [<Optional; DefaultParameterValue(false)>] forFormatting: bool) = 
         async {
             let! matchedBraces = checker.MatchBraces(fileName, sourceText.ToString(), parsingOptions, userOpName)
             let isPositionInRange range = 
                 match RoslynHelpers.TryFSharpRangeToTextSpan(sourceText, range) with
                 | None -> false
-                | Some range ->
-                    let length = position - range.Start
-                    length >= 0 && length <= range.Length
+                | Some span ->
+                    if forFormatting then
+                        let length = position - span.Start
+                        length >= 0 && length <= span.Length
+                    else
+                        span.Contains position
             return matchedBraces |> Array.tryFind(fun (left, right) -> isPositionInRange left || isPositionInRange right)
         }
 

diff --git a/Formatting/EditorFormattingService.fs b/Formatting/EditorFormattingService.fs
@@ -50,7 +50,7 @@ type internal FSharpEditorFormattingService
                     x.Tag <> FSharpTokenTag.LINE_COMMENT)
 
             let! (left, right) =
-                FSharpBraceMatchingService.GetBraceMatchingResult(checker, sourceText, filePath, parsingOptions, position, "FormattingService")
+                FSharpBraceMatchingService.GetBraceMatchingResult(checker, sourceText, filePath, parsingOptions, position, "FormattingService", forFormatting=true)
 
             if right.StartColumn = firstMeaningfulToken.LeftColumn then
                 // Replace the indentation on this line with the indentation of the left bracket