deprecate options for source text and adaptive mode, and remove their…

… associated CLI argument settings
ionide · Oct 15, 2023 · af58c42 · af58c42
1 parent 7723dcf
commit af58c42
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,10 @@
+### 7.15.0 - 15.10.2023
+* Update to FSAC 0.66.1. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.66.1) for more details.
+* Updated the F# syntax grammar to pick up fixes for backticked namespace and module names, let struct syntax highlights, and customer operators/doc comments. (Thanks @dawedawe and @MangelMaxime!)
+* Added a deprecation message to `FSharp.inlayHints.enabled` in favor of `editor.inlayHints.enabled`.
 
 ### 7.14.0 - 09.10.2023
-* Update to FSAC 0.65.0. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.64.0) for more details.
+* Update to FSAC 0.65.0. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.65.0) for more details.
 * [Don't offer to reference the target project when adding a project reference](https://github.com/ionide/ionide-vscode-fsharp/pull/1945) (Thanks @dawedawe!)
 
 ### 7.13.0 - 05.10.2023

diff --git a/paket.lock b/paket.lock
@@ -241,4 +241,4 @@ STORAGE: PACKAGES
 RESTRICTION: == netstandard2.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    fsautocomplete (0.66)
+    fsautocomplete (0.66.1)
diff --git a/release/CHANGELOG.md b/release/CHANGELOG.md
@@ -1,6 +1,10 @@
+### 7.15.0 - 15.10.2023
+* Update to FSAC 0.66.1. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.66.1) for more details.
+* Updated the F# syntax grammar to pick up fixes for backticked namespace and module names, let struct syntax highlights, and customer operators/doc comments. (Thanks @dawedawe and @MangelMaxime!)
+* Added a deprecation message to `FSharp.inlayHints.enabled` in favor of `editor.inlayHints.enabled`.
 
 ### 7.14.0 - 09.10.2023
-* Update to FSAC 0.65.0. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.64.0) for more details.
+* Update to FSAC 0.65.0. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.65.0) for more details.
 * [Don't offer to reference the target project when adding a project reference](https://github.com/ionide/ionide-vscode-fsharp/pull/1945) (Thanks @dawedawe!)
 
 ### 7.13.0 - 05.10.2023

diff --git a/release/package.json b/release/package.json
@@ -479,6 +479,7 @@
         "FSharp.enableAdaptiveLspServer": {
           "default": true,
           "description": "Enables Enable LSP Server based on FSharp.Data.Adaptive. This can improve stability. Requires restart.",
+          "markdownDeprecationMessage": "This setting has been deprecated because it is now the only behavior of the LSP Server.",
           "type": "boolean"
         },
         "FSharp.enableAnalyzers": {
@@ -584,6 +585,7 @@
         "FSharp.fsac.sourceTextImplementation": {
           "default": "RoslynSourceText",
           "description": "Enables the use of a new source text implementation. This may have better memory characteristics. Requires restart.",
+          "markdownDeprecationMessage": "This setting is deprecated because the RoslynSourceText SourceText implementation has been adopted as the only implementation in the LSP Server.",
           "enum": [
             "NamedText",
             "RoslynSourceText"
@@ -657,7 +659,7 @@
         },
         "FSharp.inlayHints.enabled": {
           "default": true,
-          "markdownDeprecationMessage": "This can be controlled by `editor.inlayHints.enabled` instead.",
+          "markdownDeprecationMessage": "This can be controlled by \u0060editor.inlayHints.enabled\u0060 instead.",
           "description": "Controls if the inlay hints feature is enabled",
           "type": "boolean"
         },

diff --git a/src/Core/LanguageService.fs b/src/Core/LanguageService.fs
@@ -670,9 +670,6 @@ Consider:
 
     let getOptions (c: ExtensionContext) : JS.Promise<Executable> =
         promise {
-            let enableAdaptiveLspServer =
-                "FSharp.enableAdaptiveLspServer" |> Configuration.get true
-
             let openTelemetryEnabled = "FSharp.openTelemetry.enabled" |> Configuration.get false
 
             let enableProjectGraph =
@@ -722,9 +719,6 @@ Consider:
 
             let verbose = "FSharp.verboseLogging" |> Configuration.get false
 
-            let sourceText =
-                "FSharp.fsac.sourceTextImplementation" |> Configuration.get "RoslynSourceText"
-
             /// given a set of tfms and a target tfm, find the first of the set that satisfies the target.
             /// if no target is found, use the 'latest' tfm
             /// e.g. [net6.0, net7.0] + net8.0 -> net7.0
@@ -914,16 +908,13 @@ Consider:
                               yield "--wait-for-debugger"
                           if enableProjectGraph then
                               yield "--project-graph-enabled"
-                          if enableAdaptiveLspServer then
-                              yield "--adaptive-lsp-server-enabled"
                           if openTelemetryEnabled then
                               yield "--otel-exporter-enabled"
                           if verbose then
                               yield "--verbose"
                           if fsacSilencedLogs <> null && fsacSilencedLogs.Length > 0 then
                               yield "--filter"
                               yield! fsacSilencedLogs
-                          yield $"--source-text-factory={sourceText}"
                           match c.storageUri with
                           | Some uri ->
                               let storageDir = uri.fsPath