update cpp and js comflict

This commit is contained in:
梁鸿 2020-05-18 15:56:58 +08:00
parent 8256010e58
commit 0bbd428eef
3 changed files with 30 additions and 19 deletions

View File

@ -4,7 +4,7 @@
"C_Cpp.errorSquiggles": "Disabled", "C_Cpp.errorSquiggles": "Disabled",
"workbench.editor.enablePreview": false, "workbench.editor.enablePreview": false,
"[cpp]": {}, "[cpp]": {},
"C_Cpp.clang_format_style": "Google", "C_Cpp.clang_format_style": "google",
"editor.rulers": [ "editor.rulers": [
80 80
], ],
@ -20,8 +20,7 @@
"terminal.background" : "#f8f8f8", "terminal.background" : "#f8f8f8",
}, },
"C_Cpp.updateChannel": "Insiders", "C_Cpp.updateChannel": "Insiders",
"http.proxySupport": "off", "editor.fontSize": 14,
"editor.fontWeight": "500",
"editor.tokenColorCustomizations": { "editor.tokenColorCustomizations": {
"comments":"#7c7c7c", "comments":"#7c7c7c",
"keywords": "#919100", "keywords": "#919100",
@ -30,13 +29,12 @@
"functions": "#910000", "functions": "#910000",
"numbers": "#009100", "numbers": "#009100",
}, },
"terminal.integrated.fontWeight": "500",
"terminal.integrated.scrollback": 10000, "terminal.integrated.scrollback": 10000,
"explorer.autoReveal": false, "explorer.autoReveal": false,
"editor.minimap.maxColumn": 80, "editor.minimap.maxColumn": 80,
"editor.minimap.showSlider": "always", "editor.minimap.showSlider": "always",
"editor.minimap.renderCharacters": false, "editor.minimap.renderCharacters": false,
"window.zoomLevel": 0.5, "window.zoomLevel": 1.0,
"gitlens.currentLine.enabled": false, "gitlens.currentLine.enabled": false,
"gitlens.hovers.currentLine.over": "line", "gitlens.hovers.currentLine.over": "line",
"gitlens.mode.statusBar.enabled": false, "gitlens.mode.statusBar.enabled": false,
@ -98,19 +96,6 @@
"workbench.action.toggleStatusbarVisibility", "workbench.action.toggleStatusbarVisibility",
] ]
}, },
"json.maxItemsComputed": 50000, "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"],
} }

11
settings_cpp.json Normal file
View File

@ -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"
}

15
settings_js.json Normal file
View File

@ -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"]
}