Skip to content

Commit

Permalink
Merge branch 'main' into transparent-compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
baronfel committed May 15, 2024
2 parents 1062bbe + 0e0284e commit 24b423c
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 3 deletions.
6 changes: 6 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### 7.19.1 - 25.04.2024
* ADDED: [Add config entry for parens analyzer](https://github.com/ionide/ionide-vscode-fsharp/pull/1994) (Thanks! @brianrourkeboll!)
* ADDED: [Adds arbitrary additional arguments to be passed to fsac](https://github.com/ionide/ionide-vscode-fsharp/pull/2004) (Thanks @TheAngryByrd!)
* FIX: [Escape quotes in test filter expressions](https://github.com/ionide/ionide-vscode-fsharp/pull/1999) (Thanks @farlee2121!)
* Update to FSAC 0.72.1. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.72.1) for more details.

### 7.18.2 - 07.03.2024

* Update to FSAC 0.71.0. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.71.0) for more details.
Expand Down
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.71)
fsautocomplete (0.72.1)
6 changes: 6 additions & 0 deletions release/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### 7.19.0 - 25.04.2024
* ADDED: [Add config entry for parens analyzer](https://github.com/ionide/ionide-vscode-fsharp/pull/1994) (Thanks! @brianrourkeboll!)
* ADDED: [Adds arbitrary additional arguments to be passed to fsac](https://github.com/ionide/ionide-vscode-fsharp/pull/2004) (Thanks @TheAngryByrd!)
* FIX: [Escape quotes in test filter expressions](https://github.com/ionide/ionide-vscode-fsharp/pull/1999) (Thanks @farlee2121!)
* Update to FSAC 0.72.1. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.72.1) for more details.

### 7.18.2 - 07.03.2024

* Update to FSAC 0.71.0. Check out the [release notes](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.71.0) for more details.
Expand Down
15 changes: 14 additions & 1 deletion release/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,14 @@
},
"type": "array"
},
"FSharp.fsac.fsacArgs": {
"default": [],
"description": "additional CLI arguments to be provided to FSAC itself. Useful for flags that aren\u0027t exposed in the settings or CLI arguments that only exist in custom built versions of FSAC. Requires restart.",
"items": {
"type": "string"
},
"type": "array"
},
"FSharp.fsac.gc.conserveMemory": {
"markdownDescription": "Configures the garbage collector to [conserve memory](https://learn.microsoft.com/en-us/dotnet/core/runtime-config/garbage-collector#conserve-memory) at the expense of more frequent garbage collections and possibly longer pause times. Acceptable values are 0-9. Any non-zero value will allow the [Large Object Heap](https://learn.microsoft.com/en-us/dotnet/standard/garbage-collection/large-object-heap) to be compacted automatically if it has too much fragmentation. Requires restart.",
"type": "integer",
Expand Down Expand Up @@ -841,6 +849,11 @@
"FSharp.simplifyNameAnalyzer"
]
},
"FSharp.unnecessaryParenthesesAnalyzer": {
"default": false,
"description": "Enables detection of unnecessary parentheses",
"type": "boolean"
},
"FSharp.smartIndent": {
"default": false,
"description": "Enables smart indent feature",
Expand Down Expand Up @@ -1795,5 +1808,5 @@
"type": "git",
"url": "https://github.com/ionide/ionide-vscode-fsharp.git"
},
"version": "7.18.2"
"version": "7.19.1"
}
5 changes: 4 additions & 1 deletion src/Core/LanguageService.fs
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,8 @@ Consider:

exeOpts.env <- exeEnv

let additionalFSACArgs = "FSharp.fsac.fsacArgs" |> Configuration.get [||]

let args =
[ yield! fsacDotnetArgs
yield fsacPath
Expand All @@ -925,7 +927,8 @@ Consider:
let storageDir = uri.fsPath
yield "--state-directory"
yield storageDir
| None -> () ]
| None -> ()
yield! additionalFSACArgs ]
|> ResizeArray

let executable = createEmpty<Executable>
Expand Down

0 comments on commit 24b423c

Please sign in to comment.