From 0bbd428eef2aacd855a596e4640bb89c69a8af43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E9=B8=BF?= <lianghongkey@gmail.com>
Date: Mon, 18 May 2020 15:56:58 +0800
Subject: [PATCH] update cpp and js comflict

---
 settings.json     | 23 ++++-------------------
 settings_cpp.json | 11 +++++++++++
 settings_js.json  | 15 +++++++++++++++
 3 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 settings_cpp.json
 create mode 100644 settings_js.json

diff --git a/settings.json b/settings.json
index be7e011..0c2b04f 100644
--- a/settings.json
+++ b/settings.json
@@ -4,7 +4,7 @@
     "C_Cpp.errorSquiggles": "Disabled",
     "workbench.editor.enablePreview": false,
     "[cpp]": {},
-    "C_Cpp.clang_format_style": "Google",
+    "C_Cpp.clang_format_style": "google",
     "editor.rulers": [
         80
     ],
@@ -20,8 +20,7 @@
         "terminal.background" : "#f8f8f8",
     },
     "C_Cpp.updateChannel": "Insiders",
-    "http.proxySupport": "off",
-    "editor.fontWeight": "500",
+    "editor.fontSize": 14,
     "editor.tokenColorCustomizations": {
         "comments":"#7c7c7c",
         "keywords": "#919100",
@@ -30,13 +29,12 @@
         "functions": "#910000",
         "numbers": "#009100",
     },
-    "terminal.integrated.fontWeight": "500",
     "terminal.integrated.scrollback": 10000,
     "explorer.autoReveal": false,
     "editor.minimap.maxColumn": 80,
     "editor.minimap.showSlider": "always",
     "editor.minimap.renderCharacters": false,
-    "window.zoomLevel": 0.5,
+    "window.zoomLevel": 1.0,
     "gitlens.currentLine.enabled": false,
     "gitlens.hovers.currentLine.over": "line",
     "gitlens.mode.statusBar.enabled": false,
@@ -98,19 +96,6 @@
             "workbench.action.toggleStatusbarVisibility",
         ]
     },
-    "json.maxItemsComputed": 50000,
-  
-    "javascript.format.insertSpaceBeforeFunctionParenthesis": true,
-    "vetur.format.defaultFormatter.html": "js-beautify-html",
-    "vetur.format.defaultFormatterOptions": {
-        "js-beautify-html": {
-            "wrap_attributes": "force-aligned"
-        }
-    },
-    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
-    },
-    "eslint.format.enable": true,
-    "eslint.validate": ["javascript", "vue", "html"],
+    "json.maxItemsComputed": 50000
 }
 
diff --git a/settings_cpp.json b/settings_cpp.json
new file mode 100644
index 0000000..5e005af
--- /dev/null
+++ b/settings_cpp.json
@@ -0,0 +1,11 @@
+{
+    "C_Cpp.clang_format_style": "google",
+    "C_Cpp.errorSquiggles": "Disabled",
+    "C_Cpp.updateChannel": "Insiders",
+    "C_Cpp.default.intelliSenseMode": "clang-x64",
+    "C_Cpp.default.cppStandard": "c++11",
+    "C_Cpp.default.cStandard": "c11",
+    "C_Cpp.intelliSenseEngineFallback": "Enabled"
+}
+
+
diff --git a/settings_js.json b/settings_js.json
new file mode 100644
index 0000000..b1c7eba
--- /dev/null
+++ b/settings_js.json
@@ -0,0 +1,15 @@
+{
+    "javascript.format.insertSpaceBeforeFunctionParenthesis": true,
+    "vetur.format.defaultFormatter.html": "js-beautify-html",
+    "vetur.format.defaultFormatterOptions": {
+        "js-beautify-html": {
+            "wrap_attributes": "force-aligned"
+        }
+    },
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true
+    },
+    "eslint.format.enable": true,
+    "eslint.validate": ["javascript", "vue", "html"]
+}
+