-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix conflicts between ESLint and VSC.
- Loading branch information
1 parent
4c9bbbd
commit 2dff197
Showing
1 changed file
with
27 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,29 @@ | ||
| { | ||
| "editor.codeActionsOnSave": { | ||
| "source.fixAll.eslint": true | ||
| }, | ||
| "editor.formatOnSave": true, | ||
| "[typescript]": { | ||
| "editor.formatOnSave": false, | ||
| }, | ||
| "editor.detectIndentation": false, | ||
| "editor.tabSize": 2, | ||
| "editor.insertSpaces": true, | ||
| "files.trimFinalNewlines": true, | ||
| "files.trimTrailingWhitespace": true, | ||
| "files.insertFinalNewline": true, | ||
| "files.eol": "\n", | ||
| "files.exclude": { | ||
| "**/.git": true, | ||
| "**/.DS_Store": true, | ||
| "node_modules": true, | ||
| "**/*.js": true, | ||
| "**/*.d.ts": true, | ||
| ".nyc_output": true, | ||
| "coverage": true | ||
| }, | ||
| "typescript.tsdk": "./node_modules/typescript.lib" | ||
| "editor.codeActionsOnSave": { | ||
| "source.fixAll.eslint": true | ||
| }, | ||
| "editor.formatOnSave": true, | ||
| "[typescript]": { | ||
| "editor.formatOnSave": false, | ||
| }, | ||
| "[typescriptreact]": { | ||
| "editor.formatOnSave": false, | ||
| }, | ||
| "editor.detectIndentation": false, | ||
| "editor.tabSize": 2, | ||
| "editor.insertSpaces": true, | ||
| "files.trimFinalNewlines": true, | ||
| "files.trimTrailingWhitespace": true, | ||
| "files.insertFinalNewline": true, | ||
| "files.eol": "\n", | ||
| "files.exclude": { | ||
| "**/.git": true, | ||
| "**/.DS_Store": true, | ||
| "node_modules": true, | ||
| "**/*.js": true, | ||
| "**/*.d.ts": true, | ||
| ".nyc_output": true, | ||
| "coverage": true | ||
| }, | ||
| "typescript.tsdk": "./node_modules/typescript.lib" | ||
| } |