Commit987850b

Vasily Kirichenko

authored and

Vasily Kirichenko

committed

fix tests

1 parent8cb7ec2 commit987850bCopy full SHA for 987850b

File tree

2 files changed

+11

-16

lines changed

vsintegration
- src/FSharp.Editor/Formatting
  - BraceMatchingService.fs
- tests/UnitTests
  - BraceMatchingServiceTests.fs

2 files changed

+11

-16

lines changed

`‎vsintegration/src/FSharp.Editor/Formatting/BraceMatchingService.fs‎`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespaceMicrosoft.VisualStudio.FSharp.Editor`
`4`	`4`
`5`		`-openSystem`
`6`	`5`	`openSystem.ComponentModel.Composition`
`7`	`6`	`openMicrosoft.CodeAnalysis.Editor`
`8`	`7`	`openMicrosoft.FSharp.Compiler.SourceCodeServices`
`@@ -14,7 +13,6 @@ type internal FSharpBraceMatchingService`
`14`	`13`	`checkerProvider: FSharpCheckerProvider,`
`15`	`14`	`projectInfoManager: FSharpProjectOptionsManager`
`16`	`15`	`)=`
`17`		`-`
`18`	`16`
`19`	`17`	`static letdefaultUserOpName="BraceMatching"`
`20`	`18`

`‎vsintegration/tests/UnitTests/BraceMatchingServiceTests.fs‎`

Lines changed: 11 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,26 +161,23 @@ let main argv =`
`161`	`161`	`0 // return an integer exit code"""`
`162`	`162`	`this.VerifyBraceMatch(code,"(printfn",")endBrace")`
`163`	`163`
`164`		`-[<TestCase("let a1 = [ 0 .. 100 ]",[\|9;10;20;21\|])>]`
`165`		`-[<TestCase("let a2 = [\| 0 .. 100 \|]",[\|9;10;11;21;22;23\|])>]`
`166`		`-[<TestCase("let a3 = <@ 0 @>",[\|9;10;11;14;15;16\|])>]`
`167`		`-[<TestCase("let a4 = <@@ 0 @@>",[\|9;10;11;12;15;15;16;17\|])>]`
`168`		`-[<TestCase("let a6 = ( () )",[\|9;10;16;17\|])>]`
`169`		`-[<TestCase("[<ReflectedDefinition>]\nlet a7 = 70",[\|0;1;2;21;22;23\|])>]`
`170`		`-[<TestCase("let a8 = seq { yield() }",[\|13;14;23;24\|])>]`
`171`		`-memberthis.BraceMatchingBothSides_Bug2092(fileContents:string,matchingPositions:int[])=`
`172`		`-// https://github.com/Microsoft/visualfsharp/issues/2092`
	`164`	`+[<TestCase("let a1 = [ 0 .. 100 ]",[\|9;20\|])>]`
	`165`	`+[<TestCase("let a2 = [\| 0 .. 100 \|]",[\|9;10;22\|])>]`
	`166`	`+[<TestCase("let a3 = <@ 0 @>",[\|9;10;15\|])>]`
	`167`	`+[<TestCase("let a4 = <@@ 0 @@>",[\|9;10;11;15;16\|])>]`
	`168`	`+[<TestCase("let a6 = ( () )",[\|9;16\|])>]`
	`169`	`+[<TestCase("[<ReflectedDefinition>]\nlet a7 = 70",[\|0;1;22\|])>]`
	`170`	`+[<TestCase("let a8 = seq { yield() }",[\|13;23\|])>]`
	`171`	`+memberthis.DoNotMatchOnInnerSide(fileContents:string,matchingPositions:int[])=`
`173`	`172`	`letsourceText= SourceText.From(fileContents)`
`174`		`-`
`175`	`173`	`letparsingOptions,_= checker.GetParsingOptionsFromProjectOptions projectOptions`
`176`		`-matchingPositions`
`177`		`-\|> Array.iter(fun position->`
	`174`	`+`
	`175`	`+for positionin matchingPositionsdo`
`178`	`176`	`match FSharpBraceMatchingService.GetBraceMatchingResult(checker, sourceText, fileName, parsingOptions, position,"UnitTest")\|> Async.RunSynchronouslywith`
`179`	`177`	`\| Some_->()`
`180`	`178`	`\| None->`
`181`	`179`	`match positionwith`
`182`	`180`	`\|0->""`
`183`	`181`	`\|_-> fileContents.[position-1]\|> sprintf" (previous character '%c')"`
`184`		`-\|> sprintf"Didn't find a matching brace at position '%d', character '%c'%s" position fileContents.[position]`
	`182`	`+\|> sprintf"Didn't find a matching brace at position '%d'%s" position`
`185`	`183`	`\|> Assert.Fail`
`186`		`-)`

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!

Commit987850b

File tree

2 files changed

2 files changed

`‎vsintegration/src/FSharp.Editor/Formatting/BraceMatchingService.fs‎`

`‎vsintegration/tests/UnitTests/BraceMatchingServiceTests.fs‎`

0 commit comments