aboutsummaryrefslogtreecommitdiff
path: root/editors/code
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-12-17 21:12:18 +0000
committerGitHub <[email protected]>2019-12-17 21:12:18 +0000
commitee93fac7767d36ee91d5a0029bb58023765c72d5 (patch)
tree2f8b62d4ebe5e18f71fe0e652382fd8263c0ed15 /editors/code
parentff8f80579a9e55d622b994e752c3692bfbd80dcf (diff)
parentda29b7fb14bcfd4ace1b743175393bcabdc02693 (diff)
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 <[email protected]>
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/package-lock.json39
-rw-r--r--editors/code/package.json3
-rw-r--r--editors/code/tslint.json8
3 files changed, 47 insertions, 3 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index b1baa437e..127cdcfa1 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -466,6 +466,16 @@
466 "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", 466 "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
467 "dev": true 467 "dev": true
468 }, 468 },
469 "eslint-plugin-prettier": {
470 "version": "2.7.0",
471 "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz",
472 "integrity": "sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==",
473 "dev": true,
474 "requires": {
475 "fast-diff": "^1.1.1",
476 "jest-docblock": "^21.0.0"
477 }
478 },
469 "esprima": { 479 "esprima": {
470 "version": "4.0.1", 480 "version": "4.0.1",
471 "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", 481 "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
@@ -484,6 +494,12 @@
484 "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", 494 "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
485 "dev": true 495 "dev": true
486 }, 496 },
497 "fast-diff": {
498 "version": "1.2.0",
499 "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
500 "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
501 "dev": true
502 },
487 "fd-slicer": { 503 "fd-slicer": {
488 "version": "1.1.0", 504 "version": "1.1.0",
489 "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", 505 "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -712,6 +728,12 @@
712 "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", 728 "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
713 "dev": true 729 "dev": true
714 }, 730 },
731 "jest-docblock": {
732 "version": "21.2.0",
733 "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz",
734 "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==",
735 "dev": true
736 },
715 "js-tokens": { 737 "js-tokens": {
716 "version": "4.0.0", 738 "version": "4.0.0",
717 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", 739 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -728,6 +750,12 @@
728 "esprima": "^4.0.0" 750 "esprima": "^4.0.0"
729 } 751 }
730 }, 752 },
753 "lines-and-columns": {
754 "version": "1.1.6",
755 "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
756 "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
757 "dev": true
758 },
731 "linkify-it": { 759 "linkify-it": {
732 "version": "2.2.0", 760 "version": "2.2.0",
733 "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz", 761 "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
@@ -1413,6 +1441,17 @@
1413 "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==", 1441 "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==",
1414 "dev": true 1442 "dev": true
1415 }, 1443 },
1444 "tslint-plugin-prettier": {
1445 "version": "2.0.1",
1446 "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.0.1.tgz",
1447 "integrity": "sha512-4FX9JIx/1rKHIPJNfMb+ooX1gPk5Vg3vNi7+dyFYpLO+O57F4g+b/fo1+W/G0SUOkBLHB/YKScxjX/P+7ZT/Tw==",
1448 "dev": true,
1449 "requires": {
1450 "eslint-plugin-prettier": "^2.2.0",
1451 "lines-and-columns": "^1.1.6",
1452 "tslib": "^1.7.1"
1453 }
1454 },
1416 "tsutils": { 1455 "tsutils": {
1417 "version": "2.29.0", 1456 "version": "2.29.0",
1418 "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", 1457 "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
diff --git a/editors/code/package.json b/editors/code/package.json
index f7ab2c2f3..f2e8e647e 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -48,11 +48,12 @@
48 "rollup": "^1.27.9", 48 "rollup": "^1.27.9",
49 "rollup-plugin-commonjs": "^10.1.0", 49 "rollup-plugin-commonjs": "^10.1.0",
50 "rollup-plugin-node-resolve": "^5.2.0", 50 "rollup-plugin-node-resolve": "^5.2.0",
51 "rollup-plugin-typescript": "^1.0.1",
52 "rollup-plugin-sourcemaps": "^0.4.2", 51 "rollup-plugin-sourcemaps": "^0.4.2",
52 "rollup-plugin-typescript": "^1.0.1",
53 "shx": "^0.3.1", 53 "shx": "^0.3.1",
54 "tslint": "^5.20.1", 54 "tslint": "^5.20.1",
55 "tslint-config-prettier": "^1.18.0", 55 "tslint-config-prettier": "^1.18.0",
56 "tslint-plugin-prettier": "^2.0.1",
56 "typescript": "^3.7.3", 57 "typescript": "^3.7.3",
57 "vsce": "^1.70.0", 58 "vsce": "^1.70.0",
58 "vscode-test": "^1.2.3" 59 "vscode-test": "^1.2.3"
diff --git a/editors/code/tslint.json b/editors/code/tslint.json
index b69c5574d..f06fa5fab 100644
--- a/editors/code/tslint.json
+++ b/editors/code/tslint.json
@@ -1,9 +1,13 @@
1{ 1{
2 "defaultSeverity": "error", 2 "defaultSeverity": "error",
3 "extends": ["tslint:recommended", "tslint-config-prettier"], 3 "extends": [
4 "tslint:recommended",
5 "tslint-config-prettier",
6 "tslint-plugin-prettier"
7 ],
4 "rules": { 8 "rules": {
5 "quotemark": [true, "single"],
6 "interface-name": false, 9 "interface-name": false,
10 "prettier": true,
7 "object-literal-sort-keys": false, 11 "object-literal-sort-keys": false,
8 // Allow `_bar` to sort with tsc's `noUnusedParameters` option 12 // Allow `_bar` to sort with tsc's `noUnusedParameters` option
9 "variable-name": [true, "allow-leading-underscore"] 13 "variable-name": [true, "allow-leading-underscore"]