diff options
-rw-r--r-- | .github/workflows/ci.yaml | 2 | ||||
-rw-r--r-- | editors/code/package.json | 3 | ||||
-rw-r--r-- | editors/code/src/client.ts | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 974d18584..3f41d32f7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml | |||
@@ -110,7 +110,7 @@ jobs: | |||
110 | - run: npm audit | 110 | - run: npm audit |
111 | working-directory: ./editors/code | 111 | working-directory: ./editors/code |
112 | 112 | ||
113 | - run: npm run fmt | 113 | - run: npm run lint |
114 | working-directory: ./editors/code | 114 | working-directory: ./editors/code |
115 | 115 | ||
116 | - run: npm run package --scripts-prepend-node-path | 116 | - run: npm run package --scripts-prepend-node-path |
diff --git a/editors/code/package.json b/editors/code/package.json index 8e58d6b77..8892f56ee 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -23,7 +23,8 @@ | |||
23 | "vscode:prepublish": "tsc && rollup -c", | 23 | "vscode:prepublish": "tsc && rollup -c", |
24 | "package": "vsce package -o rust-analyzer.vsix", | 24 | "package": "vsce package -o rust-analyzer.vsix", |
25 | "watch": "tsc --watch", | 25 | "watch": "tsc --watch", |
26 | "fmt": "tsfmt -r && eslint -c .eslintrc.js --ext ts ./src/ --fix" | 26 | "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src", |
27 | "fix": "tsfmt -r && eslint -c .eslintrc.js --ext ts ./src --fix" | ||
27 | }, | 28 | }, |
28 | "dependencies": { | 29 | "dependencies": { |
29 | "jsonc-parser": "^2.1.0", | 30 | "jsonc-parser": "^2.1.0", |
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts index 1f90af898..540f7c9ea 100644 --- a/editors/code/src/client.ts +++ b/editors/code/src/client.ts | |||
@@ -45,7 +45,7 @@ export async function createClient(config: Config, serverPath: string): Promise< | |||
45 | middleware: { | 45 | middleware: { |
46 | // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576 | 46 | // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576 |
47 | async provideDocumentSemanticTokens(document: vscode.TextDocument, token: vscode.CancellationToken, next: DocumentSemanticsTokensSignature) { | 47 | async provideDocumentSemanticTokens(document: vscode.TextDocument, token: vscode.CancellationToken, next: DocumentSemanticsTokensSignature) { |
48 | let res = await next(document, token); | 48 | const res = await next(document, token); |
49 | if (res === undefined) throw new Error('busy'); | 49 | if (res === undefined) throw new Error('busy'); |
50 | return res; | 50 | return res; |
51 | } | 51 | } |