diff --git a/CHANGELOG.md b/CHANGELOG.md index d5c6e0dca4..980c544fde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ Features: -- Add support for CMake Language Support natively in this extension. [#3559](https://github.com/microsoft/vscode-cmake-tools/issues/3559) - Upgrade `cmake_minimum_required` version 3.0.0 -> 3.5.0. [#3793](https://github.com/microsoft/vscode-cmake-tools/issues/3793) Improvements: diff --git a/docs/faq.md b/docs/faq.md index 6290970930..3dc8fb3e86 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -12,7 +12,7 @@ Explore the [CMake Tools documentation](README.md) ## What about CMake language support? -We support CMake language support natively in the CMake Tools extension. +CMake Tools was created separately from the [CMake extension](https://marketplace.visualstudio.com/items?itemName=twxs.cmake), which provides language coloring and autocompletion support. ## How do I learn about CMake? diff --git a/package.json b/package.json index 81ebce9b99..be25f8c1ac 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,7 @@ }, "categories": [ "Other", - "Debuggers", - "Programming Languages" + "Debuggers" ], "galleryBanner": { "color": "#13578c", @@ -62,30 +61,10 @@ "workspaceContains:*/*/CMakeLists.txt", "workspaceContains:*/*/*/CMakeLists.txt", "workspaceContains:.vscode/cmake-kits.json", - "onFileSystem:cmake-tools-schema", - "onLanguage:cmake" + "onFileSystem:cmake-tools-schema" ], "main": "./dist/main", "contributes": { - "languages": [ - { - "id": "cmake", - "extensions": [ - ".cmake" - ], - "filenames": ["CMakeLists.txt"], - "aliases": [ - "CMake" - ] - }, - { - "id": "cmake-cache", - "filenames": ["CMakeCache.txt"], - "aliases": [ - "CMake Cache" - ] - } - ], "commands": [ { "command": "cmake.openCMakePresets", @@ -850,18 +829,6 @@ "category": "CMake" } ], - "grammars": [ - { - "language": "cmake", - "scopeName": "source.cmake", - "path": "./syntaxes/CMake.tmLanguage" - }, - { - "language": "cmake-cache", - "scopeName": "source.cmakecache", - "path": "./syntaxes/CMakeCache.tmLanguage" - } - ], "taskDefinitions": [ { "type": "cmake", @@ -3800,5 +3767,8 @@ "minimatch": "^3.0.5", "**/braces": "^3.0.3" }, + "extensionPack": [ + "twxs.cmake" + ], "packageManager": "yarn@1.22.19" } diff --git a/src/extension.ts b/src/extension.ts index 20836d947b..832fcda27e 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -2333,41 +2333,6 @@ export async function activate(context: vscode.ExtensionContext): Promise\/\?\s]+)/g, - comments: { - lineComment: '#' - }, - brackets: [ - ['{', '}'], - ['(', ')'] - ], - - __electricCharacterSupport: { - brackets: [ - { tokenType: 'delimiter.curly.ts', open: '{', close: '}', isElectric: true }, - { tokenType: 'delimiter.square.ts', open: '[', close: ']', isElectric: true }, - { tokenType: 'delimiter.paren.ts', open: '(', close: ')', isElectric: true } - ] - }, - - __characterPairSupport: { - autoClosingPairs: [ - { open: '{', close: '}' }, - { open: '(', close: ')' }, - { open: '"', close: '"', notIn: ['string'] } - ] - } - }); - if (vscode.workspace.getConfiguration('cmake').get('showOptionsMovedNotification')) { void vscode.window.showInformationMessage( localize('options.moved.notification.body', "Some status bar options in CMake Tools have now moved to the Project Status View in the CMake Tools sidebar. You can customize your view with the 'cmake.options' property in settings."),