Merge pull request #3340 from matklad/fix-lint

Actually gate CI on eslint

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:
       - run: npm audit
         working-directory: ./editors/code
 
-      - run: npm run fmt
+      - run: npm run lint
         working-directory: ./editors/code
 
       - 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 @@
         "vscode:prepublish": "tsc && rollup -c",
         "package": "vsce package -o rust-analyzer.vsix",
         "watch": "tsc --watch",
-        "fmt": "tsfmt -r && eslint -c .eslintrc.js --ext ts ./src/ --fix"
+        "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src",
+        "fix":  "tsfmt -r       && eslint -c .eslintrc.js --ext ts ./src --fix"
     },
     "dependencies": {
         "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<
         middleware: {
             // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576
             async provideDocumentSemanticTokens(document: vscode.TextDocument, token: vscode.CancellationToken, next: DocumentSemanticsTokensSignature) {
-                let res = await next(document, token);
+                const res = await next(document, token);
                 if (res === undefined) throw new Error('busy');
                 return res;
             }