Skip to content

Commit

Permalink
Merge branch 'main' into browntarik/crashTelemetry
Browse files Browse the repository at this point in the history
  • Loading branch information
@browntarik
browntarik authored Sep 13, 2023
2 parents 564bbc7 + 2715319 commit a3225cf
Show file tree
Hide file tree
Showing 24 changed files with 1,141 additions and 245 deletions.
100 changes: 96 additions & 4 deletions Extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,29 @@
"id": "awaiting.activation.windows",
"title": "%c_cpp.walkthrough.set.up.title%",
"description": "%c_cpp.walkthrough.activating.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == false",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == false && cpptools.windowsVersion != 10 && cpptools.windowsVersion != 11",
"media": {
"markdown": "dist/walkthrough/installcompiler/install-compiler-windows.md"
}
},
{
"id": "awaiting.activation.windows10",
"title": "%c_cpp.walkthrough.set.up.title%",
"description": "%c_cpp.walkthrough.activating.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == false && cpptools.windowsVersion == 10",
"media": {
"markdown": "dist/walkthrough/installcompiler/install-compiler-windows10.md"
}
},
{
"id": "awaiting.activation.windows11",
"title": "%c_cpp.walkthrough.set.up.title%",
"description": "%c_cpp.walkthrough.activating.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == false && cpptools.windowsVersion == 11",
"media": {
"markdown": "dist/walkthrough/installcompiler/install-compiler-windows11.md"
}
},
{
"id": "no.compilers.found.mac",
"title": "%c_cpp.walkthrough.set.up.title%",
Expand All @@ -114,12 +132,30 @@
{
"id": "no.compilers.found.windows",
"title": "%c_cpp.walkthrough.set.up.title%",
"description": "%c_cpp.walkthrough.no.compilers.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == true && cpptools.scanForCompilersEmpty == true",
"description": "%c_cpp.walkthrough.no.compilers.windows.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == true && cpptools.scanForCompilersEmpty == true && cpptools.windowsVersion != 10 && cpptools.windowsVersion != 11",
"media": {
"markdown": "dist/walkthrough/installcompiler/install-compiler-windows.md"
}
},
{
"id": "no.compilers.found.windows10",
"title": "%c_cpp.walkthrough.set.up.title%",
"description": "%c_cpp.walkthrough.no.compilers.windows.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == true && cpptools.scanForCompilersEmpty == true && cpptools.windowsVersion == 10",
"media": {
"markdown": "dist/walkthrough/installcompiler/install-compiler-windows10.md"
}
},
{
"id": "no.compilers.found.windows11",
"title": "%c_cpp.walkthrough.set.up.title%",
"description": "%c_cpp.walkthrough.no.compilers.windows.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == true && cpptools.scanForCompilersEmpty == true && cpptools.windowsVersion == 11",
"media": {
"markdown": "dist/walkthrough/installcompiler/install-compiler-windows11.md"
}
},
{
"id": "verify.compiler.mac",
"title": "%c_cpp.walkthrough.set.up.title%",
Expand Down Expand Up @@ -148,14 +184,38 @@
"id": "verify.compiler.windows",
"title": "%c_cpp.walkthrough.set.up.title%",
"description": "%c_cpp.walkthrough.compilers.found.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == true && cpptools.scanForCompilersEmpty == false",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == true && cpptools.scanForCompilersEmpty == false && cpptools.windowsVersion != 10 && cpptools.windowsVersion != 11",
"media": {
"markdown": "dist/walkthrough/installcompiler/install-compiler-windows.md"
},
"completionEvents": [
"onContext:cpptools.trustedCompilerFound"
]
},
{
"id": "verify.compiler.windows10",
"title": "%c_cpp.walkthrough.set.up.title%",
"description": "%c_cpp.walkthrough.compilers.found.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == true && cpptools.scanForCompilersEmpty == false && cpptools.windowsVersion == 10",
"media": {
"markdown": "dist/walkthrough/installcompiler/install-compiler-windows10.md"
},
"completionEvents": [
"onContext:cpptools.trustedCompilerFound"
]
},
{
"id": "verify.compiler.windows11",
"title": "%c_cpp.walkthrough.set.up.title%",
"description": "%c_cpp.walkthrough.compilers.found.description%",
"when": "workspacePlatform == windows && cpptools.scanForCompilersDone == true && cpptools.scanForCompilersEmpty == false && cpptools.windowsVersion == 11",
"media": {
"markdown": "dist/walkthrough/installcompiler/install-compiler-windows11.md"
},
"completionEvents": [
"onContext:cpptools.trustedCompilerFound"
]
},
{
"id": "create.cpp.file",
"title": "%c_cpp.walkthrough.create.cpp.file.title%",
Expand Down Expand Up @@ -3025,6 +3085,11 @@
"title": "%c_cpp.command.selectIntelliSenseConfiguration.title%",
"category": "C/C++"
},
{
"command": "C_Cpp.InstallCompiler",
"title": "%c_cpp.command.installCompiler.title%",
"category": "C/C++"
},
{
"command": "C_Cpp.RescanCompilers",
"title": "%c_cpp.command.rescanCompilers.title%",
Expand Down Expand Up @@ -3222,6 +3287,15 @@
"command": "C_Cpp.SwitchHeaderSource",
"key": "Alt+O",
"when": "editorLangId =~ /^(c|(cuda-)?cpp)$/ && editorTextFocus && !(config.C_Cpp.intelliSenseEngine =~ /^[dD]isabled$/)"
},
{
"command": "editor.action.codeAction",
"key": "ctrl+shift+r ctrl+i",
"args": {
"kind": "refactor.inline.macro",
"apply": "first"
},
"when": "editorLangId =~ /^(c|(cuda-)?cpp)$/ && editorTextFocus && !(config.C_Cpp.intelliSenseEngine =~ /^[dD]isabled$/)"
}
],
"debuggers": [
Expand Down Expand Up @@ -5637,6 +5711,10 @@
"command": "C_Cpp.SelectDefaultCompiler",
"when": "never"
},
{
"command": "C_Cpp.InstallCompiler",
"when": "never"
},
{
"command": "C_Cpp.RescanCompilers",
"when": "never"
Expand Down Expand Up @@ -6115,6 +6193,20 @@
]
}
}
],
"codeActions": [
{
"languages": [
"c",
"cpp",
"cude-cpp"
],
"actions": {
"kind": "refactor.inline.macro",
"title": "%c_cpp.codeActions.refactor.inline.macro.title%",
"description": "%c_cpp.codeActions.refactor.inline.macro.description%"
}
}
]
},
"scripts": {
Expand Down
Loading

0 comments on commit a3225cf

Please sign in to comment.