about summary refs log tree commit diff
path: root/editors/code
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-02-06 14:42:01 +0000
committerGitHub <noreply@github.com>2022-02-06 14:42:01 +0000
commitba330548023607717295f0dfd61b72eda41aa9dd (patch)
tree2663f884b6cc7f4b4bf2d71064c759c137802de5 /editors/code
parent1dee488a68289c8f4e83a06f319a63c6932000ab (diff)
parent76ecf9a17d7f80e648c0a89921f937239e324ffd (diff)
downloadrust-ba330548023607717295f0dfd61b72eda41aa9dd.tar.gz
rust-ba330548023607717295f0dfd61b72eda41aa9dd.zip
Merge #11416
11416: Fix eslint language server not working r=Veykril a=jackos

Allows the language server for eslint to work inside VS Code.

Before change:
![image](https://user-images.githubusercontent.com/77730378/152661637-c5d90678-39dc-4018-b884-fc4b6135368e.png)

After change:
![image](https://user-images.githubusercontent.com/77730378/152661647-164c0655-aa6a-4c50-b49d-49cda112d149.png)

Co-authored-by: Jack Clayton <jackclayto@gmail.com>
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/.eslintrc.js3
-rw-r--r--editors/code/tsconfig.eslint.json11
2 files changed, 13 insertions, 1 deletions
diff --git a/editors/code/.eslintrc.js b/editors/code/.eslintrc.js
index b145330a022..631d956da2b 100644
--- a/editors/code/.eslintrc.js
+++ b/editors/code/.eslintrc.js
@@ -5,7 +5,8 @@ module.exports = {
     },
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
-        "project": "tsconfig.json",
+        "project": "tsconfig.eslint.json",
+        "tsconfigRootDir": __dirname,
         "sourceType": "module"
     },
     "plugins": [
diff --git a/editors/code/tsconfig.eslint.json b/editors/code/tsconfig.eslint.json
new file mode 100644
index 00000000000..9eddf279864
--- /dev/null
+++ b/editors/code/tsconfig.eslint.json
@@ -0,0 +1,11 @@
+// Special typescript project file, used by eslint only.
+{
+	"extends": "./tsconfig.json",
+	"include": [
+		// repeated from base config's "include" setting
+		"src",
+		"tests",
+		// these are the eslint-only inclusions
+		".eslintrc.js",
+	]
+}