aboutsummaryrefslogtreecommitdiff
path: root/.vscode
diff options
context:
space:
mode:
authorWilliam Chang <[email protected]>2019-11-20 22:17:07 -0800
committerWilliam Chang <[email protected]>2019-11-20 22:17:07 -0800
commite7f4d56592b3975c38af329e77b4efd9108495e8 (patch)
tree0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /.vscode
parent71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff)
parent8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff)
downloadqmk_firmware-e7f4d56592b3975c38af329e77b4efd9108495e8.tar.gz
qmk_firmware-e7f4d56592b3975c38af329e77b4efd9108495e8.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.vscode')
-rw-r--r--.vscode/extensions.json7
-rw-r--r--.vscode/settings.json12
2 files changed, 13 insertions, 6 deletions
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 0543f3de1e..697686cd59 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,11 @@
// Suggested extensions
{
"recommendations": [
- "EditorConfig.EditorConfig"
+ "EditorConfig.EditorConfig",
+ "xaver.clang-format",
+ "ms-vscode.cpptools",
+ "bierner.github-markdown-preview",
+ "donjayamanne.git-extension-pack",
+ "CoenraadS.bracket-pair-colorizer-2"
]
}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ba5b56aa40..e5089a55ba 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,10 +8,12 @@
"**/*.hex": true
},
"files.associations": {
- "*.h": "c",
- "*.c": "c",
- "*.cpp": "cpp",
- "*.hpp": "cpp",
- "xstddef": "c"
+ "*.h": "c",
+ "*.c": "c",
+ "*.cpp": "cpp",
+ "*.hpp": "cpp",
+ "xstddef": "c",
+ "type_traits": "c",
+ "utility": "c"
}
}