Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/language-server/lib/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ export function startServer(ts: typeof import('typescript')) {
isRefAtPosition(...args) {
return sendTsServerRequest('_vue:isRefAtPosition', args);
},
resolveModuleName(...args) {
return sendTsServerRequest('_vue:resolveModuleName', args);
},
getDocumentHighlights(fileName, position) {
return sendTsServerRequest(
'_vue:documentHighlights-full',
Expand Down
2 changes: 1 addition & 1 deletion packages/language-service/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export function createVueLanguageServicePlugins(
}),
) {
return [
createCssPlugin(),
createJsonPlugin(),
createPugFormatPlugin(),
createVueAutoSpacePlugin(),
Expand All @@ -65,6 +64,7 @@ export function createVueLanguageServicePlugins(
createVueInlayHintsPlugin(ts),

// type aware plugins
createCssPlugin(client),
createTypescriptSemanticTokensPlugin(client),
createVueAutoDotValuePlugin(ts, client),
createVueComponentSemanticTokensPlugin(client),
Expand Down
29 changes: 21 additions & 8 deletions packages/language-service/lib/plugins/css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,31 @@ import type { LanguageServicePlugin, TextDocument, VirtualCode } from '@volar/la
import { isRenameEnabled } from '@vue/language-core';
import { create as baseCreate, type Provide } from 'volar-service-css';
import type * as css from 'vscode-css-languageservice';
import { resolveEmbeddedCode } from '../utils';
import { createTsAliasDocumentLinksProviders, resolveEmbeddedCode } from '../utils';

export function create(): LanguageServicePlugin {
const base = baseCreate({ scssDocumentSelector: ['scss', 'postcss'] });
export function create(
{ resolveModuleName }: import('@vue/typescript-plugin/lib/requests').Requests,
): LanguageServicePlugin {
const baseService = baseCreate({ scssDocumentSelector: ['scss', 'postcss'] });
return {
...base,
...baseService,
capabilities: {
...baseService.capabilities,
documentLinkProvider: {
resolveProvider: true,
},
},
create(context) {
const baseInstance = base.create(context);
const baseServiceInstance = baseService.create(context);
const {
'css/languageService': getCssLs,
'css/stylesheet': getStylesheet,
} = baseInstance.provide as Provide;
} = baseServiceInstance.provide as Provide;

return {
...baseInstance,
...baseServiceInstance,
async provideDiagnostics(document, token) {
let diagnostics = await baseInstance.provideDiagnostics?.(document, token) ?? [];
let diagnostics = await baseServiceInstance.provideDiagnostics?.(document, token) ?? [];
if (document.languageId === 'postcss') {
diagnostics = diagnostics.filter(diag =>
diag.code !== 'css-semicolonexpected'
Expand Down Expand Up @@ -48,6 +56,11 @@ export function create(): LanguageServicePlugin {
return cssLs.prepareRename(document, position, stylesheet);
});
},
...createTsAliasDocumentLinksProviders(
context,
baseServiceInstance,
resolveModuleName,
),
};

function isWithinNavigationVirtualCode(
Expand Down
14 changes: 12 additions & 2 deletions packages/language-service/lib/plugins/vue-template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import * as html from 'vscode-html-languageservice';
import { URI, Utils } from 'vscode-uri';
import { loadModelModifiersData, loadTemplateData } from '../data';
import { AttrNameCasing, checkCasing, TagNameCasing } from '../nameCasing';
import { resolveEmbeddedCode } from '../utils';
import { createTsAliasDocumentLinksProviders, resolveEmbeddedCode } from '../utils';

const specialTags = new Set([
'slot',
Expand All @@ -45,11 +45,12 @@ export function create(
languageId: 'html' | 'jade',
{
getComponentNames,
getElementAttrs,
getComponentProps,
getComponentEvents,
getComponentDirectives,
getComponentSlots,
getElementAttrs,
resolveModuleName,
}: import('@vue/typescript-plugin/lib/requests').Requests,
): LanguageServicePlugin {
let customData: html.IHTMLDataProvider[] = [];
Expand Down Expand Up @@ -99,6 +100,9 @@ export function create(
],
},
hoverProvider: true,
documentLinkProvider: {
resolveProvider: true,
},
},
create(context) {
const baseServiceInstance = baseService.create(context);
Expand Down Expand Up @@ -362,6 +366,12 @@ export function create(

return baseServiceInstance.provideHover?.(document, position, token);
},

...createTsAliasDocumentLinksProviders(
context,
baseServiceInstance,
resolveModuleName,
),
};

async function runWithVueData<T>(sourceDocumentUri: URI, root: VueVirtualCode, fn: () => T) {
Expand Down
59 changes: 58 additions & 1 deletion packages/language-service/lib/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { LanguageServiceContext, SourceScript } from '@volar/language-service';
import type { LanguageServiceContext, LanguageServicePluginInstance, SourceScript } from '@volar/language-service';
import type { VueVirtualCode } from '@vue/language-core';
import { URI } from 'vscode-uri';

Expand All @@ -19,3 +19,60 @@ export function resolveEmbeddedCode(
root: sourceScript.generated!.root as VueVirtualCode,
};
}

export function createTsAliasDocumentLinksProviders(
context: LanguageServiceContext,
service: LanguageServicePluginInstance,
resolveModuleName: import('@vue/typescript-plugin/lib/requests').Requests['resolveModuleName'],
): Pick<
LanguageServicePluginInstance,
'provideDocumentLinks' | 'resolveDocumentLink'
> {
return {
async provideDocumentLinks(document, token) {
const info = resolveEmbeddedCode(context, document.uri);
if (!info) {
return;
}

const { root } = info;

const documentLinks = await service.provideDocumentLinks?.(document, token);

for (const link of documentLinks ?? []) {
if (!link.target) {
continue;
}

let text = document.getText(link.range);

if (text.startsWith('./') || text.startsWith('../')) {
continue;
}

if (text.startsWith(`'`) || text.startsWith(`"`)) {
text = text.slice(1, -1);
}

link.data = {
fileName: root.fileName,
text: text,
originalTarget: link.target,
};

delete link.target;
}
return documentLinks;
},

async resolveDocumentLink(link) {
const { fileName, text, originalTarget } = link.data;
const { name } = await resolveModuleName(fileName, text) || {};

return {
...link,
target: name ?? originalTarget,
};
},
};
}
5 changes: 5 additions & 0 deletions packages/typescript-plugin/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { getElementAttrs } from './lib/requests/getElementAttrs';
import { getElementNames } from './lib/requests/getElementNames';
import { getImportPathForFile } from './lib/requests/getImportPathForFile';
import { isRefAtPosition } from './lib/requests/isRefAtPosition';
import { resolveModuleName } from './lib/requests/resolveModuleName';

export = createLanguageServicePlugin(
(ts, info) => {
Expand Down Expand Up @@ -170,6 +171,10 @@ export = createLanguageServicePlugin(
const { project } = getProject(fileName);
return createResponse(getElementNames(ts, project.getLanguageService().getProgram()!));
});
session.addProtocolHandler('_vue:resolveModuleName', request => {
const [fileName, moduleName]: Parameters<Requests['resolveModuleName']> = request.arguments;
return createResponse(resolveModuleName(ts, info.languageServiceHost, fileName, moduleName));
});

projectService.logger.info('Vue specific commands are successfully added.');

Expand Down
4 changes: 4 additions & 0 deletions packages/typescript-plugin/lib/requests/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ export interface Requests {
getElementNames(
fileName: string,
): Response<ReturnType<typeof import('./getElementNames.js')['getElementNames']>>;
resolveModuleName(
fileName: string,
moduleName: string,
): Response<ReturnType<typeof import('./resolveModuleName.js')['resolveModuleName']>>;
getDocumentHighlights(
fileName: string,
position: number,
Expand Down
38 changes: 38 additions & 0 deletions packages/typescript-plugin/lib/requests/resolveModuleName.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import type * as ts from 'typescript';

export function resolveModuleName(
ts: typeof import('typescript'),
languageServiceHost: ts.LanguageServiceHost,
fileName: string,
moduleName: string,
): { name?: string } {
const compilerOptions = languageServiceHost.getCompilationSettings();

const ext = moduleName.split('.').pop();

const result = ts.resolveModuleName(
moduleName,
fileName,
{
...compilerOptions,
allowArbitraryExtensions: true,
},
{
fileExists(fileName) {
fileName = transformFileName(fileName, ext);
},
} as ts.ModuleResolutionHost,
);

const resolveFileName = result.resolvedModule?.resolvedFileName;
return {
name: resolveFileName ? transformFileName(resolveFileName, ext) : undefined,
};
}

function transformFileName(fileName: string, ext: string | undefined) {
if (ext && fileName.endsWith(`.d.${ext}.ts`)) {
return fileName.slice(0, -`.d.${ext}.ts`.length) + `.${ext}`;
}
return fileName;
}
Loading