Revert language server bundle (#2599)

CHANGELOG.md

@@ -1,6 +1,9 @@
 # What's New?
 
-## 1.11
+## 1.11.26
+- Revert back to the previous CMake language server extension dependency. [PR #2599](https://github.com/microsoft/vscode-cmake-tools/pull/2599)
+
+## 1.11.25
 Improvements:
 - Fix build Error: EMFILE: too many open files. [#2288](https://github.com/microsoft/vscode-cmake-tools/issues/2288) [@FrogTheFrog](https://github.com/FrogTheFrog)
 - Add commands to get preset names. [PR #2433](https://github.com/microsoft/vscode-cmake-tools/pull/2433)

README.md

@@ -20,8 +20,9 @@
 **PLEASE**, if you experience any problems, have any questions, or have an idea
 for a new feature, create an issue on [the GitHub page](https://github.com/microsoft/vscode-cmake-tools)!
 
-This extension itself *does not* provide language support for the CMake
-scripting language. For that we recommend [this extension](https://marketplace.visualstudio.com/items?itemName=josetr.cmake-language-support-vscode).
+This extension itself *does not* provide language support for the CMake scripting language.
+For that we bundle [this extension](https://marketplace.visualstudio.com/items?itemName=twxs.cmake) which provides the support.
+A closed-source extension that provides even better support can also be installed: [CMake Language Support](https://marketplace.visualstudio.com/items?itemName=josetr.cmake-language-support-vscode)
 
 ### Microsoft Open Source Code of Conduct
 

docs/faq.md

@@ -12,13 +12,13 @@ Explore the [CMake Tools documentation](README.md)
 
 ## What about CMake language support?
 
-CMake Tools was created separately from the [CMake extension](https://marketplace.visualstudio.com/items?itemName=josetr.cmake-language-support-vscode), which provides language coloring and autocompletion support.
+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?
 
 CMake Tools is not the same as CMake. There are many great resources around to learn how to use CMake. See Jason Turner's [C++ Weekly - Intro to CMake](https://www.youtube.com/watch?v=HPMvU64RUTY) for a good video introduction.
 
-[CMake's documentation](https://marketplace.visualstudio.com/items?itemName=josetr.cmake-language-support-vscode) is also available.
+[CMake's documentation](https://marketplace.visualstudio.com/items?itemName=twxs.cmake) is also available.
 
 ## How does CMake Tools work with C and C++ IntelliSense?
 

package.json

@@ -2133,6 +2133,6 @@
     "yargs-parser": "^20.2.4"
   },
   "extensionPack": [
-    "josetr.cmake-language-support-vscode"
+    "twxs.cmake"
   ]
 }

src/extension.ts

@@ -1795,15 +1795,6 @@ export async function activate(context: vscode.ExtensionContext) {
     if (oldCMakeToolsExtension) {
         await vscode.window.showWarningMessage(localize('uninstall.old.cmaketools', 'Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.'));
     }
-    // Inform the users that the language support extension has been modified.
-    const isOldLanguageSupportInformed = context.globalState.get('oldLanguageSupportInformed', false);
-    if (!isOldLanguageSupportInformed) {
-        const oldLanguageSupport = vscode.extensions.getExtension('twxs.cmake');
-        if (oldLanguageSupport) {
-            await context.globalState.update('oldLanguageSupportInformed', true);
-            void vscode.window.showInformationMessage(localize('uninstall.old.language.support', 'CMake Tools now bundles a new language support extension for CMakeLists.txt files and recommends that you uninstall the previous CMake language support extension by twxs.'));
-        }
-    }
 
     // Start with a partial feature set view. The first valid CMake project will cause a switch to full feature set.
     await enableFullFeatureSet(false);