Make FSAC initialization assume workspacePaths[0] instead of RootPath

.vscode/launch.json

@@ -52,7 +52,7 @@
       "args": [
         "--debug",
         "--filter",
-        "FSAC.lsp.${input:loader}.${input:lsp-server}.${input:testName}"
+        "FSAC.lsp.${input:loader}.${input:testName}"
       ]
     }
   ],
@@ -77,21 +77,10 @@
       "default": "WorkspaceLoader",
       "type": "pickString"
     },
-
-    {
-      "id": "lsp-server",
-      "description": "The lsp serrver",
-      "options": [
-        "FSharpLspServer",
-        "AdaptiveLspServer"
-      ],
-      "default": "AdaptiveLspServer",
-      "type": "pickString"
-    },
     {
       "id": "testName",
       "description": "the name of the test as provided to `testCase`",
       "type": "promptString"
     }
   ]
-}
+}

.vscode/tasks.json

@@ -1,19 +1,31 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-      {
-        "label": "format codebase",
-        "command": "dotnet",
-        "args": [
-          "build",
-          "-t",
-          "Format"
-        ],
-        "detail": "Format all source code using Fantomas",
-        "type": "shell",
-        "problemMatcher": []
-      }
-    ]
-}
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "format codebase",
+      "command": "dotnet",
+      "args": [
+        "build",
+        "-t",
+        "Format"
+      ],
+      "detail": "Format all source code using Fantomas",
+      "type": "shell",
+      "problemMatcher": []
+    },
+    {
+      "type": "msbuild",
+      "problemMatcher": [
+        "$msCompile"
+      ],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "label": "Build: FsAutoComplete.fsproj",
+      "detail": "Build the FsAutoComplete.fsproj project using dotnet build"
+    }
+  ]
+}

paket.lock

@@ -133,7 +133,7 @@ NUGET
       System.Reflection.Metadata (>= 5.0)
     Ionide.Analyzers (0.7)
     Ionide.KeepAChangelog.Tasks (0.1.8) - copy_local: true
-    Ionide.LanguageServerProtocol (0.4.20)
+    Ionide.LanguageServerProtocol (0.4.22)
       FSharp.Core (>= 6.0)
       Newtonsoft.Json (>= 13.0.1)
       StreamJsonRpc (>= 2.16.36)

src/FsAutoComplete.Core/KeywordList.fs

@@ -6,6 +6,10 @@ open FSharp.Compiler.Tokenization
 open FSharp.Compiler.EditorServices
 open FSharp.Compiler.Symbols
 
+// 44 is the 'This construct is deprecated' error - we've addressed these by moving to TextEdit for the completionItems here,
+// but the helper function for the CompletionItem record has to init the field to None, so it's still being counted as used.
+#nowarn "44"
+
 module KeywordList =
 
   let keywordDescriptions = FSharpKeywords.KeywordsWithDescription |> dict
@@ -39,15 +43,21 @@ module KeywordList =
       "line", "Indicates the original source code line" ]
     |> dict
 
-  let hashSymbolCompletionItems =
+  let private textEdit text pos : U2<TextEdit, _> =
+    U2.First(
+      { Range = { Start = pos; End = pos }
+        NewText = text }
+    )
+
+  let hashSymbolCompletionItems pos =
     hashDirectives
     |> Seq.map (fun kv ->
       let label = "#" + kv.Key
 
       { CompletionItem.Create(kv.Key) with
           Data = Some(Newtonsoft.Json.Linq.JValue(label))
           Kind = Some CompletionItemKind.Keyword
-          InsertText = Some kv.Key
+          TextEdit = Some(textEdit kv.Value pos)
           FilterText = Some kv.Key
           SortText = Some kv.Key
           Documentation = Some(Documentation.String kv.Value)
@@ -57,13 +67,13 @@ module KeywordList =
   let allKeywords: string list =
     keywordDescriptions |> Seq.map ((|KeyValue|) >> fst) |> Seq.toList
 
-  let keywordCompletionItems =
+  let keywordCompletionItems pos =
     allKeywords
     |> List.mapi (fun id k ->
       { CompletionItem.Create(k) with
           Data = Some(Newtonsoft.Json.Linq.JValue(k))
           Kind = Some CompletionItemKind.Keyword
-          InsertText = Some k
+          TextEdit = Some(textEdit k pos)
           SortText = Some(sprintf "1000000%d" id)
           FilterText = Some k
           Label = k })

src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj

@@ -11,4 +11,8 @@
     <Compile Include="FsOpenTelemetry.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
+
+  <Target Name="Blah" AfterTargets="AfterBuild">
+    <Warning Message="farts" />
+  </Target>
 </Project>

src/FsAutoComplete/LspHelpers.fs

@@ -18,6 +18,7 @@
 type FcsPos = FSharp.Compiler.Text.Position
 module FcsPos = FSharp.Compiler.Text.Position
 
+#nowarn "44" // We're not using the Deprecated member of DocumentSymbol here, but it's still required to be _set_.
 
 module FcsPos =
   let subtractColumn (pos: FcsPos) (column: int) = FcsPos.mkPos pos.Line (pos.Column - column)
@@ -115,13 +116,13 @@
       Data = None
       CodeDescription = Some { Href = Some(Uri(urlForCompilerCode error.ErrorNumber)) } }
 
-  let getSymbolInformations
+  let getWorkspaceSymbols
     (uri: DocumentUri)
     (glyphToSymbolKind: FSharpGlyph -> SymbolKind option)
     (topLevel: NavigationTopLevelDeclaration)
-    (symbolFilter: SymbolInformation -> bool)
-    : SymbolInformation[] =
-    let inner (container: string option) (decl: NavigationItem) : SymbolInformation option =
+    (symbolFilter: WorkspaceSymbol -> bool)
+    : WorkspaceSymbol[] =
+    let inner (container: string option) (decl: NavigationItem) : WorkspaceSymbol option =
       // We should nearly always have a kind, if the client doesn't send weird capabilities,
       // if we don't why not assume module...
       let kind = defaultArg (glyphToSymbolKind decl.Glyph) SymbolKind.Module
@@ -130,20 +131,48 @@
         { Uri = uri
           Range = fcsRangeToLsp decl.Range }
 
-      let sym: SymbolInformation =
+      let sym: WorkspaceSymbol =
         { Name = decl.LogicalName
-          Kind = kind
-          Location = location
           ContainerName = container
+          Location = U2.First location
+          Kind = kind
           Tags = None
-          Deprecated = None }
+          Data = None }
 
       if symbolFilter sym then Some sym else None
 
     [| yield! inner None topLevel.Declaration |> Option.toArray
        yield! topLevel.Nested |> Array.choose (inner (Some topLevel.Declaration.LogicalName)) |]
 
-  let applyQuery (query: string) (info: SymbolInformation) =
+  let getDocumentSymbol
+    (glyphToSymbolKind: FSharpGlyph -> SymbolKind option)
+    (topLevelItem: NavigationTopLevelDeclaration)
+    : DocumentSymbol =
+    let makeChildDocumentSymbol (item: NavigationItem) : DocumentSymbol =
+      { Name = item.LogicalName
+        Detail = None
+        Kind = defaultArg (glyphToSymbolKind item.Glyph) SymbolKind.Module
+        Deprecated = None
+        Range = fcsRangeToLsp item.Range
+        SelectionRange = fcsRangeToLsp item.Range
+        Children = None
+        Tags = None }
+
+    { Name = topLevelItem.Declaration.LogicalName
+      // TODO: what Detail actually influences
+      Detail = None
+      Kind = defaultArg (glyphToSymbolKind topLevelItem.Declaration.Glyph) SymbolKind.Module
+      Deprecated = None
+      // TODO: it would be good if we could get just the 'interesting' part of the Declaration.Range here for the SelectionRange
+      Range = fcsRangeToLsp topLevelItem.Declaration.Range
+      SelectionRange = fcsRangeToLsp topLevelItem.Declaration.Range
+      Children =
+        match topLevelItem.Nested with
+        | [||] -> None
+        | children -> Some(Array.map makeChildDocumentSymbol children)
+      Tags = None }
+
+  let applyQuery (query: string) (info: WorkspaceSymbol) =
     match query.Split([| '.' |], StringSplitOptions.RemoveEmptyEntries) with
     | [||] -> false
     | [| fullName |] -> info.Name.StartsWith(fullName, StringComparison.Ordinal)

src/FsAutoComplete/LspHelpers.fsi

@@ -57,14 +57,19 @@ module Conversions =
   val urlForCompilerCode: number: int -> string
   val fcsErrorToDiagnostic: error: FSharpDiagnostic -> Diagnostic
 
-  val getSymbolInformations:
+  val getWorkspaceSymbols:
     uri: DocumentUri ->
     glyphToSymbolKind: (FSharpGlyph -> SymbolKind option) ->
     topLevel: NavigationTopLevelDeclaration ->
-    symbolFilter: (SymbolInformation -> bool) ->
-      SymbolInformation array
+    symbolFilter: (WorkspaceSymbol -> bool) ->
+      WorkspaceSymbol array
 
-  val applyQuery: query: string -> info: SymbolInformation -> bool
+  val getDocumentSymbol:
+    glyphToSymbolKind: (FSharpGlyph -> SymbolKind option) ->
+    topLevelItem: NavigationTopLevelDeclaration ->
+      DocumentSymbol
+
+  val applyQuery: query: string -> info: WorkspaceSymbol -> bool
 
   val getCodeLensInformation:
     uri: DocumentUri -> typ: string -> topLevel: NavigationTopLevelDeclaration -> CodeLens array