Merge pull request #3340 from matklad/fix-lint
Actually gate CI on eslint
This commit is contained in:
commit
9a8329a3a7
2
.github/workflows/ci.yaml
vendored
2
.github/workflows/ci.yaml
vendored
@ -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
|
||||
|
@ -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",
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user