diff --git a/.vscode/settings.json b/.vscode/settings.json index 81b798ed..e7550387 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,12 +14,10 @@ "typescript.tsc.autoDetect": "off", "tslint.enable": false, "eslint.enable": true, - "eslint.validate": [ - "typescript" - ], "editor.codeActionsOnSave": { "source.fixAll.eslint": true }, + "editor.codeActionsOnSaveTimeout": 2000, "eslint.workingDirectories": [ "./client", "./server" diff --git a/client/package-lock.json b/client/package-lock.json index 9ec7bb3c..0ed62f03 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -21,18 +21,18 @@ "integrity": "sha512-k9akfglxWgr0dtLNscq2uBq48XJwnhf4EaDxn05KQowRwR0DkNML0zeYqFRLtXZe6x5vpL5ppyu4o6GqL+23YQ==" }, "vscode-languageclient": { - "version": "6.0.0-next.8", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.0.0-next.8.tgz", - "integrity": "sha512-452jskmuT7YKYnPd5uh7aELK4M25OITcnBq4ylPIyUtE5LQRgA9N9pR9NrviTTX/Hh6q6VGzm70OK9SpMO/zcA==", + "version": "6.0.0-next.9", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.0.0-next.9.tgz", + "integrity": "sha512-NEpeeFM9FKrrRqlBHXGfwpkhtnjruDz3zfFBP+Cymr10qigAEtE/JsODJsIG/ErGqjh3/JXxu8SUOVTGu5oK+w==", "requires": { "semver": "^6.3.0", - "vscode-languageserver-protocol": "^3.15.0-next.13" + "vscode-languageserver-protocol": "^3.15.0-next.14" } }, "vscode-languageserver-protocol": { - "version": "3.15.0-next.13", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.13.tgz", - "integrity": "sha512-2UGxOKc5VHav15n3zY5dtaOXGL/JuV0K2Mem/n6lhF8i3vaqIAnKv004SPU0flYHXIfCcQM7kCL+nwWVJ1K1qw==", + "version": "3.15.0-next.14", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.14.tgz", + "integrity": "sha512-xUwwno6Q6RFd2Z2EWV9D3dQlsKPnHyiZMNWq+EC7JJdp2WH1gRlD+KPX4UGRCnJK0WI5omqHV313IESPwRY5xA==", "requires": { "vscode-jsonrpc": "^5.0.0-next.5", "vscode-languageserver-types": "^3.15.0-next.9" diff --git a/client/package.json b/client/package.json index 69452070..6dc2a8e0 100644 --- a/client/package.json +++ b/client/package.json @@ -20,6 +20,6 @@ "@types/vscode": "^1.40.0" }, "dependencies": { - "vscode-languageclient": "6.0.0-next.8" + "vscode-languageclient": "6.0.0-next.9" } } diff --git a/playgrounds/6.0/.eslintrc.json b/playgrounds/6.0/.eslintrc.json index 430e9cbe..17ae78f8 100644 --- a/playgrounds/6.0/.eslintrc.json +++ b/playgrounds/6.0/.eslintrc.json @@ -9,7 +9,6 @@ "es6": true, "node": true }, - "parser": "@typescript-eslint/parser", "parserOptions": { "ecmaFeatures": { "jsx": true diff --git a/playgrounds/6.0/.vscode/settings.json b/playgrounds/6.0/.vscode/settings.json index 2eae6f0f..b7a795df 100644 --- a/playgrounds/6.0/.vscode/settings.json +++ b/playgrounds/6.0/.vscode/settings.json @@ -40,6 +40,7 @@ }, "eslint.quiet": false, "editor.codeActionsOnSave": { + "source.fixAll": true, "source.fixAll.eslint": true } } \ No newline at end of file diff --git a/playgrounds/6.0/test.js b/playgrounds/6.0/test.js index fefac359..dafa8803 100644 --- a/playgrounds/6.0/test.js +++ b/playgrounds/6.0/test.js @@ -18,5 +18,5 @@ if (!utils.isNullOrEmpty(typeID) || typeID === "") { } if (typeID !== "") { - searchParams.typeID= typeID; +searchParams.typeID= typeID; } \ No newline at end of file diff --git a/playgrounds/6.0/test.ts b/playgrounds/6.0/test.ts deleted file mode 100644 index e0cd27c6..00000000 --- a/playgrounds/6.0/test.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function main(): number { - return -1; -} \ No newline at end of file diff --git a/playgrounds/ts/.vscode/settings.json b/playgrounds/ts/.vscode/settings.json index 088bdc8a..3d1459ec 100644 --- a/playgrounds/ts/.vscode/settings.json +++ b/playgrounds/ts/.vscode/settings.json @@ -1,3 +1,6 @@ { - "eslint.enable": true + "eslint.enable": true, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true + } } \ No newline at end of file diff --git a/playgrounds/ts/test.ts b/playgrounds/ts/test.ts index 5f70f985..2aad0be1 100644 --- a/playgrounds/ts/test.ts +++ b/playgrounds/ts/test.ts @@ -1,3 +1,4 @@ export function main(): number { - return -1;;;; + let s = ''; + return -1; } \ No newline at end of file diff --git a/server/package-lock.json b/server/package-lock.json index f6f4588d..66ac7a3b 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -10,17 +10,17 @@ "integrity": "sha512-k9akfglxWgr0dtLNscq2uBq48XJwnhf4EaDxn05KQowRwR0DkNML0zeYqFRLtXZe6x5vpL5ppyu4o6GqL+23YQ==" }, "vscode-languageserver": { - "version": "6.0.0-next.7", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.0.0-next.7.tgz", - "integrity": "sha512-DHUA8yNmH/dnrvyW8ejfYTd8AHlideOlExmyxnOQ7M1AOPzrIerL4OgjT+JIIN4t+UfC0MinEeHm1vdoYF36kQ==", + "version": "6.0.0-next.8", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.0.0-next.8.tgz", + "integrity": "sha512-NsRKThaAZ6DMX/sHDGxOQ6H4Hjt/GeDSybbFdGc3oCRov4t3gVFnF3kxZ3y5jlvYNYYDdYXfpr8oRzXImBXHwQ==", "requires": { - "vscode-languageserver-protocol": "^3.15.0-next.13" + "vscode-languageserver-protocol": "^3.15.0-next.14" } }, "vscode-languageserver-protocol": { - "version": "3.15.0-next.13", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.13.tgz", - "integrity": "sha512-2UGxOKc5VHav15n3zY5dtaOXGL/JuV0K2Mem/n6lhF8i3vaqIAnKv004SPU0flYHXIfCcQM7kCL+nwWVJ1K1qw==", + "version": "3.15.0-next.14", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.14.tgz", + "integrity": "sha512-xUwwno6Q6RFd2Z2EWV9D3dQlsKPnHyiZMNWq+EC7JJdp2WH1gRlD+KPX4UGRCnJK0WI5omqHV313IESPwRY5xA==", "requires": { "vscode-jsonrpc": "^5.0.0-next.5", "vscode-languageserver-types": "^3.15.0-next.9" diff --git a/server/package.json b/server/package.json index f66d07ee..fe7f52d8 100644 --- a/server/package.json +++ b/server/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "vscode-uri": "^2.0.3", - "vscode-languageserver": "6.0.0-next.7", + "vscode-languageserver": "6.0.0-next.8", "vscode-languageserver-textdocument": "1.0.0-next.5" }, "scripts": {}