Skip to content

Commit d12d898

Browse files
Fix VS Code formatting inconsistencies (#1133)
1 parent 6c5aca7 commit d12d898

File tree

6 files changed

+26
-19
lines changed

6 files changed

+26
-19
lines changed

.eslintrc.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
"@typescript-eslint/no-non-null-assertion": "off",
1515
"@typescript-eslint/semi": "error"
1616
},
17-
"extends": [
18-
"eslint:recommended",
19-
"plugin:@typescript-eslint/recommended",
20-
"prettier"
21-
],
17+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
2218
"ignorePatterns": ["out", "dist", "**/*.d.ts"]
2319
}

.prettierignore

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1-
.vscode-test
1+
# Only lint certain file types
2+
*.*
3+
!*.js
4+
!*.json
5+
!*.ts
6+
7+
# NodeJS
8+
node_modules/
9+
10+
# vscode-test
11+
.vscode-test/
12+
13+
# Extension directories that don't need formatting
14+
/assets/
15+
/coverage/
16+
/dist/
17+
/snippets/

.prettierrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
}
1212
}
1313
]
14-
}
14+
}

.vscode-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const isFastTestRun = process.env["FAST_TEST_RUN"] === "1";
2121
const isDebugRun = !(process.env["_"] ?? "").endsWith("node_modules/.bin/vscode-test");
2222

2323
// so tests don't timeout when a breakpoint is hit
24-
const timeout = isDebugRun ? Number.MAX_SAFE_INTEGER : 3000
24+
const timeout = isDebugRun ? Number.MAX_SAFE_INTEGER : 3000;
2525

2626
module.exports = defineConfig({
2727
tests: [
@@ -34,7 +34,7 @@ module.exports = defineConfig({
3434
"--disable-updates",
3535
"--disable-crash-reporter",
3636
"--disable-workspace-trust",
37-
"--disable-telemetry"
37+
"--disable-telemetry",
3838
],
3939
mocha: {
4040
ui: "tdd",
@@ -43,7 +43,7 @@ module.exports = defineConfig({
4343
forbidOnly: isCIBuild,
4444
grep: isFastTestRun ? "@slow" : undefined,
4545
invert: isFastTestRun,
46-
slow: 10000
46+
slow: 10000,
4747
},
4848
installExtensions: ["vadimcn.vscode-lldb"],
4949
reuseMachineInstall: !isCIBuild,
@@ -57,14 +57,14 @@ module.exports = defineConfig({
5757
"--disable-updates",
5858
"--disable-crash-reporter",
5959
"--disable-workspace-trust",
60-
"--disable-telemetry"
60+
"--disable-telemetry",
6161
],
6262
mocha: {
6363
ui: "tdd",
6464
color: true,
6565
timeout,
6666
forbidOnly: isCIBuild,
67-
slow: 100
67+
slow: 100,
6868
},
6969
reuseMachineInstall: !isCIBuild,
7070
},

.vscode/settings.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
"typescript.tsc.autoDetect": "off",
1111

1212
// Configure Prettier
13+
"editor.formatOnSave": true,
1314
"editor.defaultFormatter": "esbenp.prettier-vscode",
14-
"[json]": {
15-
"editor.formatOnSave": true
16-
},
17-
"[typescript]": {
18-
"editor.formatOnSave": true
19-
}
2015
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@
12741274
"compile": "tsc",
12751275
"watch": "tsc --watch",
12761276
"lint": "eslint ./ --ext ts && tsc --noEmit",
1277-
"format": "prettier --check *.json src test",
1277+
"format": "prettier --check .",
12781278
"pretest": "npm run compile-tests",
12791279
"soundness": "docker compose -f docker/docker-compose.yaml -p swift-vscode-soundness-prb run --rm soundness",
12801280
"test": "vscode-test",

0 commit comments

Comments
 (0)