refactor(typescript): split into multiple ServicePlugins (#83)

packages/typescript-twoslash-queries/index.ts

@@ -1,15 +1,14 @@
 import type { InlayHint, ServicePlugin, ServicePluginInstance } from '@volar/language-service';
 import type { Provide } from 'volar-service-typescript';
 
-export function create(): ServicePlugin {
+export function create(ts: typeof import('typescript')): ServicePlugin {
 	return {
 		name: 'typescript-twoslash-queries',
 		create(context): ServicePluginInstance {
 			return {
 				provideInlayHints(document, range) {
 					if (isTsDocument(document.languageId)) {
 
-						const ts = context.inject<Provide, 'typescript/typescript'>('typescript/typescript');
 						const languageService = context.inject<Provide, 'typescript/languageService'>('typescript/languageService');
 						const inlayHints: InlayHint[] = [];
 

packages/typescript/directiveComment.ts

@@ -0,0 +1,85 @@
+import type * as vscode from '@volar/language-service';
+import * as nls from 'vscode-nls';
+import { isTsDocument } from './lib/shared';
+
+const localize = nls.loadMessageBundle(); // TODO: not working
+
+interface Directive {
+	readonly value: string;
+	readonly description: string;
+}
+
+const directives: Directive[] = [
+	{
+		value: '@ts-check',
+		description: localize(
+			'ts-check',
+			"Enables semantic checking in a JavaScript file. Must be at the top of a file.")
+	}, {
+		value: '@ts-nocheck',
+		description: localize(
+			'ts-nocheck',
+			"Disables semantic checking in a JavaScript file. Must be at the top of a file.")
+	}, {
+		value: '@ts-ignore',
+		description: localize(
+			'ts-ignore',
+			"Suppresses @ts-check errors on the next line of a file.")
+	}, {
+		value: '@ts-expect-error',
+		description: localize(
+			'ts-expect-error',
+			"Suppresses @ts-check errors on the next line of a file, expecting at least one to exist.")
+	}
+];
+
+export function create(): vscode.ServicePlugin {
+	return {
+		name: 'typescript-directive-comment',
+		triggerCharacters: ['@'],
+		create(): vscode.ServicePluginInstance {
+
+			return {
+
+				provideCompletionItems(document, position) {
+
+					if (!isTsDocument(document))
+						return;
+
+					const prefix = document.getText({
+						start: { line: position.line, character: 0 },
+						end: position,
+					});
+					const match = prefix.match(/^\s*\/\/+\s?(@[a-zA-Z\-]*)?$/);
+					if (match) {
+
+						const items = directives.map(directive => {
+
+							const item: vscode.CompletionItem = { label: directive.value };
+							item.insertTextFormat = 2 satisfies typeof vscode.InsertTextFormat.Snippet;
+							item.detail = directive.description;
+							const range: vscode.Range = {
+								start: {
+									line: position.line,
+									character: Math.max(0, position.character - (match[1] ? match[1].length : 0)),
+								},
+								end: position,
+							};
+							item.textEdit = {
+								range,
+								newText: directive.value,
+							};
+
+							return item;
+						});
+
+						return {
+							isIncomplete: false,
+							items,
+						};
+					}
+				},
+			};
+		},
+	};
+}

packages/typescript/lib/features/completions/jsDoc.ts → packages/typescript/docCommentTemplate.ts

@@ -1,44 +1,56 @@
 import type * as vscode from '@volar/language-service';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import * as nls from 'vscode-nls';
-import type { SharedContext } from '../../types';
-import { getLineText } from './resolve';
+import { isTsDocument } from './lib/shared';
+import { getLanguageService } from './lib/syntacticLanguageService';
+import { getLineText } from './lib/utils/lspConverters';
 
 const localize = nls.loadMessageBundle(); // TODO: not working
 
 const defaultJsDoc = `/**\n * $0\n */`;
 
-export function register(ctx: SharedContext) {
-	return (uri: string, position: vscode.Position) => {
+export function create(ts: typeof import('typescript')): vscode.ServicePlugin {
+	return {
+		name: 'typescript-doc-comment-template',
+		triggerCharacters: ['*'],
+		create(): vscode.ServicePluginInstance {
 
-		const document = ctx.getTextDocument(uri);
-		if (!document)
-			return;
+			return {
 
-		if (!isPotentiallyValidDocCompletionPosition(document, position))
-			return;
+				provideCompletionItems(document, position) {
 
-		const fileName = ctx.uriToFileName(document.uri);
-		const offset = document.offsetAt(position);
+					if (!isTsDocument(document))
+						return;
 
-		const docCommentTemplate = ctx.languageService.getDocCommentTemplateAtPosition(fileName, offset);
-		if (!docCommentTemplate)
-			return;
+					if (!isPotentiallyValidDocCompletionPosition(document, position))
+						return;
 
-		let insertText: string;
+					const { languageService, fileName } = getLanguageService(ts, document);
+					const offset = document.offsetAt(position);
+					const docCommentTemplate = languageService.getDocCommentTemplateAtPosition(fileName, offset);
+					if (!docCommentTemplate)
+						return;
 
-		// Workaround for #43619
-		// docCommentTemplate previously returned undefined for empty jsdoc templates.
-		// TS 2.7 now returns a single line doc comment, which breaks indentation.
-		if (docCommentTemplate.newText === '/** */') {
-			insertText = defaultJsDoc;
-		} else {
-			insertText = templateToSnippet(docCommentTemplate.newText);
-		}
+					let insertText: string;
+
+					// Workaround for #43619
+					// docCommentTemplate previously returned undefined for empty jsdoc templates.
+					// TS 2.7 now returns a single line doc comment, which breaks indentation.
+					if (docCommentTemplate.newText === '/** */') {
+						insertText = defaultJsDoc;
+					} else {
+						insertText = templateToSnippet(docCommentTemplate.newText);
+					}
 
-		const item = createCompletionItem(document, position, insertText);
+					const item = createCompletionItem(document, position, insertText);
 
-		return item;
+					return {
+						isIncomplete: false,
+						items: [item],
+					};
+				},
+			};
+		},
 	};
 }