Skip to content

Commit

Permalink
update FSAC and add support for new FSI options
Browse files Browse the repository at this point in the history
  • Loading branch information
baronfel committed Jun 17, 2024
1 parent 4586785 commit 9edf43d
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 12 deletions.
9 changes: 9 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
### 7.20.2 - 17.06.2024

* Update to FSAC 0.73.1. This release splits out the settings for `FSharp.FSIExtraParameters` into two groups:
* `FSharp.FSIExtraInteractiveParameters`, used when actually launching FSI instances in VSCode
* `FSharp.FSIExtraSharedParameters` used when doing IDE analysis of scripts.
* Options like `--consolecolors` would go in `FSharp.FSIExtraInteractiveParameters`, while options like `--debug` would go in `FSharp.FSIExtraSharedParameters`. This should help prevent issues where FSI is launched with options that are not supported by the IDE analysis.
* FSAC 0.73.1 also includes fixes for tooltip rendering of optional parameters and generic type parameters.
* Bumped the F# textmate grammar to get [several](https://github.com/ionide/ionide-fsgrammar/pull/211) [really](https://github.com/ionide/ionide-fsgrammar/pull/212) [awesome](https://github.com/ionide/ionide-fsgrammar/pull/214) [fixes](https://github.com/ionide/ionide-fsgrammar/pull/215) from @brianrourkeboll

### 7.20.1 - 17.05.2024

* Fixed: The .NET 8 build of FsAutoComplete wasn't being included in the build. Now it is!
Expand Down
5 changes: 2 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"sdk": {
"version": "7.0.200",
"rollForward": "latestFeature"
"version": "8.0.100"
}
}
}
4 changes: 2 additions & 2 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ NUGET
FSharp.Core (>= 4.7.2)
GIT
remote: https://github.com/ionide/ionide-fsgrammar.git
(7d029a46f17637228b2ee85dd02e511c3e8039b3)
(0100f551f6c32598a58aba97344bf828673fec7a)
GITHUB
remote: ionide/ionide-vscode-helpers
src/Fable.Import.Showdown.fs (8e81bc03f11f07b8e0811b3d4598eadc78f32f2f)
Expand Down Expand Up @@ -241,4 +241,4 @@ STORAGE: PACKAGES
RESTRICTION: == netstandard2.0
NUGET
remote: https://api.nuget.org/v3/index.json
fsautocomplete (0.73)
fsautocomplete (0.73.1)
15 changes: 11 additions & 4 deletions release/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,6 @@
},
"title": "Show project status"
},
{
"command": "fsharp.explorer.renameFile",
"title": "Rename file"
},
{
"command": "fsharp.explorer.addProjecRef",
"title": "Add project reference"
Expand Down Expand Up @@ -640,6 +636,17 @@
"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 `#FSharp.FSIExtraInteractiveParameters#` for FSI-CLI-specific parameters, and `#FSharp.FSIExtraSharedParameters#` 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 `#FSharp.fsiExtraParameters#` are used, only `#FSharp.fsiExtraParameters#` 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 `#FSharp.fsiExtraParameters#` are used, both sets of arguments will be passed to the launched FSI.",
"type": "array"
},
"FSharp.fsiSdkFilePath": {
Expand Down
7 changes: 4 additions & 3 deletions src/Components/Fsi.fs
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,10 @@ module Fsi =

let parms =
let fsiParams =
"FSharp.fsiExtraParameters"
|> Configuration.get Array.empty<string>
|> List.ofArray
Array.append
(Configuration.get Array.empty<string> "FSharp.fsiExtraParameters")
(Configuration.get Array.empty<string> "FSharp.FSIExtraInteractiveParameters")
|> Array.toList

let p =
node.path.join (VSCodeExtension.ionidePluginPath (), "watcher", "watcher.fsx")
Expand Down

0 comments on commit 9edf43d

Please sign in to comment.