Skip to content

Commit b07255a

Browse files
committed
More test fixes
1 parent 4490446 commit b07255a

17 files changed

+92
-133
lines changed

tests/fsharp/core/attributes/testlib.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#light
1+
22

33
module TestLibModule
44

tests/fsharp/core/members/basics-hw/test.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// #Regression #Conformance #SignatureFiles #Classes #ObjectConstructors #ObjectOrientedTypes #Fields #MemberDefinitions #MethodsAndProperties #Unions #InterfacesAndImplementations #Events #Overloading #Recursion #Regression
22

3-
#light
3+
44

55
#if TESTS_AS_APP
66
module Core_members_basics

tests/fsharp/regression/4715/env.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#light
1+
22
[<RequireQualifiedAccess>]
33
module app.env
44

tests/fsharp/regression/4715/main.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#light
1+
22
module app.main
33

44
open System
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
neg42.fsi(2,20,3,1): parse error FS0010: Incomplete structured construct at or before this point in signature file. Expected ':', '=' or other token.
2+
neg42.fsi(2,20,3,1): parse error FS0010: Incomplete structured construct at or before this point in signature file. Expected '=' or other token.

vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6557,12 +6557,6 @@ let rec f l =
65576557
fileContents = """#nowarn(*MarkerPreProcessNowarn*)""",
65586558
marker = "(*MarkerPreProcessNowarn*)")
65596559

6560-
[<Fact>]
6561-
member this.``MacroDirectives.light``() =
6562-
this.VerifyDotCompListIsEmptyAtStartOfMarker(
6563-
fileContents = """#light(*MarkerPreProcessLight*)""",
6564-
marker = "(*MarkerPreProcessLight*)")
6565-
65666560
[<Fact>]
65676561
member this.``MacroDirectives.define``() =
65686562
this.VerifyDotCompListIsEmptyAtStartOfMarker(

vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ type staticInInterface =
538538
let solution = this.CreateSolution()
539539
let project = CreateProject(solution,"testproject")
540540
SetVersionFile(project,"nonexistent")
541-
let file = AddFileFromText(project,"File1.fs",["#light"])
541+
let file = AddFileFromText(project,"File1.fs",[])
542542
let file = OpenFile(project,"File1.fs")
543543
TakeCoffeeBreak(this.VS) // Wait for the background compiler to catch up.
544544
VerifyErrorListContainedExpectedStr("nonexistent",project)
@@ -547,7 +547,7 @@ type staticInInterface =
547547
member public this.``BackgroundComplier``() =
548548
this.VerifyErrorListCountAtOpenProject(
549549
fileContents = """
550-
#light
550+
551551
552552
module Test
553553
@@ -807,7 +807,7 @@ type staticInInterface =
807807

808808
(* TODO why does this portion not work? specifically, last assert fails
809809
printfn "changing file..."
810-
ReplaceFileInMemory file1 ["#light"
810+
ReplaceFileInMemory file1 [
811811
"let xx = \"foo\"" // now x is string
812812
"printfn \"hi\""]
813813

vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.General.fs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ type UsingMSBuild() =
117117
let solution = this.CreateSolution()
118118
let project = CreateProject(solution,"testproject")
119119
let file1 = AddFileFromTextEx(project, @"..\LINK.FS", @"..\link.fs", BuildAction.Compile,
120-
["#light"
120+
[
121121
"type Bob() = "
122122
" let x = 1"])
123123
let file1 = OpenFile(project, @"..\link.fs")
@@ -196,19 +196,19 @@ type UsingMSBuild() =
196196
[<Fact>]
197197
member public this.``Salsa.ReplaceAllText``() =
198198
let code =
199-
["#light";
199+
["//";
200200
"let x = \"A String Literal\""]
201201
let (_solution, _project, file) = this.CreateSingleFileProject(code)
202202

203203
// Sanity check
204-
MoveCursorToStartOfMarker(file,"#light")
204+
MoveCursorToStartOfMarker(file,"//")
205205
AssertEqual(TokenType.PreprocessorKeyword, GetTokenTypeAtCursor(file))
206206
MoveCursorToEndOfMarker(file,"let x = ")
207207
AssertEqual(TokenType.String, GetTokenTypeAtCursor(file))
208208

209209
// Replace file contents
210210
ReplaceFileInMemory file
211-
["#light";
211+
[
212212
"let x = 42 // comment!";
213213
"let y = \"A String Literal\""]
214214

@@ -292,7 +292,7 @@ type UsingMSBuild() =
292292
member public this.``ExhaustivelyScrutinize.Bug2277``() =
293293
Helper.ExhaustivelyScrutinize(
294294
this.TestRunner,
295-
["#light"
295+
[
296296
"open Microsoft.FSharp.Plot.Excel"
297297
"open Microsoft.FSharp.Plot.Interactive"
298298
"let ps = [| (1.,\"c\"); (-2.,\"p\") |]"
@@ -306,7 +306,7 @@ type UsingMSBuild() =
306306
member public this.``ExhaustivelyScrutinize.Bug2283``() =
307307
Helper.ExhaustivelyScrutinize(
308308
this.TestRunner,
309-
["#light"
309+
[
310310
"#r \"NestedClasses.dll\"" // Scenario requires this assembly not exist.
311311
"//753 atomType -> atomType DOT path typeArgs"
312312
"let specificIdent (x : RootNamespace.ClassOfT<int>.NestedClassOfU<string>) = x"

vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.GotoDefinition.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ type UsingMSBuild() =
671671
/// exp = (<expected line>, <expected identifier>) option
672672
member internal this.SolutionGotoDefinitionTestWithSimpleFile (startLoc : string)(exp : (string * string) option) : unit =
673673
let lines =
674-
[ "#light"
674+
[
675675
"let _ = 3"
676676
"let _ = \"hi\""
677677
"let _ = 2 + 3"
@@ -1290,7 +1290,7 @@ type UsingMSBuild() =
12901290
[<Fact>]
12911291
member this.``GotoDefinition.ObjectOriented.StructConstructor`` () =
12921292
let lines =
1293-
[ "#light"
1293+
[
12941294
"[<Struct>]"
12951295
"type Astruct(x:int, y:int) ="
12961296
" [<DefaultValue()>]"

vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.NavigationBar.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type UsingMSBuild() =
1717
(* Files for testing and tests --------------------------------------------------------- *)
1818

1919
let NavigationFile1 =
20-
[ "#light"
20+
[
2121
"module Example.Module"
2222
""
2323
"module SomeModule = "
@@ -39,7 +39,7 @@ type UsingMSBuild() =
3939
" type EnumOneLine = (*5s*)| OUAaa = 0 | OUBbb = 3(*5e*)" ]
4040

4141
let NavigationFile2 =
42-
[ "#light"
42+
[
4343
"module A = "
4444
""
4545
" type RecWith = (*7s*){ "

0 commit comments

Comments
 (0)