Skip to content

Commit 940a29e

Browse files
authored
Merge pull request #236 from bubba/static-binaries
Automatic installation of haskell-language-server binaries and make haskell-langauge-server the default
2 parents 04ce6dc + 5b1696e commit 940a29e

21 files changed

+1402
-1055
lines changed

.travis.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ dist: xenial
22
language: node_js
33

44
node_js:
5-
- 10
5+
- 10
66

77
cache:
88
directories:
9-
- "node_modules"
9+
- 'node_modules'
1010

1111
os:
1212
- osx
@@ -23,15 +23,12 @@ before_install:
2323
sudo apt-get -y install libsecret-1-dev
2424
fi
2525
install:
26-
- npm ci
27-
- npm run vscode:prepublish
28-
29-
script:
30-
- npm test --silent
26+
- npm ci
27+
- npm run vscode:prepublish
3128

3229
before_deploy:
33-
- npm install -g vsce
34-
- vsce package
30+
- npm install -g vsce
31+
- vsce package
3532

3633
# Deploy the extension to the Marketplace and GitHub releases (only on tags).
3734
# Note that this only deploys from the master branch, but will still allow
@@ -44,14 +41,14 @@ before_deploy:
4441
# b) Set a environment variable `VS_TOKEN` with the value of your VS Code personal token
4542
# c) Make sure `Display value in build log` is turned OFF!
4643
deploy:
47-
- provider: script # Deploy to VS Code Market Place (only on tags!).
48-
script: vsce publish -p $VS_CODE
49-
skip_cleanup: true
50-
on: # Publish on all builds on master branch.
51-
repo: alanz/vscode-hie-server
52-
branch: master
53-
tags: true
54-
condition: $TRAVIS_OS_NAME = linux
44+
- provider: script # Deploy to VS Code Market Place (only on tags!).
45+
script: vsce publish -p $VS_CODE
46+
skip_cleanup: true
47+
on: # Publish on all builds on master branch.
48+
repo: alanz/vscode-hie-server
49+
branch: master
50+
tags: true
51+
condition: $TRAVIS_OS_NAME = linux
5552
# - provider: releases # Deploy the *.vsix pcakge to GitHub releases.
5653
# file_glob: true
5754
# file: "*.vsix"

.vscode/launch.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
// A launch configuration that compiles the extension and then opens it inside a new window
22
{
3-
"version": "0.1.0",
4-
"configurations": [
5-
{
6-
"name": "Extension",
7-
"type": "extensionHost",
8-
"request": "launch",
9-
"runtimeExecutable": "${execPath}",
10-
"args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
11-
"stopOnEntry": false,
12-
"sourceMaps": true,
13-
"outFiles": [ "${workspaceRoot}/out/src/**/*.js" ],
14-
"preLaunchTask": "npm: watch"
15-
},
16-
{
17-
"name": "Extension Tests",
18-
"type": "extensionHost",
19-
"request": "launch",
20-
"runtimeExecutable": "${execPath}",
21-
"args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
22-
"stopOnEntry": false,
23-
"sourceMaps": true,
24-
"outFiles": [ "${workspaceRoot}/out/test/**/*.js" ],
25-
"preLaunchTask": "npm: watch"
26-
}
27-
]
3+
"version": "0.1.0",
4+
"configurations": [
5+
{
6+
"name": "Extension",
7+
"type": "extensionHost",
8+
"request": "launch",
9+
"runtimeExecutable": "${execPath}",
10+
"args": ["--extensionDevelopmentPath=${workspaceRoot}"],
11+
"stopOnEntry": false,
12+
"sourceMaps": true,
13+
"outFiles": ["${workspaceRoot}/out/src/**/*.js"],
14+
"preLaunchTask": "npm: watch"
15+
},
16+
{
17+
"name": "Extension Tests",
18+
"type": "extensionHost",
19+
"request": "launch",
20+
"runtimeExecutable": "${execPath}",
21+
"args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test"],
22+
"stopOnEntry": false,
23+
"sourceMaps": true,
24+
"outFiles": ["${workspaceRoot}/out/test/**/*.js"],
25+
"preLaunchTask": "npm: watch"
26+
}
27+
]
2828
}

Changelog.md

Lines changed: 72 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,33 @@
1+
### 0.1.0
2+
3+
`vscode-hie-server`/`Haskell Language Server` is now just Haskell, and will soon
4+
be published under the Haskell organisation as `haskell-vscode`.
5+
This release makes haskell-language-server the default langauge server of choice
6+
and automatically downloads and installs binaries. Installation from source is
7+
still supported though and any binaries located on your PATH for the selected
8+
langauge server will be used instead.
9+
10+
#### Important!
11+
12+
As part of this, your configuration may be reset as the keys move from
13+
`languageServerHaskell.completionSnippetsOn` to `haskell.completionSnippetsOn`.
14+
15+
- Fix the document and source browser
16+
- Remove obselete commands that are no longer supported by any of the language
17+
servers
18+
- Show type command
19+
- Insert type command
20+
- HaRe commands
21+
- Case split commands
22+
123
### 0.0.40
224

325
Change the way the backend is configured, simplifying it.
426

5-
* remove wrapper scripts (hie-vscode.sh/hie-vscode.bat)
6-
* dropdown choice between `haskell-ide-engine`, `haskell-language-server` or
27+
- remove wrapper scripts (hie-vscode.sh/hie-vscode.bat)
28+
- dropdown choice between `haskell-ide-engine`, `haskell-language-server` or
729
`ghcide` in the `hieVariant` setting.
8-
* this can be overridden by an explicit `hieExecutablePath`, as before.
30+
- this can be overridden by an explicit `hieExecutablePath`, as before.
931

1032
### 0.0.39
1133

@@ -19,125 +41,125 @@ Bump dependencies
1941

2042
Trying again, working 0.0.35
2143

22-
* Add Restart command (@gdziadkiewicz)
23-
* Add Ormolu as a formatter option (@DavSanchez)
24-
* Update README
44+
- Add Restart command (@gdziadkiewicz)
45+
- Add Ormolu as a formatter option (@DavSanchez)
46+
- Update README
2547

2648
### 0.0.36
2749

28-
* Roll back to 0.0.34
50+
- Roll back to 0.0.34
2951

3052
### 0.0.35
3153

32-
* Add Restart command (@gdziadkiewicz)
33-
* Add Ormolu as a formatter option (@DavSanchez)
34-
* Update README
54+
- Add Restart command (@gdziadkiewicz)
55+
- Add Ormolu as a formatter option (@DavSanchez)
56+
- Update README
3557

3658
### 0.0.34
3759

38-
* Remove --lsp parameter from hie-vscode.bat
60+
- Remove --lsp parameter from hie-vscode.bat
3961

4062
### 0.0.33
4163

42-
* Introduced configuration setting `noLspParam`, default `false` to control
64+
- Introduced configuration setting `noLspParam`, default `false` to control
4365
setting the `--lsp` flag for the hie server. So by default we will set the
4466
command line argument for the server, but it can be turned off.
4567

4668
### 0.0.32
4769

48-
* Re-enable the `--lsp` flag for the hie server
49-
* Update some deps for security vulnerabilities
70+
- Re-enable the `--lsp` flag for the hie server
71+
- Update some deps for security vulnerabilities
5072

5173
### 0.0.31
5274

53-
* Log to stderr (vscode output) by default, add option for logfile (@bubba)
75+
- Log to stderr (vscode output) by default, add option for logfile (@bubba)
5476

5577
### 0.0.30
5678

57-
* Bundle using webpack (@chrismwendt)
58-
* Bump protocol version to 3.15 prerelease (@alanz)
79+
- Bundle using webpack (@chrismwendt)
80+
- Bump protocol version to 3.15 prerelease (@alanz)
5981
This allows working progress reporting from hie.
60-
* Update casesplit plugin (@Avi-D-coder)
82+
- Update casesplit plugin (@Avi-D-coder)
6183

6284
### 0.0.29
6385

64-
* bump protocol version to 3.15 (prerelease) (@alanz)
65-
* upgrade deps, including avoiding vulnerabilities on lodash (@alanz)
66-
* warn about compile time and wrapped hie (@janat08)
86+
- bump protocol version to 3.15 (prerelease) (@alanz)
87+
- upgrade deps, including avoiding vulnerabilities on lodash (@alanz)
88+
- warn about compile time and wrapped hie (@janat08)
6789

6890
### 0.0.28
6991

70-
* remove unused `lsp` flag (@bubba)
71-
* do not start `hie` if `hie-wrapper` crashes (@bubba)
72-
* Expose diagnosticsOnChange option for settings (Frederik Ramcke)
73-
* Avoid CVE on `extend` package
74-
* Enable displaying window progress (@bubba)
92+
- remove unused `lsp` flag (@bubba)
93+
- do not start `hie` if `hie-wrapper` crashes (@bubba)
94+
- Expose diagnosticsOnChange option for settings (Frederik Ramcke)
95+
- Avoid CVE on `extend` package
96+
- Enable displaying window progress (@bubba)
7597

7698
### 0.0.27
7799

78-
* Re-enable search feature for documentation (@anonimitoraf)
100+
- Re-enable search feature for documentation (@anonimitoraf)
79101
Accesed via `ctrl-f`.
80102

81103
### 0.0.26
82104

83-
* Show documentation content using Webview API (@EdAllonby)
84-
* npm audit fix (@alanz)
105+
- Show documentation content using Webview API (@EdAllonby)
106+
- npm audit fix (@alanz)
85107

86108
### 0.0.25
87109

88-
* Add vsce dependency to "Contributing" document (@EdAllonby)
89-
* Add formatterProvider config (@bubba)
90-
* Bugfix for stack version on windows (@beauzeaux)
91-
* Update settings to match hie version 0.7.0.0 (@alanz)
92-
* npm audit fix (@bubba)
110+
- Add vsce dependency to "Contributing" document (@EdAllonby)
111+
- Add formatterProvider config (@bubba)
112+
- Bugfix for stack version on windows (@beauzeaux)
113+
- Update settings to match hie version 0.7.0.0 (@alanz)
114+
- npm audit fix (@bubba)
93115

94116
### 0.0.24
95117

96-
* Add snippet config option (@bubba)
118+
- Add snippet config option (@bubba)
97119

98120
### 0.0.23
99121

100-
* Fix multi-process issue, where vscode would launch multiple hie instances.
122+
- Fix multi-process issue, where vscode would launch multiple hie instances.
101123
By @kfigiela
102124

103125
### 0.0.22
104126

105-
* Add configuration option to enable liquid haskell processing. This
127+
- Add configuration option to enable liquid haskell processing. This
106128
is a preview feature of hie from
107129
ca2d3eaa19da8ec9d55521b461d8e2e8cffee697 on 2019-09-05.
108130

109131
### 0.0.21
110132

111-
* Remove languageServerHaskell.useHieWrapper, We now use hie-wrapper
133+
- Remove languageServerHaskell.useHieWrapper, We now use hie-wrapper
112134
by default.
113-
* Update the vscode-languageclient to v4.4.0
114-
* Fix #98 Import identifier insertion line `moduleLine` is now the
135+
- Update the vscode-languageclient to v4.4.0
136+
- Fix #98 Import identifier insertion line `moduleLine` is now the
115137
first line that is (trimmed) `where` or ends with `where` or ends
116138
with `)where`. (@mpilgrem)
117139

118140
### 0.0.20
119141

120-
* Add the case-split function (@txsmith). Required hie >= 0.2.1.0
121-
* Update the vscode-languageclient to v4.2.0 (@Bubba)
122-
* Use the hie-wrapper executable now installed with hie to choose the
142+
- Add the case-split function (@txsmith). Required hie >= 0.2.1.0
143+
- Update the vscode-languageclient to v4.2.0 (@Bubba)
144+
- Use the hie-wrapper executable now installed with hie to choose the
123145
right version of hie to use for the given project.
124146

125147
### 0.0.19
126148

127-
* Fix hie launch on windows with logging off (#90). Thanks @Tehnix.
149+
- Fix hie launch on windows with logging off (#90). Thanks @Tehnix.
128150

129151
### 0.0.18
130152

131-
* Support GHC 8.4.3 in the wrapper file
132-
* The `languageServerHaskell.trace.server` parameter now affects
153+
- Support GHC 8.4.3 in the wrapper file
154+
- The `languageServerHaskell.trace.server` parameter now affects
133155
`/tmp/hie.log`, as well as ghc-mod `--vomit` output.
134-
* Add an Import identifier command, by @chrismwendt
156+
- Add an Import identifier command, by @chrismwendt
135157

136158
### 0.0.17
137159

138-
* Support GHC 8.4.2 in the wrapper file
139-
* Update dependencies to avoid security vulnerability.
140-
* Use os.tmpdir() for the hie.log file
160+
- Support GHC 8.4.2 in the wrapper file
161+
- Update dependencies to avoid security vulnerability.
162+
- Use os.tmpdir() for the hie.log file
141163

142164
### 0.0.15
143165

0 commit comments

Comments
 (0)