Resolve on save vscode conflict (Choices-js#714)

gitlapple · Oct 28, 2019 · 50fae12 · 50fae12
1 parent 264a0cb
commit 50fae12
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,7 +2,6 @@
   "eslint.enable": true,
   // prevent watch task failures on lint errors
   "eslint.autoFixOnSave": true,
-  "editor.formatOnSave": true,
   // switch off default VSCode formatting rules
   "javascript.format.enable": false,
   // Javascript prettier runs via ESLint
@@ -16,6 +15,9 @@
   "[scss]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
+  "[javascript]": {
+    "editor.formatOnSave": false
+  },
   "search.exclude": {
     "**/node_modules": true,
     "public/assets": true,