diff --git a/package-lock.json b/package-lock.json index 235743c1..154f0930 100644 --- a/package-lock.json +++ b/package-lock.json @@ -85,9 +85,9 @@ "dev": true }, "@types/vscode": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz", - "integrity": "sha512-Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA==", + "version": "1.56.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.56.0.tgz", + "integrity": "sha512-Q5VmQxOx+L1Y6lIJiGcJzwcyV3pQo/eiW8P+7sNLhFI16tJCwtua2DLjHRcpjbCLNVYpQM73kzfFo1Z0HyP9eQ==", "dev": true }, "@ungap/promise-all-settled": { diff --git a/package.json b/package.json index 82f784dd..91526456 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "homepage": "https://clangd.llvm.org/", "icon": "icon.png", "engines": { - "vscode": "^1.52.0" + "vscode": "^1.56.0" }, "categories": [ "Programming Languages", @@ -25,7 +25,7 @@ "activationEvents": [ "onLanguage:c", "onLanguage:cpp", - "onLanguage:cuda", + "onLanguage:cuda-cpp", "onLanguage:objective-c", "onLanguage:objective-cpp", "onCommand:clangd.activate", @@ -54,7 +54,7 @@ "@types/glob": "^7.1.1", "@types/mocha": "^7.0.2", "@types/node": "^6.0.40", - "@types/vscode": "1.52.*", + "@types/vscode": "1.56.*", "clang-format": "1.4.0", "glob": "^7.1.4", "mocha": "^9.1.3", @@ -77,13 +77,6 @@ "**/MSVC/*/include/**" ], "firstLine": "^/[/*].*-\\*-\\s*C\\+\\+\\s*-\\*-.*" - }, - { - "id": "cuda", - "extensions": [ - ".cu", - ".cuh" - ] } ], "configuration": { @@ -269,7 +262,7 @@ }, { "command": "clangd.switchheadersource", - "when": "resourceLangId == c || resourceLangId == cpp || resourceLangId == cuda || resourceLangId == objective-c || resourceLangId == objective-cpp", + "when": "resourceLangId == c || resourceLangId == cpp || resourceLangId == cuda-cpp || resourceLangId == objective-c || resourceLangId == objective-cpp", "group": "0_navigation@5" }, { diff --git a/src/clangd-context.ts b/src/clangd-context.ts index 81ac716c..0f0f6426 100644 --- a/src/clangd-context.ts +++ b/src/clangd-context.ts @@ -16,8 +16,7 @@ import * as typeHierarchy from './type-hierarchy'; const clangdDocumentSelector = [ {scheme: 'file', language: 'c'}, {scheme: 'file', language: 'cpp'}, - // CUDA is not supported by vscode, but our extension does supports it. - {scheme: 'file', language: 'cuda'}, + {scheme: 'file', language: 'cuda-cpp'}, {scheme: 'file', language: 'objective-c'}, {scheme: 'file', language: 'objective-cpp'}, ];