Commit5ddaba3

committed

revert matching braces logic in FSharpEditorFormattingService

1 parent987850b commit5ddaba3Copy full SHA for 5ddaba3

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,16 @@ type internal FSharpEditorFormattingService`
`49`	`49`	`x.Tag<> FSharpTokenTag.COMMENT&&`
`50`	`50`	`x.Tag<> FSharpTokenTag.LINE_COMMENT)`
`51`	`51`
`52`		`-let!(left,right)=`
`53`		`- FSharpBraceMatchingService.GetBraceMatchingResult(checker, sourceText, filePath, parsingOptions, position,"FormattingService")`
	`52`	`+let!matchedBraces= checker.MatchBraces(filePath, sourceText.ToString(), parsingOptions,"FormattingService")\|> liftAsync`
	`53`	`+`
	`54`	`+letisPositionInRange range=`
	`55`	`+match RoslynHelpers.TryFSharpRangeToTextSpan(sourceText, range)with`
	`56`	`+\| None->false`
	`57`	`+\| Some span->`
	`58`	`+letlength= position- span.Start`
	`59`	`+ length>=0&& length<= span.Length`
	`60`	`+`
	`61`	`+let!left,right= matchedBraces\|> Array.tryFind(fun(left,right)-> isPositionInRange left\|\| isPositionInRange right)`
`54`	`62`
`55`	`63`	`if right.StartColumn= firstMeaningfulToken.LeftColumnthen`
`56`	`64`	`// Replace the indentation on this line with the indentation of the left bracket`

Comments

(0)