Fix Tests for AdaptiveLspServer (#1053)

ionide · Feb 19, 2023 · fe598dd · fe598dd
1 parent fdeca2f
commit fe598dd
Show file tree

Hide file tree

Showing 37 changed files with 609 additions and 208 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ jobs:
   build:
     env:
       TEST_TIMEOUT_MINUTES: 30
+      FSAC_TEST_DEFAULT_TIMEOUT : 120000 #ms, individual test timeouts
     timeout-minutes: 30 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc
     strategy:
       matrix:

diff --git a/paket.lock b/paket.lock
diff --git a/src/FsAutoComplete.Core/Commands.fs b/src/FsAutoComplete.Core/Commands.fs
@@ -88,6 +88,7 @@ type NotificationEvent =
   | TestDetected of file: string<LocalPath> * tests: TestAdapter.TestAdapterEntry<range>[]
 
 module Commands =
+  open System.Collections.Concurrent
   let fantomasLogger = LogProvider.getLoggerByName "Fantomas"
   let commandsLogger = LogProvider.getLoggerByName "Commands"
 
@@ -836,7 +837,7 @@ module Commands =
         return Choice1Of2(declarationRanges, usageRanges)
 
       | SymbolDeclarationLocation.Projects (projects, isInternalToProject) ->
-        let symbolUseRanges = ImmutableArray.CreateBuilder()
+        let symbolUseRanges = ConcurrentBag<_>()
         let symbolRange = symbol.DefinitionRange.NormalizeDriveLetterCasing()
         let symbolFile = symbolRange.TaggedFileName
 
@@ -967,30 +968,6 @@ module Commands =
       highlights |> Array.collect expandParents)
     |> Array.sortBy startToken
 
-type Commands(checker: FSharpCompilerServiceChecker, state: State, hasAnalyzers: bool, rootPath: string option) =
-  let fileParsed = Event<FSharpParseFileResults>()
-
-  let fileChecked = Event<ParseAndCheckResults * string<LocalPath> * int>()
-
-  let scriptFileProjectOptions = Event<FSharpProjectOptions>()
-
-  let disposables = ResizeArray()
-
-  let mutable workspaceRoot: string option = rootPath
-  let mutable linterConfigFileRelativePath: string option = None
-  // let mutable linterConfiguration: FSharpLint.Application.Lint.ConfigurationParam = FSharpLint.Application.Lint.ConfigurationParam.Default
-  let mutable lastCheckResult: ParseAndCheckResults option = None
-
-  let notify = Event<NotificationEvent>()
-
-  let fileStateSet = Event<unit>()
-  let commandsLogger = LogProvider.getLoggerByName "Commands"
-
-  let checkerLogger = LogProvider.getLoggerByName "CheckerEvents"
-
-  let fantomasLogger = LogProvider.getLoggerByName "Fantomas"
-
-
 
 
   let analyzerHandler (file: string<LocalPath>, content, pt, tast, symbols, getAllEnts) =
@@ -1038,6 +1015,32 @@ type Commands(checker: FSharpCompilerServiceChecker, state: State, hasAnalyzers:
 
       [||]
 
+
+type Commands(checker: FSharpCompilerServiceChecker, state: State, hasAnalyzers: bool, rootPath: string option) =
+  let fileParsed = Event<FSharpParseFileResults>()
+
+  let fileChecked = Event<ParseAndCheckResults * string<LocalPath> * int>()
+
+  let scriptFileProjectOptions = Event<FSharpProjectOptions>()
+
+  let disposables = ResizeArray()
+
+  let mutable workspaceRoot: string option = rootPath
+  let mutable linterConfigFileRelativePath: string option = None
+  // let mutable linterConfiguration: FSharpLint.Application.Lint.ConfigurationParam = FSharpLint.Application.Lint.ConfigurationParam.Default
+  let mutable lastCheckResult: ParseAndCheckResults option = None
+
+  let notify = Event<NotificationEvent>()
+
+  let fileStateSet = Event<unit>()
+  let commandsLogger = LogProvider.getLoggerByName "Commands"
+
+  let checkerLogger = LogProvider.getLoggerByName "CheckerEvents"
+
+  let fantomasLogger = LogProvider.getLoggerByName "Fantomas"
+
+
+
   do
     disposables.Add
     <| state.ProjectController.Notifications.Subscribe(NotificationEvent.Workspace >> notify.Trigger)
@@ -1105,7 +1108,7 @@ type Commands(checker: FSharpCompilerServiceChecker, state: State, hasAnalyzers:
               | true, fileData ->
 
                 let res =
-                  analyzerHandler (
+                  Commands.analyzerHandler (
                     file,
                     fileData.Lines.ToString().Split("\n"),
                     parseAndCheck.GetParseResults.ParseTree,

diff --git a/src/FsAutoComplete.Core/Consts.fs b/src/FsAutoComplete.Core/Consts.fs
@@ -0,0 +1,10 @@
+namespace FsAutoComplete.Core
+
+module ProjectLoader =
+  [<Literal>]
+  let ProduceReferenceAssembly = "ProduceReferenceAssembly"
+
+  let globalProperties =
+    [
+      // For tooling we don't want to use Reference Assemblies as this doesn't play well with type checking across projects
+      ProduceReferenceAssembly, "false" ]
diff --git a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
@@ -9,6 +9,7 @@
     <TrimmerRootAssembly Include="FsAutoComplete.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Consts.fs" />
     <Compile Include="Workaround/ServiceParseTreeWalk.fs" />
     <Compile Include="Debug.fs" />
     <Compile Include="Utils.fs" />
@@ -45,4 +46,4 @@
     <Compile Include="Commands.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>