Skip to content

Commit

Permalink
bump FSAC once more and make fsi arguments optional
Browse files Browse the repository at this point in the history
  • Loading branch information
baronfel committed Jun 17, 2024
1 parent 9c79d78 commit 914a9d6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 0 additions & 3 deletions release/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions src/Components/Fsi.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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<string> "FSharp.fsiExtraParameters")
(Configuration.get Array.empty<string> "FSharp.FSIExtraInteractiveParameters")
(Configuration.get None "FSharp.fsiExtraParameters" |> Option.toArray)
(Configuration.get None "FSharp.FSIExtraInteractiveParameters" |> Option.toArray)
|> Array.toList

let p =
Expand Down

0 comments on commit 914a9d6

Please sign in to comment.