Skip to content

Commit b768b01

Browse files
authored
Move to vscode builtin cuda-cpp language (#259)
1 parent d04848d commit b768b01

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"homepage": "https://clangd.llvm.org/",
99
"icon": "icon.png",
1010
"engines": {
11-
"vscode": "^1.52.0"
11+
"vscode": "^1.56.0"
1212
},
1313
"categories": [
1414
"Programming Languages",
@@ -25,7 +25,7 @@
2525
"activationEvents": [
2626
"onLanguage:c",
2727
"onLanguage:cpp",
28-
"onLanguage:cuda",
28+
"onLanguage:cuda-cpp",
2929
"onLanguage:objective-c",
3030
"onLanguage:objective-cpp",
3131
"onCommand:clangd.activate",
@@ -54,7 +54,7 @@
5454
"@types/glob": "^7.1.1",
5555
"@types/mocha": "^7.0.2",
5656
"@types/node": "^6.0.40",
57-
"@types/vscode": "1.52.*",
57+
"@types/vscode": "1.56.*",
5858
"clang-format": "1.4.0",
5959
"glob": "^7.1.4",
6060
"mocha": "^9.1.3",
@@ -77,13 +77,6 @@
7777
"**/MSVC/*/include/**"
7878
],
7979
"firstLine": "^/[/*].*-\\*-\\s*C\\+\\+\\s*-\\*-.*"
80-
},
81-
{
82-
"id": "cuda",
83-
"extensions": [
84-
".cu",
85-
".cuh"
86-
]
8780
}
8881
],
8982
"configuration": {
@@ -269,7 +262,7 @@
269262
},
270263
{
271264
"command": "clangd.switchheadersource",
272-
"when": "resourceLangId == c || resourceLangId == cpp || resourceLangId == cuda || resourceLangId == objective-c || resourceLangId == objective-cpp",
265+
"when": "resourceLangId == c || resourceLangId == cpp || resourceLangId == cuda-cpp || resourceLangId == objective-c || resourceLangId == objective-cpp",
273266
"group": "0_navigation@5"
274267
},
275268
{

src/clangd-context.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ import * as typeHierarchy from './type-hierarchy';
1616
const clangdDocumentSelector = [
1717
{scheme: 'file', language: 'c'},
1818
{scheme: 'file', language: 'cpp'},
19-
// CUDA is not supported by vscode, but our extension does supports it.
20-
{scheme: 'file', language: 'cuda'},
19+
{scheme: 'file', language: 'cuda-cpp'},
2120
{scheme: 'file', language: 'objective-c'},
2221
{scheme: 'file', language: 'objective-cpp'},
2322
];

0 commit comments

Comments
 (0)