Skip to content

Commit ee93fac

Browse files
Merge #2583
2583: Use prettier settings in ts-lint r=matklad a=edwin0cheng This PR add `tslint-plugin-prettier` extension in ts-lint, which "runs prettier rules as tslint rules." and remove `quotemark` from ts-lint and let prettier to handle it. And also fix #2515 Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
2 parents ff8f805 + da29b7f commit ee93fac

File tree

3 files changed

+47
-3
lines changed

3 files changed

+47
-3
lines changed

editors/code/package-lock.json

Lines changed: 39 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editors/code/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@
4848
"rollup": "^1.27.9",
4949
"rollup-plugin-commonjs": "^10.1.0",
5050
"rollup-plugin-node-resolve": "^5.2.0",
51-
"rollup-plugin-typescript": "^1.0.1",
5251
"rollup-plugin-sourcemaps": "^0.4.2",
52+
"rollup-plugin-typescript": "^1.0.1",
5353
"shx": "^0.3.1",
5454
"tslint": "^5.20.1",
5555
"tslint-config-prettier": "^1.18.0",
56+
"tslint-plugin-prettier": "^2.0.1",
5657
"typescript": "^3.7.3",
5758
"vsce": "^1.70.0",
5859
"vscode-test": "^1.2.3"

editors/code/tslint.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"defaultSeverity": "error",
3-
"extends": ["tslint:recommended", "tslint-config-prettier"],
3+
"extends": [
4+
"tslint:recommended",
5+
"tslint-config-prettier",
6+
"tslint-plugin-prettier"
7+
],
48
"rules": {
5-
"quotemark": [true, "single"],
69
"interface-name": false,
10+
"prettier": true,
711
"object-literal-sort-keys": false,
812
// Allow `_bar` to sort with tsc's `noUnusedParameters` option
913
"variable-name": [true, "allow-leading-underscore"]

0 commit comments

Comments
 (0)