Update to Volar 2.0.0-alpha.7

mdx-js · Dec 17, 2023 · 5cd32d7 · 5cd32d7
1 parent d56db3d
commit 5cd32d7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 25 deletions.
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -33,18 +33,18 @@
   },
   "dependencies": {
     "@mdx-js/language-service": "0.3.0",
-    "@volar/language-server": "2.0.0-alpha.3",
+    "@volar/language-server": "2.0.0-alpha.7",
     "load-plugin": "^5.0.0",
     "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.0",
-    "volar-service-markdown": "0.0.20",
-    "volar-service-typescript": "0.0.20",
+    "volar-service-markdown": "0.0.22",
+    "volar-service-typescript": "0.0.22",
     "vscode-uri": "^3.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "@types/normalize-path": "^3.0.0",
-    "@volar/test-utils": "2.0.0-alpha.3",
+    "@volar/test-utils": "2.0.0-alpha.7",
     "normalize-path": "^3.0.0",
     "unified": "^11.0.0"
   }

diff --git a/packages/language-server/test/initialize.test.js b/packages/language-server/test/initialize.test.js
@@ -124,7 +124,7 @@ test('initialize', async () => {
     },
     serverInfo: {
       name: '@volar/language-server',
-      version: '2.0.0-alpha.3'
+      version: '2.0.0-alpha.7'
     }
   })
 })
diff --git a/packages/language-service/package.json b/packages/language-service/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "@types/mdast": "^4.0.0",
     "@types/unist": "^3.0.0",
-    "@volar/language-core": "2.0.0-alpha.3",
+    "@volar/language-core": "2.0.0-alpha.7",
     "remark-mdx": "^3.0.0",
     "remark-parse": "^11.0.0",
     "unified": "^11.0.0"

diff --git a/packages/vscode-mdx/package.json b/packages/vscode-mdx/package.json
@@ -48,8 +48,8 @@
     "@types/mdast": "^4.0.0",
     "@types/node": "^20.0.0",
     "@types/vscode": "^1.82.0",
-    "@volar/language-server": "2.0.0-alpha.3",
-    "@volar/vscode": "2.0.0-alpha.3",
+    "@volar/language-server": "2.0.0-alpha.7",
+    "@volar/vscode": "2.0.0-alpha.7",
     "@vscode/vsce": "^2.0.0",
     "esbuild": "^0.19.0",
     "mdast-util-to-markdown": "^2.0.0",

diff --git a/packages/vscode-mdx/src/extension.js b/packages/vscode-mdx/src/extension.js
@@ -1,7 +1,6 @@
 /**
  * @typedef {import('@volar/vscode').ExportsInfoForLabs} ExportsInfoForLabs
  * @typedef {import('vscode').ExtensionContext} ExtensionContext
- * @typedef {import('vscode').TextDocument} TextDocument
  */
 
 import * as languageServerProtocol from '@volar/language-server/protocol.js'
@@ -36,7 +35,7 @@ let disposable
  *
  * @param {ExtensionContext} context
  *   The extension context as given by VSCode.
- * @returns {Promise<ExportsInfoForLabs | undefined>}
+ * @returns {Promise<ExportsInfoForLabs>}
  *   Info for the
  *   [Volar,js Labs](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volarjs-labs)
  *   extension.
@@ -71,7 +70,7 @@ export async function activate(context) {
   return {
     volarLabs: {
       version: supportLabsVersion,
-      languageClients: [client],
+      languageClient: client,
       languageServerProtocol
     }
   }
@@ -121,12 +120,12 @@ async function startServer(context) {
             documentDropEditProvider
           ),
           ...(await Promise.all([
-            activateAutoInsertion([client], isMdxDocument),
+            activateAutoInsertion('mdx', client),
             activateTsVersionStatusItem(
+              'mdx',
               'mdx.selectTypescriptVersion',
               context,
               client,
-              isMdxDocument,
               (text) => 'TS ' + text
             )
           ]))
@@ -135,15 +134,3 @@ async function startServer(context) {
     )
   }
 }
-
-/**
- * Check whether or not a text document is MDX.
- *
- * @param {TextDocument} document
- *   The text document to check.
- * @returns {boolean}
- *   Whether or not the text document is MDX.
- */
-function isMdxDocument(document) {
-  return document.languageId === 'mdx'
-}