Skip to content

Commit 392f30f

Browse files
baronfelbaronfel
committed
try runtime-aided directory lookup instead of __SOURCE_DIRECTORY__
1 parent ded6244 commit 392f30f

16 files changed

+78
-63
lines changed

‎test/FsAutoComplete.Tests.Lsp/CodeFixTests/RenameParamToMatchSignatureTests.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let tests state =
1818
// requires `fsi` and corresponding `fs` file (and a project!)
1919
// -> cannot use untitled doc
2020
// -> use existing files, but load with text specified in tests
21-
let path = Path.Combine(__SOURCE_DIRECTORY__, @"../TestCases/CodeFixTests/RenameParamToMatchSignature/")
21+
let path = Path.Combine(File.CurrentDir(), @"../TestCases/CodeFixTests/RenameParamToMatchSignature/")
2222
let (fsiFile, fsFile) = ("Code.fsi", "Code.fs")
2323

2424
serverTestList (nameof RenameParamToMatchSignature) state defaultConfigDto (Some path) (fun server -> [

‎test/FsAutoComplete.Tests.Lsp/CompletionTests.fs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ open FsAutoComplete.Utils
88
open FsAutoComplete.Lsp
99
open FsToolkit.ErrorHandling
1010
open Utils.Server
11+
open Utils.Utils
1112

1213
let tests state =
1314
let server =
1415
async {
15-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "Completion")
16+
let path = Path.Combine(File.CurrentDir(), "TestCases", "Completion")
1617
let! (server, events) = serverInitialize path defaultConfigDto state
1718
do! waitForWorkspaceFinishedParsing events
1819
let path = Path.Combine(path, "Script.fsx")
@@ -212,7 +213,7 @@ let tests state =
212213
let autocompleteTest state =
213214
let server =
214215
async {
215-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "AutocompleteTest")
216+
let path = Path.Combine(File.CurrentDir(), "TestCases", "AutocompleteTest")
216217
let! (server, event) = serverInitialize path defaultConfigDto state
217218
let projectPath = Path.Combine(path, "AutocompleteTest.fsproj")
218219
do! waitForWorkspaceFinishedParsing event
@@ -226,7 +227,7 @@ let autocompleteTest state =
226227

227228
let scriptServer =
228229
async {
229-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "AutocompleteScriptTest")
230+
let path = Path.Combine(File.CurrentDir(), "TestCases", "AutocompleteScriptTest")
230231
let! (server, event) = serverInitialize path defaultConfigDto state
231232
do! waitForWorkspaceFinishedParsing event
232233
let path = Path.Combine(path, "Script.fsx")
@@ -379,7 +380,7 @@ let autocompleteTest state =
379380

380381
let autoOpenTests state =
381382
let dirPath =
382-
Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "CompletionAutoOpenTests")
383+
Path.Combine(File.CurrentDir(), "TestCases", "CompletionAutoOpenTests")
383384

384385
let serverFor (scriptPath: string) =
385386
async {

‎test/FsAutoComplete.Tests.Lsp/CoreTests.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let initTests createServer =
3535

3636
let p: InitializeParams =
3737
{ ProcessId = Some 1
38-
RootPath = Some __SOURCE_DIRECTORY__
38+
RootPath = Some (File.CurrentDir())
3939
RootUri = None
4040
InitializationOptions = Some(Server.serialize defaultConfigDto)
4141
Capabilities = Some clientCaps
@@ -105,7 +105,7 @@ let initTests createServer =
105105
let documentSymbolTest state =
106106
let server =
107107
async {
108-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "DocumentSymbolTest")
108+
let path = Path.Combine(File.CurrentDir(), "TestCases", "DocumentSymbolTest")
109109
let! (server, event) = serverInitialize path defaultConfigDto state
110110
let path = Path.Combine(path, "Script.fsx")
111111
let tdop: DidOpenTextDocumentParams = { TextDocument = loadDocument path }
@@ -139,7 +139,7 @@ let documentSymbolTest state =
139139
let foldingTests state =
140140
let server =
141141
async {
142-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "FoldingTests")
142+
let path = Path.Combine(File.CurrentDir(), "TestCases", "FoldingTests")
143143

144144
let! (server, event) = serverInitialize path defaultConfigDto state
145145
do! waitForWorkspaceFinishedParsing event
@@ -190,7 +190,7 @@ let tooltipTests state =
190190

191191
let server =
192192
async {
193-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "Tooltips")
193+
let path = Path.Combine(File.CurrentDir(), "TestCases", "Tooltips")
194194
let scriptPath = Path.Combine(path, "Script.fsx")
195195
let! (server, events) = serverInitialize path defaultConfigDto state
196196
do! waitForWorkspaceFinishedParsing events
@@ -359,7 +359,7 @@ let tooltipTests state =
359359

360360
let closeTests state =
361361
// Note: clear diagnostics also implies clear caches (-> remove file & project options from State).
362-
let root = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "CloseTests")
362+
let root = Path.Combine(File.CurrentDir(), "TestCases", "CloseTests")
363363
let workspace = Path.Combine(root, "Workspace")
364364

365365
serverTestList "close tests" state defaultConfigDto (Some workspace) (fun server ->

‎test/FsAutoComplete.Tests.Lsp/DependentFileCheckingTests.fs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ open Utils.Server
99
open System
1010
open FSharp.Control.Reactive
1111
open FSharpx.Control
12+
open Utils.Utils
1213

1314
let tests state =
14-
let root = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "DependentFileChecking", "SameProject")
15+
let root = Path.Combine(File.CurrentDir(), "TestCases", "DependentFileChecking", "SameProject")
1516
let aFile, bFile = "A.fs", "B.fs"
1617
testList (nameof DependentFileChecking) [
1718
// Separate server for each test
@@ -29,10 +30,10 @@ let tests state =
2930
// make a change to A (that is clearly incorrect)
3031
let! startAChange = Document.changeTextTo "farts" aDoc |> Async.StartChild
3132
// start listening for new diagnostics for B
32-
let! diagnosticsForBWaiter =
33-
bDiagsStream
34-
|> Observable.timeoutSpan (TimeSpan.FromSeconds 15.)
35-
|> Async.AwaitObservable
33+
let! diagnosticsForBWaiter =
34+
bDiagsStream
35+
|> Observable.timeoutSpan (TimeSpan.FromSeconds 15.)
36+
|> Async.AwaitObservable
3637
|> Async.StartChild
3738
let! aDiags = startAChange
3839
Expect.isNonEmpty aDiags $"Should have had some compilation errors for {aFile} after erroneous changes"
@@ -55,11 +56,11 @@ let tests state =
5556
// make a change to A (that is clearly incorrect)
5657
let! startAChange = Document.changeTextTo "farts" aDoc |> Async.StartChild
5758
// start listening for new diagnostics for B
58-
let! diagnosticsForBWaiter =
59-
bDiagsStream
59+
let! diagnosticsForBWaiter =
60+
bDiagsStream
6061
|> Observable.skip i
61-
|> Observable.timeoutSpan (TimeSpan.FromSeconds 15.)
62-
|> Async.AwaitObservable
62+
|> Observable.timeoutSpan (TimeSpan.FromSeconds 15.)
63+
|> Async.AwaitObservable
6364
|> Async.StartChild
6465
let! aDiags = startAChange
6566
Expect.isNonEmpty aDiags $"Should have had some compilation errors for {aFile} after erroneous change #%d{i}"

‎test/FsAutoComplete.Tests.Lsp/DetectUnitTests.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ open FsAutoComplete
77
open FsAutoComplete.LspHelpers
88
open Helpers
99
open FsToolkit.ErrorHandling
10+
open Utils.Utils
1011

1112
let tests state =
1213
let geTestNotification projectFolder fileName =
1314
async {
14-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", projectFolder)
15+
let path = Path.Combine(File.CurrentDir(), "TestCases", projectFolder)
1516
let! server, events = serverInitialize path defaultConfigDto state
1617
do! waitForWorkspaceFinishedParsing events
1718
let path = Path.Combine(path, fileName)

‎test/FsAutoComplete.Tests.Lsp/ExtensionsTests.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ open FsAutoComplete
88
open FsAutoComplete.LspHelpers
99
open Helpers
1010
open FsAutoComplete.Lsp
11-
11+
open Utils.Utils
1212

1313
let fsdnTest state =
1414

1515
let server =
1616
async {
17-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "FsdnTest")
17+
let path = Path.Combine(File.CurrentDir(), "TestCases", "FsdnTest")
1818
let! (server, event) = serverInitialize path defaultConfigDto state
1919
do! waitForWorkspaceFinishedParsing event
2020
return server
@@ -90,7 +90,7 @@ let uriTests =
9090
let linterTests state =
9191
let server =
9292
async {
93-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "LinterTest")
93+
let path = Path.Combine(File.CurrentDir(), "TestCases", "LinterTest")
9494
let! (server, events) = serverInitialize path { defaultConfigDto with Linter = Some true } state
9595
let path = Path.Combine(path, "Script.fsx")
9696
let tdop: DidOpenTextDocumentParams = { TextDocument = loadDocument path }
@@ -240,7 +240,7 @@ let linterTests state =
240240
let formattingTests state =
241241
let server =
242242
async {
243-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "Formatting")
243+
let path = Path.Combine(File.CurrentDir(), "TestCases", "Formatting")
244244
let! (server, events) = serverInitialize path defaultConfigDto state
245245
do! dotnetToolRestore path // need to restore CLI tools in order to use fantomas
246246
return server, events, path
@@ -298,7 +298,7 @@ let formattingTests state =
298298
let analyzerTests state =
299299
let server =
300300
async {
301-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "Analyzers")
301+
let path = Path.Combine(File.CurrentDir(), "TestCases", "Analyzers")
302302
// because the analyzer is a project this project has a reference, the analyzer can be
303303
// found in alongside this project, so we can use the directory this project is in
304304
let analyzerPath =
@@ -356,7 +356,7 @@ let analyzerTests state =
356356
let signatureTests state =
357357
let server =
358358
async {
359-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "Signature")
359+
let path = Path.Combine(File.CurrentDir(), "TestCases", "Signature")
360360
let scriptPath = Path.Combine(path, "Script.fsx")
361361
let! (server, events) = serverInitialize path defaultConfigDto state
362362
do! waitForWorkspaceFinishedParsing events

‎test/FsAutoComplete.Tests.Lsp/FindReferencesTests.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ open System.IO
55
open FsAutoComplete
66
open Helpers
77
open Ionide.LanguageServerProtocol.Types
8+
open Utils.Utils
89

910
let tests state =
1011
testList
1112
"Find All References tests"
1213
[ let server =
1314
async {
14-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "FindReferences")
15+
let path = Path.Combine(File.CurrentDir(), "TestCases", "FindReferences")
1516

1617
let! (server, event) = serverInitialize path defaultConfigDto state
1718
do! waitForWorkspaceFinishedParsing event

‎test/FsAutoComplete.Tests.Lsp/GoToTests.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ open Utils.TextEdit
1616
let private gotoTest state =
1717
let server =
1818
async {
19-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "GoToTests")
19+
let path = Path.Combine(File.CurrentDir(), "TestCases", "GoToTests")
2020

2121
let! (server, event) = serverInitialize path defaultConfigDto state
2222
do! waitForWorkspaceFinishedParsing event
@@ -489,7 +489,7 @@ let private gotoTest state =
489489
let private scriptGotoTests state =
490490
let server =
491491
async {
492-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "GoToTests")
492+
let path = Path.Combine(File.CurrentDir(), "TestCases", "GoToTests")
493493
let! (server, event) = serverInitialize path defaultConfigDto state
494494
do! waitForWorkspaceFinishedParsing event
495495
let scriptPath = Path.Combine(path, "Script.fsx")

‎test/FsAutoComplete.Tests.Lsp/HighlightingTests.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ open Helpers
66
open FsAutoComplete.LspHelpers
77
open Ionide.LanguageServerProtocol.Types
88
open FsAutoComplete.Utils
9+
open Utils.Utils
910

1011
let tests state =
11-
let testPath = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "HighlightingTest")
12+
let testPath = Path.Combine(File.CurrentDir(), "TestCases", "HighlightingTest")
1213
let scriptPath = Path.Combine(testPath, "Script.fsx")
1314

1415
let server =

‎test/FsAutoComplete.Tests.Lsp/InfoPanelTests.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ open Ionide.LanguageServerProtocol.Types
66
open FsAutoComplete
77
open Helpers
88
open FsToolkit.ErrorHandling
9+
open Utils.Utils
910

1011
let docFormattingTest state =
1112
let server =
1213
async {
13-
let path = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "FormattedDocumentation")
14+
let path = Path.Combine(File.CurrentDir(), "TestCases", "FormattedDocumentation")
1415
let config = defaultConfigDto
1516
let! (server, events) = serverInitialize path config state
1617
let path = Path.Combine(path, "Script.fsx")

0 commit comments

Comments
 (0)