From 356395139c5bf692401c32d7512c1d74563413a7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 27 Feb 2020 10:40:53 +0100 Subject: Actually gate CI on eslint --- .github/workflows/ci.yaml | 2 +- editors/code/package.json | 3 ++- 2 files changed, 3 insertions(+), 2 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", -- cgit v1.2.3 From cfa5afa02d415c32e43498dcd0e8b8fa756b9093 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 27 Feb 2020 10:46:43 +0100 Subject: Fix lint --- editors/code/src/client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.2.3