updates

packages/language-server/index.js

@@ -2,10 +2,10 @@
 import process from 'node:process'
 import {
   createConnection,
-  startLanguageServer
+  startTypeScriptServer
 } from '@volar/language-server/node.js'
 import {plugin} from './lib/language-server-plugin.js'
 
 process.title = 'mdx-language-server'
 
-startLanguageServer(createConnection(), plugin)
+startTypeScriptServer(createConnection(), plugin)

packages/language-server/lib/language-server-plugin.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import('@volar/language-server/node.js').LanguageServerPlugin} LanguageServerPlugin
+ * @typedef {import('@volar/language-server/node.js').TypeScriptServerPlugin} TypeScriptServerPlugin
  */
 
 import assert from 'node:assert'
@@ -9,9 +9,9 @@ import {create as createTypeScriptService} from 'volar-service-typescript'
 import {loadPlugins} from './configuration.js'
 
 /**
- * @type {LanguageServerPlugin}
+ * @type {TypeScriptServerPlugin}
  */
-export function plugin(initOptions, modules) {
+export function plugin({modules}) {
   return {
     extraFileExtensions: [
       {extension: 'mdx', isMixedContent: true, scriptKind: 7}
@@ -29,11 +29,11 @@ export function plugin(initOptions, modules) {
       'tsx'
     ],
 
-    async resolveConfig(config, ctx) {
+    async resolveConfig(config, env, projectHost) {
       assert(modules.typescript, 'TypeScript module is missing')
 
       const plugins = await loadPlugins(
-        ctx?.project?.tsConfig,
+        projectHost?.configFileName,
         modules.typescript
       )
 

packages/language-server/package.json

@@ -38,11 +38,13 @@
     "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.0",
     "volar-service-markdown": "0.0.17",
-    "volar-service-typescript": "0.0.17"
+    "volar-service-typescript": "0.0.17",
+    "vscode-uri": "^3.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "@types/normalize-path": "^3.0.0",
-    "normalize-path": "^3.0.0"
+    "normalize-path": "^3.0.0",
+    "unified": "^11.0.0"
   }
 }

packages/language-server/test/completion.test.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
@@ -9,7 +9,7 @@ import {
   CompletionResolveRequest,
   InitializeRequest,
   InsertTextFormat
-} from 'vscode-languageserver'
+} from '@volar/language-server'
 import {
   createConnection,
   fixturePath,

packages/language-server/test/definitions.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {DefinitionRequest, InitializeRequest} from 'vscode-languageserver'
+import {DefinitionRequest, InitializeRequest} from '@volar/language-server'
 import {createConnection, fixtureUri, openTextDocument, tsdk} from './utils.js'
 
 /** @type {ProtocolConnection} */

packages/language-server/test/diagnostics.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {InitializeRequest} from 'vscode-languageserver'
+import {InitializeRequest} from '@volar/language-server'
 import {
   createConnection,
   fixtureUri,

packages/language-server/test/document-link.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {DocumentLinkRequest, InitializeRequest} from 'vscode-languageserver'
+import {DocumentLinkRequest, InitializeRequest} from '@volar/language-server'
 import {
   createConnection,
   fixturePath,

packages/language-server/test/document-symbols.test.js

@@ -1,13 +1,13 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
 import {
   DocumentSymbolRequest,
   InitializeRequest,
   SymbolKind
-} from 'vscode-languageserver'
+} from '@volar/language-server'
 import {createConnection, fixtureUri, openTextDocument, tsdk} from './utils.js'
 
 /** @type {ProtocolConnection} */

packages/language-server/test/folding-ranges.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {FoldingRangeRequest, InitializeRequest} from 'vscode-languageserver'
+import {FoldingRangeRequest, InitializeRequest} from '@volar/language-server'
 import {createConnection, fixtureUri, openTextDocument, tsdk} from './utils.js'
 
 /** @type {ProtocolConnection} */

packages/language-server/test/hover.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {HoverRequest, InitializeRequest} from 'vscode-languageserver'
+import {HoverRequest, InitializeRequest} from '@volar/language-server'
 import {createConnection, fixtureUri, openTextDocument, tsdk} from './utils.js'
 
 /** @type {ProtocolConnection} */

packages/language-server/test/initialize.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver-protocol').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {InitializeRequest} from 'vscode-languageserver-protocol'
+import {InitializeRequest} from '@volar/language-server'
 import {createConnection, fixtureUri, tsdk} from './utils.js'
 
 /** @type {ProtocolConnection} */

packages/language-server/test/no-tsconfig.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {InitializeRequest} from 'vscode-languageserver'
+import {InitializeRequest} from '@volar/language-server'
 import {
   createConnection,
   openTextDocument,

packages/language-server/test/plugins.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {InitializeRequest} from 'vscode-languageserver'
+import {InitializeRequest} from '@volar/language-server'
 import {
   createConnection,
   openTextDocument,

packages/language-server/test/prepare-rename.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {InitializeRequest, PrepareRenameRequest} from 'vscode-languageserver'
+import {InitializeRequest, PrepareRenameRequest} from '@volar/language-server'
 import {createConnection, fixtureUri, openTextDocument, tsdk} from './utils.js'
 
 /** @type {ProtocolConnection} */

packages/language-server/test/rename.test.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
  */
 import assert from 'node:assert/strict'
 import {afterEach, beforeEach, test} from 'node:test'
-import {InitializeRequest, RenameRequest} from 'vscode-languageserver'
+import {InitializeRequest, RenameRequest} from '@volar/language-server'
 import {createConnection, fixtureUri, openTextDocument, tsdk} from './utils.js'
 
 /** @type {ProtocolConnection} */

packages/language-server/test/utils.js

@@ -1,7 +1,7 @@
 /**
- * @typedef {import('vscode-languageserver').TextDocumentItem} TextDocumentItem
- * @typedef {import('vscode-languageserver').ProtocolConnection} ProtocolConnection
- * @typedef {import('vscode-languageserver').PublishDiagnosticsParams} PublishDiagnosticsParams
+ * @typedef {import('@volar/language-server').TextDocumentItem} TextDocumentItem
+ * @typedef {import('@volar/language-server').ProtocolConnection} ProtocolConnection
+ * @typedef {import('@volar/language-server').PublishDiagnosticsParams} PublishDiagnosticsParams
  */
 
 import {spawn} from 'node:child_process'
@@ -15,7 +15,7 @@ import {
   IPCMessageReader,
   IPCMessageWriter,
   PublishDiagnosticsNotification
-} from 'vscode-languageserver/node.js'
+} from '@volar/language-server/node.js'
 import {URI} from 'vscode-uri'
 // eslint-disable-next-line import/order
 import normalizePath from 'normalize-path'

packages/language-service/lib/language-module.js

@@ -112,6 +112,7 @@ function getVirtualFiles(fileName, snapshot, ts, processor) {
         codegenStacks: [],
         embeddedFiles: [],
         fileName: fileName + '.jsx',
+        languageId: 'javascriptreact',
         kind: FileKind.TypeScriptHostFile,
         mappings: jsxMappings,
         snapshot: ts.ScriptSnapshot.fromString(fallback)
@@ -121,6 +122,7 @@ function getVirtualFiles(fileName, snapshot, ts, processor) {
         codegenStacks: [],
         embeddedFiles: [],
         fileName: fileName + '.md',
+        languageId: 'markdown',
         kind: FileKind.TypeScriptHostFile,
         mappings: mdMappings,
         snapshot: ts.ScriptSnapshot.fromString(mdx)
@@ -152,6 +154,7 @@ function getVirtualFiles(fileName, snapshot, ts, processor) {
           codegenStacks: [],
           embeddedFiles: [],
           fileName: fileName + '.yaml',
+          languageId: 'yaml',
           kind: FileKind.TypeScriptHostFile,
           mappings: [
             {
@@ -282,6 +285,7 @@ function getVirtualFiles(fileName, snapshot, ts, processor) {
       codegenStacks: [],
       embeddedFiles: [],
       fileName: fileName + '.jsx',
+      languageId: 'javascriptreact',
       kind: FileKind.TypeScriptHostFile,
       mappings: jsxMappings,
       snapshot: ts.ScriptSnapshot.fromString(js)
@@ -291,6 +295,7 @@ function getVirtualFiles(fileName, snapshot, ts, processor) {
       codegenStacks: [],
       embeddedFiles: [],
       fileName: fileName + '.md',
+      languageId: 'markdown',
       kind: FileKind.TypeScriptHostFile,
       mappings: mdMappings,
       snapshot: ts.ScriptSnapshot.fromString(mdShadow)
@@ -332,6 +337,7 @@ export function getLanguageModule(ts, plugins) {
         codegenStacks: [],
         embeddedFiles: getVirtualFiles(fileName, snapshot, ts, processor),
         fileName,
+        languageId: 'mdx',
         kind: FileKind.TextFile,
         mappings: [
           {
@@ -364,7 +370,7 @@ export function getLanguageModule(ts, plugins) {
       )
     },
 
-    resolveHost(host) {
+    resolveTypeScriptProjectHost(host) {
       return {
         ...host,
         getCompilationSettings: () => ({

packages/language-service/test/language-module.js

@@ -8,7 +8,7 @@ import {
   FileCapabilities,
   FileKind,
   FileRangeCapabilities
-} from '@volar/language-server'
+} from '@volar/language-core'
 import remarkFrontmatter from 'remark-frontmatter'
 import typescript from 'typescript'
 import {getLanguageModule} from '@mdx-js/language-service'
@@ -694,13 +694,13 @@ test('update virtual file', () => {
 test('compilation setting defaults', () => {
   const module = getLanguageModule(typescript)
 
-  const host = module.resolveHost?.({
+  const host = module.resolveTypeScriptProjectHost?.({
     getCompilationSettings: () => ({}),
     getProjectVersion: () => '1',
     getScriptFileNames: () => [],
     getScriptSnapshot: () => undefined,
-    rootPath: '/',
-    workspacePath: '/'
+    getCurrentDirectory: () => '/',
+    configFileName: undefined,
   })
 
   const compilerOptions = host?.getCompilationSettings()
@@ -718,7 +718,7 @@ test('compilation setting defaults', () => {
 test('compilation setting overrides', () => {
   const module = getLanguageModule(typescript)
 
-  const host = module.resolveHost?.({
+  const host = module.resolveTypeScriptProjectHost?.({
     getCompilationSettings: () => ({
       jsx: typescript.JsxEmit.React,
       jsxFactory: 'h',
@@ -730,8 +730,8 @@ test('compilation setting overrides', () => {
     getProjectVersion: () => '1',
     getScriptFileNames: () => [],
     getScriptSnapshot: () => undefined,
-    rootPath: '/',
-    workspacePath: '/'
+    getCurrentDirectory: () => '/',
+    configFileName: undefined,
   })
 
   const compilerOptions = host?.getCompilationSettings()

packages/vscode-mdx/package.json

@@ -45,6 +45,7 @@
     "vscode:prepublish": "npm run build"
   },
   "devDependencies": {
+    "@types/mdast": "^4.0.0",
     "@types/node": "^20.0.0",
     "@types/vscode": "^1.82.0",
     "@volar/language-server": "~1.11.0",