Skip to content

Commit 14dc286

Browse files
committed
get settings to work
1 parent ed0b986 commit 14dc286

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "a vscode client for the reason-language-server",
44
"author": "Jared Forsyth",
55
"license": "ISC",
6-
"version": "0.0.2",
6+
"version": "1.0.0-beta.1",
77
"publisher": "jaredly",
88
"repository": {
99
"type": "git",

client/src/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const getLocation = (context) => {
1717
// I guess it's 9mb binary. I wonder if I can cut that down?
1818
binaryLocation = path.join(vscode.workspace.rootPath, 'node_modules', '@jaredly', 'reason-language-server', 'lib', 'bs', 'native', 'bin.native')
1919
if (!fs.existsSync(binaryLocation)) {
20-
binaryLocation = context.asAbsolutePath('../bin.native')
20+
binaryLocation = context.asAbsolutePath('./bin.native')
2121
if (!fs.existsSync(binaryLocation)) {
2222
vscode.window.showErrorMessage('Reason Language Server not found! Please install the npm package @jaredly/reason-language-server to enable IDE functionality');
2323
return null
@@ -92,7 +92,7 @@ function activate(context) {
9292
if (client) {
9393
client.stop();
9494
}
95-
const location = getLocation()
95+
const location = getLocation(context)
9696
if (!location) return
9797
client = new LanguageClient(
9898
'reason-language-server',

example-project/.vscode/settings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"editor.codeLens": true,
3-
"reason_language_server.location": "../lib/bs/native/bin.native",
4-
"reason_language_server.reloadOnChange": false
3+
// "reason_language_server.location": "../lib/bs/native/bin.native",
4+
// "reason_language_server.reloadOnChange": false
55
}

package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
{
22
"name": "@jaredly/reason-language-server",
3-
"version": "1.0.0",
3+
"version": "1.0.0-beta.1",
44
"scripts": {
55
"start": "bsb -make-world -backend native -w",
66
"clean": "bsb -clean-world",
77
"watch": "bsb -make-world -backend native -w",
8-
"package": "npm run package:bundle",
9-
"package:bundle": "cd client && npm i && vsce package",
8+
"package": "cp lib/bs/native/bin.native client && cd client && vsce package",
109
"postinstall": "bsb -make-world -backend native"
1110
},
1211
"keywords": [
13-
"BuckleScript",
14-
"documentation",
15-
"generator"
12+
"Reason",
13+
"lsp",
14+
"IDE"
1615
],
1716
"repository": {
1817
"url": "jaredly/language-server",

0 commit comments

Comments
 (0)