Commit93bd099

committed

Fix language service unit tests

1 parentadb4fa2 commit93bd099Copy full SHA for 93bd099

File tree

+11

-8

lines changed

+11

-8

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ open Microsoft.FSharp.Compiler.Layout`
`36`	`36`	`openMicrosoft.FSharp.Compiler.PrettyNaming`
`37`	`37`
`38`	`38`	`[<AutoOpen>]`
`39`		`-moduleprivatePrintUtilities=`
	`39`	`+moduleinternalPrintUtilities=`
`40`	`40`	`letbracketIfL x lyt=if xthen bracketL lytelse lyt`
`41`	`41`	`letsquareAngleL x= leftL"[<"^^ x^^ rightL">]"`
`42`	`42`	`letangleL x= sepL"<"^^ x^^ rightL">"`
`@@ -70,7 +70,6 @@ module private PrintUtilities =`
`70`	`70`	`\|[x]->[resultFunction x(layoutFunction x)]`
`71`	`71`	`\|(x:: rest)->[ resultFunction x(layoutFunction x-- leftL(match rest.Lengthwith1-> FSComp.SR.nicePrintOtherOverloads1()\| n-> FSComp.SR.nicePrintOtherOverloadsN(n)))]`
`72`	`72`	`\|_->[]`
`73`		`-`
`74`	`73`
`75`	`74`	`letlayoutTyconRefImpl isAttribute(denv:DisplayEnv)(tcref:TyconRef)=`
`76`	`75`	`letdemangled=`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,11 @@ module internal Params =`
`110`	`110`	`"","", pty`
`111`	`111`	`// Layout a named argument`
`112`	`112`	`\| Some nm,_,_->`
`113`		`-letprefix=if isParamArrayArgthen sprintf"params%s:" nmelse sprintf"%s:" nm`
	`113`	`+letprefix=`
	`114`	`+if isParamArrayArgthen`
	`115`	`+ sprintf"%s%s:"(NicePrint.PrintUtilities.layoutBuiltinAttribute denv denv.g.attrib_ParamArrayAttribute\|> showL) nm`
	`116`	`+else`
	`117`	`+ sprintf"%s:" nm`
`114`	`118`	`nm, prefix,pty)`
`115`	`119`	`\|> List.unzip3`
`116`	`120`	`letparamTypeAndRetLs,_= NicePrint.layoutPrettifiedTypes denv(paramTypes@[rty])`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ let x =`
`273`	`273`	`CheckErrorList content<\|`
`274`	`274`	`fun errors->`
`275`	`275`	`Assert.AreEqual(1, List.length errors)`
`276`		`- assertContains errors"A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: System.Console.WriteLine(buffer: char []) : unit, System.Console.WriteLine(format: string,params arg: obj []) : unit, System.Console.WriteLine(value: obj) : unit, System.Console.WriteLine(value: string) : unit"`
	`276`	`+ assertContains errors"A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: System.Console.WriteLine(buffer: char []) : unit, System.Console.WriteLine(format: string,[<System.ParamArray>] arg: obj []) : unit, System.Console.WriteLine(value: obj) : unit, System.Console.WriteLine(value: string) : unit"`
`277`	`277`
`278`	`278`	`[<Test>]`
`279`	`279`	memberpublicthis.``InvalidMethodOverload2``()=

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1745,7 +1745,7 @@ We really need to rewrite some code paths here to use the real parse tree rather`
`1745`	`1745`	`)`
`1746`	`1746`	`\|> Seq.tryFind(fun(i,_)-> i=2)`
`1747`	`1747`	`match overloadWithTwoParamsOptwith`
`1748`		`-\| Some(_,[_;(_name, display,_description)])-> Assert.IsTrue(display.Contains("params args"))`
	`1748`	`+\| Some(_,[_;(_name, display,_description)])-> Assert.IsTrue(display.Contains("[<System.ParamArray>] args"))`
`1749`	`1749`	`\| x-> Assert.Fail(sprintf"Expected overload not found, current result%A" x)`
`1750`	`1750`
`1751`	`1751`	`(* DotNet functions for multi-parameterinfo tests --------------------------------------------------*)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ type QuickInfoTests() =`
`466`	`466`	`letfileContents="""`
`467`	`467`	`let t = "a".Split('c')"""`
`468`	`468`
`469`		`- this.AssertQuickInfoContainsAtEndOfMarker(fileContents,"Spl","params separator")`
	`469`	`+ this.AssertQuickInfoContainsAtEndOfMarker(fileContents,"Spl","[<System.ParamArray>] separator")`
`470`	`470`
`471`	`471`	`[<Test>]`
`472`	`472`	`[<Category("TypeProvider")>]`
`@@ -919,7 +919,7 @@ type QuickInfoTests() =`
`919`	`919`	`type A() =`
`920`	`920`	`static member Foo([<System.ParamArrayAttribute>] a : int[]) = ()`
`921`	`921`	`let r = A.Foo(42)""",`
`922`		`-"type A","params a:")`
	`922`	`+"type A","[<ParamArray>] a:")`
`923`	`923`
`924`	`924`	`[<Test>]`
`925`	`925`	memberpublicthis.``ParamsArrayArgument.OnMethod``()=
`@@ -928,7 +928,7 @@ type QuickInfoTests() =`
`928`	`928`	`type A() =`
`929`	`929`	`static member Foo([<System.ParamArrayAttribute>] a : int[]) = ()`
`930`	`930`	`let r = A.Foo(42)""",`
`931`		`-"A.Foo","params a:")`
	`931`	`+"A.Foo","[<System.ParamArray>] a:")`
`932`	`932`
`933`	`933`	`[<Test>]`
`934`	`934`	memberpublicthis.``Regression.AccessorMutator.Bug4903e``()=

Comments

(0)