Skip to content

Commit bb6b906

Browse files
authored
Merge pull request #363 from aeisenberg/lint-fixes
Fixes to how we lint automatically
2 parents c6928d3 + fece068 commit bb6b906

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

extensions/ql-vscode/.eslintrc.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ module.exports = {
2626
"@typescript-eslint/no-explicit-any": "off",
2727
"prefer-const": ["warn", {"destructuring": "all"}],
2828
"indent": "off",
29-
"@typescript-eslint/indent": ["error", 2, {
30-
"SwitchCase": 1,
31-
"FunctionDeclaration": { "body": 1, "parameters": 1 }
32-
}],
29+
"@typescript-eslint/indent": "off",
3330
"@typescript-eslint/no-throw-literal": "error",
3431
"no-useless-escape": 0
3532
},

extensions/ql-vscode/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,10 +480,10 @@
480480
"preintegration": "rm -rf ./out/vscode-tests && gulp",
481481
"integration": "node ./out/vscode-tests/run-integration-tests.js",
482482
"update-vscode": "node ./node_modules/vscode/bin/install",
483-
"postinstall": "node ./node_modules/vscode/bin/install",
483+
"postinstall": "npm rebuild && node ./node_modules/vscode/bin/install",
484484
"format": "tsfmt -r",
485485
"lint": "eslint src test --ext .ts,.tsx",
486-
"lint-staged": "lint-staged"
486+
"format-staged": "lint-staged"
487487
},
488488
"dependencies": {
489489
"child-process-promise": "^2.2.1",
@@ -567,15 +567,15 @@
567567
},
568568
"husky": {
569569
"hooks": {
570-
"pre-commit": "npm run lint-staged"
570+
"pre-commit": "npm run format-staged",
571+
"pre-push": "npm run lint"
571572
}
572573
},
573574
"lint-staged": {
574575
"./**/*.{json,css,scss,md}": [
575576
"prettier --write"
576577
],
577578
"./**/*.{ts,tsx}": [
578-
"eslint --fix --debug",
579579
"tsfmt -r"
580580
]
581581
}

0 commit comments

Comments
 (0)