From 3c30ac373ff2ea17da9bb0eee0034e69cc8715c0 Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Fri, 8 Dec 2023 01:48:30 +0800 Subject: [PATCH] Update Volar --- packages/language-server/package.json | 6 +- .../language-service/lib/language-module.js | 14 ++--- packages/language-service/package.json | 2 +- .../language-service/test/language-module.js | 56 +++++++++---------- packages/vscode-mdx/package.json | 4 +- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/packages/language-server/package.json b/packages/language-server/package.json index ba2c6d86..8d77d017 100644 --- a/packages/language-server/package.json +++ b/packages/language-server/package.json @@ -33,12 +33,12 @@ }, "dependencies": { "@mdx-js/language-service": "0.2.0", - "@volar/language-server": "2.0.0-alpha.0", + "@volar/language-server": "2.0.0-alpha.2", "load-plugin": "^5.0.0", "remark-frontmatter": "^5.0.0", "remark-gfm": "^4.0.0", - "volar-service-markdown": "0.0.18", - "volar-service-typescript": "0.0.18", + "volar-service-markdown": "0.0.19", + "volar-service-typescript": "0.0.19", "vscode-uri": "^3.0.0" }, "devDependencies": { diff --git a/packages/language-service/lib/language-module.js b/packages/language-service/lib/language-module.js index c28b217f..299a3428 100644 --- a/packages/language-service/lib/language-module.js +++ b/packages/language-service/lib/language-module.js @@ -83,13 +83,13 @@ function findLastOffset(node) { } /** - * @param {string} fileId + * @param {string} fileName * @param {IScriptSnapshot} snapshot * @param {typeof import('typescript')} ts * @param {Processor} processor * @returns {VirtualFile[]} */ -function getVirtualFiles(fileId, snapshot, ts, processor) { +function getVirtualFiles(fileName, snapshot, ts, processor) { const mdx = snapshot.getText(0, snapshot.getLength()) /** @type {VirtualFile['mappings']} */ const jsxMappings = [] @@ -104,7 +104,7 @@ function getVirtualFiles(fileId, snapshot, ts, processor) { return [ { embeddedFiles: [], - id: fileId + '.jsx', + fileName: fileName + '.jsx', languageId: 'javascriptreact', typescript: { scriptKind: ts.ScriptKind.JSX @@ -114,7 +114,7 @@ function getVirtualFiles(fileId, snapshot, ts, processor) { }, { embeddedFiles: [], - id: fileId + '.md', + fileName: fileName + '.md', languageId: 'markdown', mappings: mdMappings, snapshot: ts.ScriptSnapshot.fromString(mdx) @@ -143,7 +143,7 @@ function getVirtualFiles(fileId, snapshot, ts, processor) { const frontmatterStart = frontmatterWithFences.indexOf(node.value) virtualFiles.push({ embeddedFiles: [], - id: fileId + '.yaml', + fileName: fileName + '.yaml', languageId: 'yaml', mappings: [ { @@ -308,7 +308,7 @@ function getVirtualFiles(fileId, snapshot, ts, processor) { virtualFiles.unshift( { embeddedFiles: [], - id: fileId + '.jsx', + fileName: fileName + '.jsx', languageId: 'javascriptreact', typescript: { scriptKind: ts.ScriptKind.JSX @@ -318,7 +318,7 @@ function getVirtualFiles(fileId, snapshot, ts, processor) { }, { embeddedFiles: [], - id: fileId + '.md', + fileName: fileName + '.md', languageId: 'markdown', mappings: mdMappings, snapshot: ts.ScriptSnapshot.fromString(mdShadow) diff --git a/packages/language-service/package.json b/packages/language-service/package.json index 74ffefdb..830e3022 100644 --- 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.0", + "@volar/language-core": "2.0.0-alpha.2", "remark-mdx": "^3.0.0", "remark-parse": "^11.0.0", "unified": "^11.0.0", diff --git a/packages/language-service/test/language-module.js b/packages/language-service/test/language-module.js index 97dd6900..40e1df7e 100644 --- a/packages/language-service/test/language-module.js +++ b/packages/language-service/test/language-module.js @@ -16,7 +16,7 @@ test('create virtual file w/ mdxjsEsm', () => { const file = module.createVirtualFile('file:///test.mdx', 'mdx', snapshot) assert.deepEqual(file, { - id: 'file:///test.mdx', + fileName: '/test.mdx', languageId: 'mdx', mappings: [ { @@ -37,7 +37,7 @@ test('create virtual file w/ mdxjsEsm', () => { embeddedFiles: [ { embeddedFiles: [], - id: 'file:///test.mdx.jsx', + fileName: '/test.mdx.jsx', languageId: 'javascriptreact', typescript: { scriptKind: 2 @@ -80,7 +80,7 @@ test('create virtual file w/ mdxjsEsm', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.md', + fileName: '/test.mdx.md', languageId: 'markdown', mappings: [], snapshot: snapshotFromLines(' ', '') @@ -97,7 +97,7 @@ test('create virtual file w/ mdxFlowExpression', () => { const file = module.createVirtualFile('file:///test.mdx', 'mdx', snapshot) assert.deepEqual(file, { - id: 'file:///test.mdx', + fileName: '/test.mdx', languageId: 'mdx', mappings: [ { @@ -118,7 +118,7 @@ test('create virtual file w/ mdxFlowExpression', () => { embeddedFiles: [ { embeddedFiles: [], - id: 'file:///test.mdx.jsx', + fileName: '/test.mdx.jsx', languageId: 'javascriptreact', typescript: { scriptKind: 2 @@ -161,7 +161,7 @@ test('create virtual file w/ mdxFlowExpression', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.md', + fileName: '/test.mdx.md', languageId: 'markdown', mappings: [], snapshot: snapshotFromLines(' ', '') @@ -185,7 +185,7 @@ test('create virtual file w/ mdxJsxFlowElement w/ children', () => { const file = module.createVirtualFile('file:///test.mdx', 'mdx', snapshot) assert.deepEqual(file, { - id: 'file:///test.mdx', + fileName: '/test.mdx', languageId: 'mdx', mappings: [ { @@ -206,7 +206,7 @@ test('create virtual file w/ mdxJsxFlowElement w/ children', () => { embeddedFiles: [ { embeddedFiles: [], - id: 'file:///test.mdx.jsx', + fileName: '/test.mdx.jsx', languageId: 'javascriptreact', typescript: { scriptKind: 2 @@ -270,7 +270,7 @@ test('create virtual file w/ mdxJsxFlowElement w/ children', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.md', + fileName: '/test.mdx.md', languageId: 'markdown', mappings: [ { @@ -308,7 +308,7 @@ test('create virtual file w/ mdxJsxFlowElement w/o children', () => { const file = module.createVirtualFile('file:///test.mdx', 'mdx', snapshot) assert.deepEqual(file, { - id: 'file:///test.mdx', + fileName: '/test.mdx', languageId: 'mdx', mappings: [ { @@ -329,7 +329,7 @@ test('create virtual file w/ mdxJsxFlowElement w/o children', () => { embeddedFiles: [ { embeddedFiles: [], - id: 'file:///test.mdx.jsx', + fileName: '/test.mdx.jsx', languageId: 'javascriptreact', mappings: [ { @@ -372,7 +372,7 @@ test('create virtual file w/ mdxJsxFlowElement w/o children', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.md', + fileName: '/test.mdx.md', languageId: 'markdown', mappings: [], snapshot: snapshotFromLines(' ', '') @@ -389,7 +389,7 @@ test('create virtual file w/ mdxJsxTextElement', () => { const file = module.createVirtualFile('file:///test.mdx', 'mdx', snapshot) assert.deepEqual(file, { - id: 'file:///test.mdx', + fileName: '/test.mdx', languageId: 'mdx', mappings: [ { @@ -410,7 +410,7 @@ test('create virtual file w/ mdxJsxTextElement', () => { embeddedFiles: [ { embeddedFiles: [], - id: 'file:///test.mdx.jsx', + fileName: '/test.mdx.jsx', languageId: 'javascriptreact', typescript: { scriptKind: 2 @@ -453,7 +453,7 @@ test('create virtual file w/ mdxJsxTextElement', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.md', + fileName: '/test.mdx.md', languageId: 'markdown', mappings: [ { @@ -484,7 +484,7 @@ test('create virtual file w/ mdxTextExpression', () => { const file = module.createVirtualFile('file:///test.mdx', 'mdx', snapshot) assert.deepEqual(file, { - id: 'file:///test.mdx', + fileName: '/test.mdx', languageId: 'mdx', mappings: [ { @@ -505,7 +505,7 @@ test('create virtual file w/ mdxTextExpression', () => { embeddedFiles: [ { embeddedFiles: [], - id: 'file:///test.mdx.jsx', + fileName: '/test.mdx.jsx', languageId: 'javascriptreact', typescript: { scriptKind: 2 @@ -548,7 +548,7 @@ test('create virtual file w/ mdxTextExpression', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.md', + fileName: '/test.mdx.md', languageId: 'markdown', mappings: [ { @@ -592,7 +592,7 @@ test('create virtual file w/ syntax error', () => { const file = module.createVirtualFile('file:///test.mdx', 'mdx', snapshot) assert.deepEqual(file, { - id: 'file:///test.mdx', + fileName: '/test.mdx', languageId: 'mdx', mappings: [ { @@ -613,7 +613,7 @@ test('create virtual file w/ syntax error', () => { embeddedFiles: [ { embeddedFiles: [], - id: 'file:///test.mdx.jsx', + fileName: '/test.mdx.jsx', languageId: 'javascriptreact', mappings: [], snapshot: snapshotFromLines( @@ -640,7 +640,7 @@ test('create virtual file w/ syntax error', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.md', + fileName: '/test.mdx.md', languageId: 'markdown', mappings: [], snapshot: snapshotFromLines('<', '') @@ -657,7 +657,7 @@ test('create virtual file w/ yaml frontmatter', () => { const file = module.createVirtualFile('file:///test.mdx', 'mdx', snapshot) assert.deepEqual(file, { - id: 'file:///test.mdx', + fileName: '/test.mdx', languageId: 'mdx', mappings: [ { @@ -678,7 +678,7 @@ test('create virtual file w/ yaml frontmatter', () => { embeddedFiles: [ { embeddedFiles: [], - id: 'file:///test.mdx.jsx', + fileName: '/test.mdx.jsx', languageId: 'javascriptreact', mappings: [], snapshot: snapshotFromLines( @@ -711,7 +711,7 @@ test('create virtual file w/ yaml frontmatter', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.md', + fileName: '/test.mdx.md', languageId: 'markdown', mappings: [ { @@ -732,7 +732,7 @@ test('create virtual file w/ yaml frontmatter', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.yaml', + fileName: '/test.mdx.yaml', languageId: 'yaml', mappings: [ { @@ -768,7 +768,7 @@ test('update virtual file', () => { module.updateVirtualFile(/** @type {VirtualFile} */ (file), snapshot) assert.deepEqual(file, { - id: 'file:///test.mdx', + fileName: '/test.mdx', languageId: 'mdx', mappings: [ { @@ -789,7 +789,7 @@ test('update virtual file', () => { embeddedFiles: [ { embeddedFiles: [], - id: 'file:///test.mdx.jsx', + fileName: '/test.mdx.jsx', languageId: 'javascriptreact', mappings: [], snapshot: snapshotFromLines( @@ -818,7 +818,7 @@ test('update virtual file', () => { }, { embeddedFiles: [], - id: 'file:///test.mdx.md', + fileName: '/test.mdx.md', languageId: 'markdown', mappings: [ { diff --git a/packages/vscode-mdx/package.json b/packages/vscode-mdx/package.json index a6644aa2..a08bd3a2 100644 --- 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.0", - "@volar/vscode": "2.0.0-alpha.0", + "@volar/language-server": "2.0.0-alpha.2", + "@volar/vscode": "2.0.0-alpha.2", "@vscode/vsce": "^2.0.0", "esbuild": "^0.19.0", "mdast-util-to-markdown": "^2.0.0",