refactor: remove unnecessary type annotation

KazariEX · KazariEX · commit 874300cb27d1 · 2024-11-04T01:39:53.000+08:00
diff --git a/extensions/vscode/src/features/doctor.ts b/extensions/vscode/src/features/doctor.ts
@@ -40,7 +40,7 @@ export async function activate(client: BaseLanguageClient) {
 		scheme,
 		{
 			onDidChange: docChangeEvent.event,
-			async provideTextDocumentContent(doctorUri: vscode.Uri): Promise<string | undefined> {
+			async provideTextDocumentContent(doctorUri: vscode.Uri) {
 
 				const fileUri = doctorUri.with({
 					scheme: 'file',
@@ -260,12 +260,12 @@ export async function activate(client: BaseLanguageClient) {
 	}
 }
 
-function getPackageJsonOfWorkspacePackage(folder: string, pkg: string): { path: string, json: { version: string; }; } | undefined {
+function getPackageJsonOfWorkspacePackage(folder: string, pkg: string) {
 	try {
 		const path = require.resolve(pkg + '/package.json', { paths: [folder] });
 		return {
 			path,
-			json: require(path),
+			json: require(path) as { version: string },
 		};
 	} catch { }
 }
diff --git a/extensions/vscode/src/languageClient.ts b/extensions/vscode/src/languageClient.ts
@@ -50,7 +50,7 @@ export function activate(
 	});
 }
 
-export function deactivate(): Thenable<any> | undefined {
+export function deactivate() {
 	return client?.stop();
 }
 
diff --git a/packages/component-meta/lib/base.ts b/packages/component-meta/lib/base.ts
@@ -666,11 +666,11 @@ function createSchemaResolvers(
 
 		return type;
 	}
-	function getDeclarations(declaration: ts.Declaration[]): Declaration[] {
+	function getDeclarations(declaration: ts.Declaration[]) {
 		if (noDeclarations) {
 			return [];
 		}
-		return declaration.map(getDeclaration).filter(d => !!d) as Declaration[];
+		return declaration.map(getDeclaration).filter(d => !!d);
 	}
 	function getDeclaration(declaration: ts.Declaration): Declaration | undefined {
 		const fileName = declaration.getSourceFile().fileName;
diff --git a/packages/language-core/lib/codegen/template/elementEvents.ts b/packages/language-core/lib/codegen/template/elementEvents.ts
@@ -211,7 +211,7 @@ export function isCompoundExpression(ts: typeof import('typescript'), ast: ts.So
 	return result;
 }
 
-function isPropertyAccessOrId(ts: typeof import('typescript'), node: ts.Node): boolean {
+function isPropertyAccessOrId(ts: typeof import('typescript'), node: ts.Node) {
 	if (ts.isIdentifier(node)) {
 		return true;
 	}
diff --git a/packages/language-core/lib/parsers/scriptSetupRanges.ts b/packages/language-core/lib/parsers/scriptSetupRanges.ts
@@ -136,11 +136,7 @@ export function parseScriptSetupRanges(
 		return getStartEnd(ts, node, ast);
 	}
 
-	function parseDefineFunction(node: ts.CallExpression): TextRange & {
-		exp: TextRange;
-		arg?: TextRange;
-		typeArg?: TextRange;
-	} {
+	function parseDefineFunction(node: ts.CallExpression) {
 		return {
 			..._getStartEnd(node),
 			exp: _getStartEnd(node.expression),
@@ -499,7 +495,7 @@ export function getStartEnd(
 	ts: typeof import('typescript'),
 	node: ts.Node,
 	sourceFile: ts.SourceFile
-) {
+): TextRange {
 	return {
 		start: (ts as any).getTokenPosOfNode(node, sourceFile) as number,
 		end: node.end,
diff --git a/packages/language-core/lib/plugins/file-vue.ts b/packages/language-core/lib/plugins/file-vue.ts
@@ -32,7 +32,7 @@ const plugin: VueLanguagePlugin = ({ vueCompilerOptions }) => {
 				sfc.descriptor.scriptSetup,
 				...sfc.descriptor.styles,
 				...sfc.descriptor.customBlocks,
-			].filter((block): block is NonNullable<typeof block> => !!block);
+			].filter(block => !!block);
 
 			const hitBlock = blocks.find(block => change.start >= block.loc.start.offset && change.end <= block.loc.end.offset);
 			if (!hitBlock) {
diff --git a/packages/language-core/lib/plugins/vue-tsx.ts b/packages/language-core/lib/plugins/vue-tsx.ts
@@ -42,8 +42,7 @@ const plugin: VueLanguagePlugin = ctx => {
 			if (/script_(js|jsx|ts|tsx)/.test(embeddedFile.id)) {
 				const tsx = _tsx.generatedScript.get();
 				if (tsx) {
-					const content: Code[] = [...tsx.codes];
-					embeddedFile.content = content;
+					embeddedFile.content = [...tsx.codes];
 					embeddedFile.linkedCodeMappings = [...tsx.linkedCodeMappings];
 				}
 			}
diff --git a/packages/language-core/lib/utils/ts.ts b/packages/language-core/lib/utils/ts.ts
@@ -156,7 +156,7 @@ function proxyParseConfigHostForExtendConfigPaths(parseConfigHost: ts.ParseConfi
 function getPartialVueCompilerOptions(
 	ts: typeof import('typescript'),
 	tsConfigSourceFile: ts.TsConfigSourceFile
-): Partial<VueCompilerOptions> {
+) {
 
 	const folder = path.dirname(tsConfigSourceFile.fileName);
 	const obj = ts.convertToObject(tsConfigSourceFile, []);
@@ -205,7 +205,7 @@ function getPartialVueCompilerOptions(
 
 	return result;
 
-	function resolvePath(scriptPath: string): string | undefined {
+	function resolvePath(scriptPath: string) {
 		try {
 			if (require?.resolve) {
 				return require.resolve(scriptPath, { paths: [folder] });
diff --git a/packages/language-core/lib/utils/vue2TemplateCompiler.ts b/packages/language-core/lib/utils/vue2TemplateCompiler.ts
@@ -72,7 +72,7 @@ export const compile: typeof CompilerDOM.compile = (template, options = {}) => {
 function baseCompile(
 	template: string,
 	options: CompilerDOM.CompilerOptions = {}
-): CompilerDOM.CodegenResult {
+) {
 
 	const onError = options.onError || (error => { throw error; });
 	const isModuleMode = options.mode === 'module';
diff --git a/packages/language-plugin-pug/index.ts b/packages/language-plugin-pug/index.ts
@@ -77,7 +77,7 @@ const plugin: VueLanguagePlugin = ({ modules }) => {
 
 					return createProxyObject(completed);
 
-					function createProxyObject(target: any): any {
+					function createProxyObject(target: any) {
 						const proxys = new WeakMap();
 						return new Proxy(target, {
 							get(target, prop, receiver) {
diff --git a/packages/language-server/lib/hybridModeProject.ts b/packages/language-server/lib/hybridModeProject.ts
@@ -16,7 +16,7 @@ export function createHybridModeProject(
 			project: ProjectContext;
 		}): void;
 	}>
-): LanguageServerProject {
+) {
 	let simpleLs: Promise<LanguageService> | undefined;
 	let server: LanguageServer;
 
diff --git a/packages/language-service/index.ts b/packages/language-service/index.ts
@@ -49,7 +49,7 @@ declare module '@volar/language-service' {
 export function getFullLanguageServicePlugins(
 	ts: typeof import('typescript'),
 	{ disableAutoImportCache }: { disableAutoImportCache?: boolean; } = {}
-): LanguageServicePlugin[] {
+) {
 	const plugins: LanguageServicePlugin[] = [
 		...createTypeScriptPlugins(ts, { disableAutoImportCache }),
 		...getCommonLanguageServicePlugins(
@@ -170,7 +170,7 @@ export function getFullLanguageServicePlugins(
 export function getHybridModeLanguageServicePlugins(
 	ts: typeof import('typescript'),
 	getTsPluginClient: typeof import("@vue/typescript-plugin/lib/client")
-): LanguageServicePlugin[] {
+) {
 	const plugins = [
 		createTypeScriptSyntacticPlugin(ts),
 		createTypeScriptDocCommentTemplatePlugin(ts),
diff --git a/packages/language-service/lib/plugins/css.ts b/packages/language-service/lib/plugins/css.ts
@@ -1,11 +1,11 @@
-import type { LanguageServicePlugin, LanguageServicePluginInstance } from '@volar/language-service';
+import type { LanguageServicePlugin } from '@volar/language-service';
 import { create as baseCreate } from 'volar-service-css';
 
 export function create(): LanguageServicePlugin {
 	const base = baseCreate({ scssDocumentSelector: ['scss', 'postcss'] });
 	return {
 		...base,
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			const baseInstance = base.create(context);
 			return {
 				...baseInstance,
diff --git a/packages/language-service/lib/plugins/vue-autoinsert-dotvalue.ts b/packages/language-service/lib/plugins/vue-autoinsert-dotvalue.ts
@@ -1,4 +1,4 @@
-import type { LanguageServiceContext, LanguageServicePlugin, LanguageServicePluginInstance } from '@volar/language-service';
+import type { LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import { hyphenateAttr } from '@vue/language-core';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
@@ -27,7 +27,7 @@ export function create(
 				configurationSections: ['vue.autoInsert.dotValue'],
 			},
 		},
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			const tsPluginClient = getTsPluginClient?.(context);
 			let currentReq = 0;
 			return {
diff --git a/packages/language-service/lib/plugins/vue-autoinsert-space.ts b/packages/language-service/lib/plugins/vue-autoinsert-space.ts
@@ -1,4 +1,4 @@
-import type { LanguageServicePlugin, LanguageServicePluginInstance } from '@volar/language-service';
+import type { LanguageServicePlugin } from '@volar/language-service';
 
 export function create(): LanguageServicePlugin {
 	return {
@@ -9,7 +9,7 @@ export function create(): LanguageServicePlugin {
 				configurationSections: ['vue.autoInsert.bracketSpacing'],
 			},
 		},
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			return {
 				async provideAutoInsertSnippet(document, selection, change) {
 
diff --git a/packages/language-service/lib/plugins/vue-complete-define-assignment.ts b/packages/language-service/lib/plugins/vue-complete-define-assignment.ts
@@ -1,4 +1,4 @@
-import type { LanguageServicePlugin, LanguageServicePluginInstance } from '@volar/language-service';
+import type { LanguageServicePlugin } from '@volar/language-service';
 import { TextRange, tsCodegen, VueVirtualCode } from '@vue/language-core';
 import type * as vscode from 'vscode-languageserver-protocol';
 import { URI } from 'vscode-uri';
@@ -10,7 +10,7 @@ export function create(): LanguageServicePlugin {
 		capabilities: {
 			completionProvider: {},
 		},
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			return {
 				isAdditionalCompletion: true,
 				async provideCompletionItems(document) {
diff --git a/packages/language-service/lib/plugins/vue-directive-comments.ts b/packages/language-service/lib/plugins/vue-directive-comments.ts
@@ -1,4 +1,4 @@
-import type { CompletionItem, LanguageServicePlugin, LanguageServicePluginInstance } from '@volar/language-service';
+import type { CompletionItem, LanguageServicePlugin } from '@volar/language-service';
 import type * as vscode from 'vscode-languageserver-protocol';
 
 const cmds = [
@@ -18,7 +18,7 @@ export function create(): LanguageServicePlugin {
 				triggerCharacters: ['@'],
 			},
 		},
-		create(): LanguageServicePluginInstance {
+		create() {
 			return {
 				provideCompletionItems(document, position) {
 
diff --git a/packages/language-service/lib/plugins/vue-document-drop.ts b/packages/language-service/lib/plugins/vue-document-drop.ts
@@ -5,7 +5,7 @@ import { getUserPreferences } from 'volar-service-typescript/lib/configs/getUser
 import type * as vscode from 'vscode-languageserver-protocol';
 import { URI } from 'vscode-uri';
 import { createAddComponentToOptionEdit, getLastImportNode } from '../plugins/vue-extract-file';
-import { LanguageServiceContext, LanguageServicePlugin, LanguageServicePluginInstance, TagNameCasing } from '../types';
+import { LanguageServiceContext, LanguageServicePlugin, TagNameCasing } from '../types';
 
 export function create(
 	ts: typeof import('typescript'),
@@ -16,7 +16,7 @@ export function create(
 		capabilities: {
 			documentDropEditsProvider: true,
 		},
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			if (!context.project.vue) {
 				return {};
 			}
diff --git a/packages/language-service/lib/plugins/vue-document-links.ts b/packages/language-service/lib/plugins/vue-document-links.ts
@@ -1,4 +1,4 @@
-import type { LanguageServicePlugin, LanguageServicePluginInstance } from '@volar/language-service';
+import type { LanguageServicePlugin } from '@volar/language-service';
 import { Sfc, VueVirtualCode, tsCodegen } from '@vue/language-core';
 import type * as vscode from 'vscode-languageserver-protocol';
 import { URI } from 'vscode-uri';
@@ -9,7 +9,7 @@ export function create(): LanguageServicePlugin {
 		capabilities: {
 			documentLinkProvider: {},
 		},
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			return {
 				provideDocumentLinks(document) {
 
diff --git a/packages/language-service/lib/plugins/vue-inlayhints.ts b/packages/language-service/lib/plugins/vue-inlayhints.ts
@@ -1,4 +1,3 @@
-import type { LanguageServicePluginInstance } from '@volar/language-service';
 import { tsCodegen, VueVirtualCode } from '@vue/language-core';
 import { collectIdentifiers } from '@vue/language-core/lib/codegen/utils/index';
 import type * as ts from 'typescript';
@@ -12,7 +11,7 @@ export function create(ts: typeof import('typescript')): LanguageServicePlugin {
 		capabilities: {
 			inlayHintProvider: {},
 		},
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			return {
 				async provideInlayHints(document, range) {
 
diff --git a/packages/language-service/lib/plugins/vue-sfc.ts b/packages/language-service/lib/plugins/vue-sfc.ts
@@ -1,4 +1,4 @@
-import type { LanguageServiceContext, LanguageServicePlugin, LanguageServicePluginInstance } from '@volar/language-service';
+import type { LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import * as vue from '@vue/language-core';
 import { create as createHtmlService } from 'volar-service-html';
 import * as html from 'vscode-html-languageservice';
@@ -43,7 +43,7 @@ export function create(): LanguageServicePlugin {
 	return {
 		...htmlPlugin,
 		name: 'vue-sfc',
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			const htmlPluginInstance = htmlPlugin.create(context);
 
 			return {
diff --git a/packages/language-service/lib/plugins/vue-template.ts b/packages/language-service/lib/plugins/vue-template.ts
@@ -86,7 +86,7 @@ export function create(
 				},
 			}
 		},
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			const tsPluginClient = getTsPluginClient?.(context);
 			const baseServiceInstance = baseService.create(context);
 
@@ -1032,7 +1032,7 @@ function getReplacement(list: html.CompletionList, doc: TextDocument) {
 
 function getPropName(
 	itemKey: ReturnType<typeof resolveItemKey> & {}
-): { isEvent: boolean, propName: string; } {
+) {
 	const name = hyphenateAttr(itemKey.prop);
 	if (name.startsWith('on-')) {
 		return { isEvent: true, propName: name.slice('on-'.length) };
diff --git a/packages/language-service/lib/plugins/vue-twoslash-queries.ts b/packages/language-service/lib/plugins/vue-twoslash-queries.ts
@@ -1,4 +1,4 @@
-import type { LanguageServiceContext, LanguageServicePlugin, LanguageServicePluginInstance } from '@volar/language-service';
+import type { LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import * as vue from '@vue/language-core';
 import type * as vscode from 'vscode-languageserver-protocol';
 import { URI } from 'vscode-uri';
@@ -13,7 +13,7 @@ export function create(
 		capabilities: {
 			inlayHintProvider: {},
 		},
-		create(context): LanguageServicePluginInstance {
+		create(context) {
 			const tsPluginClient = getTsPluginClient?.(context);
 			return {
 				async provideInlayHints(document, range) {
diff --git a/packages/tsc/tests/dts.spec.ts b/packages/tsc/tests/dts.spec.ts
@@ -88,7 +88,7 @@ function readFilesRecursive(dir: string) {
 	return result;
 }
 
-function shortenPath(path: string): string {
+function shortenPath(path: string) {
 	path = normalizePath(path);
 	const segments = path.split('/');
 	return segments.slice(-2).join('/');

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export async function activate(client: BaseLanguageClient) {`
`40`	`40`	`scheme,`
`41`	`41`	`{`
`42`	`42`	`onDidChange: docChangeEvent.event,`
`43`		`- async provideTextDocumentContent(doctorUri: vscode.Uri): Promise<string \| undefined> {`
	`43`	`+ async provideTextDocumentContent(doctorUri: vscode.Uri) {`
`44`	`44`
`45`	`45`	`const fileUri = doctorUri.with({`
`46`	`46`	`scheme: 'file',`
`@@ -260,12 +260,12 @@ export async function activate(client: BaseLanguageClient) {`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`263`		`-function getPackageJsonOfWorkspacePackage(folder: string, pkg: string): { path: string, json: { version: string; }; } \| undefined {`
	`263`	`+function getPackageJsonOfWorkspacePackage(folder: string, pkg: string) {`
`264`	`264`	`try {`
`265`	`265`	`const path = require.resolve(pkg + '/package.json', { paths: [folder] });`
`266`	`266`	`return {`
`267`	`267`	`path,`
`268`		`- json: require(path),`
	`268`	`+ json: require(path) as { version: string },`
`269`	`269`	`};`
`270`	`270`	`} catch { }`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ export function activate(`
`50`	`50`	`});`
`51`	`51`	`}`
`52`	`52`
`53`		`-export function deactivate(): Thenable<any> \| undefined {`
	`53`	`+export function deactivate() {`
`54`	`54`	`return client?.stop();`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -666,11 +666,11 @@ function createSchemaResolvers(`
`666`	`666`
`667`	`667`	`return type;`
`668`	`668`	`}`
`669`		`- function getDeclarations(declaration: ts.Declaration[]): Declaration[] {`
	`669`	`+ function getDeclarations(declaration: ts.Declaration[]) {`
`670`	`670`	`if (noDeclarations) {`
`671`	`671`	`return [];`
`672`	`672`	`}`
`673`		`- return declaration.map(getDeclaration).filter(d => !!d) as Declaration[];`
	`673`	`+ return declaration.map(getDeclaration).filter(d => !!d);`
`674`	`674`	`}`
`675`	`675`	`function getDeclaration(declaration: ts.Declaration): Declaration \| undefined {`
`676`	`676`	`const fileName = declaration.getSourceFile().fileName;`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ export function isCompoundExpression(ts: typeof import('typescript'), ast: ts.So`
`211`	`211`	`return result;`
`212`	`212`	`}`
`213`	`213`
`214`		`-function isPropertyAccessOrId(ts: typeof import('typescript'), node: ts.Node): boolean {`
	`214`	`+function isPropertyAccessOrId(ts: typeof import('typescript'), node: ts.Node) {`
`215`	`215`	`if (ts.isIdentifier(node)) {`
`216`	`216`	`return true;`
`217`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ const plugin: VueLanguagePlugin = ctx => {`
`42`	`42`	`if (/script_(js\|jsx\|ts\|tsx)/.test(embeddedFile.id)) {`
`43`	`43`	`const tsx = _tsx.generatedScript.get();`
`44`	`44`	`if (tsx) {`
`45`		`- const content: Code[] = [...tsx.codes];`
`46`		`- embeddedFile.content = content;`
	`45`	`+ embeddedFile.content = [...tsx.codes];`
`47`	`46`	`embeddedFile.linkedCodeMappings = [...tsx.linkedCodeMappings];`
`48`	`47`	`}`
`49`	`48`	`}`