From 914a9d67f6889888c8f83b022f1a38786d27f9d0 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 17 Jun 2024 16:22:28 -0500 Subject: [PATCH] bump FSAC once more and make fsi arguments optional --- paket.lock | 2 +- release/package.json | 3 --- src/Components/Fsi.fs | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/paket.lock b/paket.lock index 1c0bc555..3e643b9d 100644 --- 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.73.1) + fsautocomplete (0.73.2) diff --git a/release/package.json b/release/package.json index 6ff5e4be..c75506ab 100644 --- a/release/package.json +++ b/release/package.json @@ -634,18 +634,15 @@ "type": "array" }, "FSharp.fsiExtraParameters": { - "default": [], "markdownDescription": "An array of additional command line parameters to pass to FSI when it is started. See [the Microsoft documentation](https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/fsharp-interactive-options) for an exhaustive list.", "type": "array", "markdownDeprecationMessage": "This setting can lead to errors when providing both FSI-CLI-only and script-typechecking-related parameters. Please use \u0060#FSharp.FSIExtraInteractiveParameters#\u0060 for FSI-CLI-specific parameters, and \u0060#FSharp.FSIExtraSharedParameters#\u0060 for typechecking-related parameters." }, "FSharp.FSIExtraSharedParameters": { - "default": [], "markdownDescription": "An array of additional command line parameters to pass to the compiler to use when checking FSI scripts. See [the Microsoft documentation](https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/fsharp-interactive-options) for an exhaustive list. If both this and \u0060#FSharp.fsiExtraParameters#\u0060 are used, only \u0060#FSharp.fsiExtraParameters#\u0060 will be used.", "type": "array" }, "FSharp.FSIExtraInteractiveParameters": { - "default": [], "markdownDescription": "An array of additional command line parameters to pass to FSI when it is launched. See [the Microsoft documentation](https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/fsharp-interactive-options) for an exhaustive list. If both this and \u0060#FSharp.fsiExtraParameters#\u0060 are used, both sets of arguments will be passed to the launched FSI.", "type": "array" }, diff --git a/src/Components/Fsi.fs b/src/Components/Fsi.fs index 94d4b927..9d773246 100644 --- a/src/Components/Fsi.fs +++ b/src/Components/Fsi.fs @@ -357,11 +357,11 @@ module Fsi = let fsiBinaryAndParameters () = let addWatcher = "FSharp.addFsiWatcher" |> Configuration.get false - let parms = + let parms: string array = let fsiParams = Array.append - (Configuration.get Array.empty "FSharp.fsiExtraParameters") - (Configuration.get Array.empty "FSharp.FSIExtraInteractiveParameters") + (Configuration.get None "FSharp.fsiExtraParameters" |> Option.toArray) + (Configuration.get None "FSharp.FSIExtraInteractiveParameters" |> Option.toArray) |> Array.toList let p =