Skip to content

Commit a09c9be

Browse files
authored
Merge pull request #394 from jneira/revert-machine-scope
Revert serverExecutablePath from machine to resource scope
2 parents 4e83f01 + 1f0ea72 commit a09c9be

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 1.4.0
2+
3+
- Restore `resource` scope for `haskell.serverExecutablePath` temporary. The `machine` scope will be set again after giving users a period of time to let them adapt theirs workflows and changing or adding some option in the extension itself to help that adjustement (see #387).
4+
15
### 1.3.0
26

37
- Add `haskell.releasesURL` option to override where to look for HLS releases search for HLS downloads, thanks to @soiamsoNG

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ There are a few placeholders which will be expanded:
5959
- `~`, `${HOME}` and `${home}` will be expanded into your users' home folder.
6060
- `${workspaceFolder}` and `${workspaceRoot}` will expand into your current project root.
6161

62+
#### Security warning
63+
64+
The option has scope `resource` scope so it can be changed per workspace.
65+
This supposes it could be used to execute arbitrary programs adding a `.vscode/settings.json` in the workspace folder including this option with the appropiate path.
66+
For this reason its scope will be changed to `machine` so users only will be able to change it globally.
67+
See #387 for more details.
68+
6269
### Local documentation
6370

6471
Haskell Language Server can display Haddock documentation on hover and completions if the project and

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "haskell",
33
"displayName": "Haskell",
44
"description": "Haskell language support powered by the Haskell Language Server",
5-
"version": "1.3.0",
5+
"version": "1.4.0",
66
"license": "MIT",
77
"publisher": "haskell",
88
"engines": {
@@ -132,10 +132,10 @@
132132
"description": "An optional URL to override where to check for haskell-language-server releases"
133133
},
134134
"haskell.serverExecutablePath": {
135-
"scope": "machine",
135+
"scope": "resource",
136136
"type": "string",
137137
"default": "",
138-
"description": "Manually set a language server executable. Can be something on the $PATH or a path to an executable itself. Works with ~, ${HOME} and ${workspaceFolder}."
138+
"markdownDescription": "Manually set a language server executable. Can be something on the $PATH or a path to an executable itself. Works with `~,` `${HOME}` and `${workspaceFolder}`. **Deprecated scope**: This option will be set to `machine` scope in a future release, so it can be changed only globally, not per workspace."
139139
},
140140
"haskell.updateBehavior": {
141141
"scope": "machine",

0 commit comments

Comments
 (0)