combine vBindShorthand.ts and types.ts

vuejs · johnsoncodehk · Oct 23, 2024 · Aug 7, 2024 · Aug 7, 2024 · Aug 7, 2024
commit 1e84ae7125236d81f9469d7622b78d4378b5fbfc
diff --git a/...re/lib/codegen/template/vBindShorthand.ts → ...s/language-core/lib/codegen/inlayHints.ts b/...re/lib/codegen/template/vBindShorthand.ts → ...s/language-core/lib/codegen/inlayHints.ts
@@ -1,7 +1,16 @@
 import type * as CompilerDOM from '@vue/compiler-dom';
-import type { InlayHintInfo } from "../types";
 
-export function generateVBindShorthandInlayHint(loc: CompilerDOM.SourceLocation, variableName: string): InlayHintInfo {
+export interface InlayHintInfo {
+	blockName: string;
+	offset: number;
+	setting: string;
+	label: string;
+	tooltip?: string;
+	paddingRight?: boolean;
+	paddingLeft?: boolean;
+}
+
+export function createVBindShorthandInlayHintInfo(loc: CompilerDOM.SourceLocation, variableName: string): InlayHintInfo {
 	return {
 		blockName: 'template',
 		offset: loc.end.offset,
@@ -13,4 +22,4 @@ export function generateVBindShorthandInlayHint(loc: CompilerDOM.SourceLocation,
 			'[More info](https://github.com/vuejs/core/pull/9451)',
 		].join('\n\n'),
 	};
-};
+}
diff --git a/packages/language-core/lib/codegen/script/context.ts b/packages/language-core/lib/codegen/script/context.ts
@@ -1,4 +1,4 @@
-import { InlayHintInfo } from '../types';
+import { InlayHintInfo } from '../inlayHints';
 import { getLocalTypesGenerator } from '../localTypes';
 import type { ScriptCodegenOptions } from './index';
 

diff --git a/packages/language-core/lib/codegen/template/context.ts b/packages/language-core/lib/codegen/template/context.ts
@@ -2,7 +2,7 @@ import type * as CompilerDOM from '@vue/compiler-dom';
 import type { Code, VueCodeInformation } from '../../types';
 import { endOfLine, newLine, wrapWith } from '../common';
 import type { TemplateCodegenOptions } from './index';
-import { InlayHintInfo } from '../types';
+import { InlayHintInfo } from '../inlayHints';
 
 const _codeFeatures = {
 	all: {

diff --git a/packages/language-core/lib/codegen/template/element.ts b/packages/language-core/lib/codegen/template/element.ts
@@ -15,7 +15,7 @@ import { generateInterpolation } from './interpolation';
 import { generatePropertyAccess } from './propertyAccess';
 import { generateTemplateChild } from './templateChild';
 import { generateObjectProperty } from './objectProperty';
-import { generateVBindShorthandInlayHint } from './vBindShorthand';
+import { createVBindShorthandInlayHintInfo } from '../inlayHints';
 import { getNodeText } from '../../parsers/scriptSetupRanges';
 
 const colonReg = /:/g;
@@ -115,7 +115,7 @@ export function* generateComponent(
 	}
 	else if (dynamicTagInfo) {
 		if (dynamicTagInfo.isComponentIsShorthand) {
-			ctx.inlayHints.push(generateVBindShorthandInlayHint(dynamicTagInfo.exp.loc, 'is'));
+			ctx.inlayHints.push(createVBindShorthandInlayHintInfo(dynamicTagInfo.exp.loc, 'is'));
 		}
 		yield `const ${var_originalComponent} = (`;
 		yield* generateInterpolation(

diff --git a/packages/language-core/lib/codegen/template/elementProps.ts b/packages/language-core/lib/codegen/template/elementProps.ts
@@ -11,7 +11,7 @@ import { generateEventArg, generateEventExpression } from './elementEvents';
 import type { TemplateCodegenOptions } from './index';
 import { generateInterpolation } from './interpolation';
 import { generateObjectProperty } from './objectProperty';
-import { generateVBindShorthandInlayHint } from './vBindShorthand';
+import { createVBindShorthandInlayHintInfo } from '../inlayHints';
 
 export function* generateElementProps(
 	options: TemplateCodegenOptions,
@@ -335,7 +335,7 @@ function* generatePropExp(
 					features
 				);
 				if (enableCodeFeatures) {
-					ctx.inlayHints.push(generateVBindShorthandInlayHint(prop.loc, propVariableName));
+					ctx.inlayHints.push(createVBindShorthandInlayHintInfo(prop.loc, propVariableName));
 				}
 			}
 		}

diff --git a/packages/language-core/lib/codegen/template/slotOutlet.ts b/packages/language-core/lib/codegen/template/slotOutlet.ts
@@ -6,7 +6,7 @@ import { generateElementChildren } from './elementChildren';
 import { generateElementProps } from './elementProps';
 import type { TemplateCodegenOptions } from './index';
 import { generateInterpolation } from './interpolation';
-import { generateVBindShorthandInlayHint } from './vBindShorthand';
+import { createVBindShorthandInlayHintInfo } from '../inlayHints';
 
 export function* generateSlotOutlet(
 	options: TemplateCodegenOptions,
@@ -83,7 +83,7 @@ export function* generateSlotOutlet(
 		) {
 			const isShortHand = nameProp.arg?.loc.start.offset === nameProp.exp.loc.start.offset;
 			if (isShortHand) {
-				ctx.inlayHints.push(generateVBindShorthandInlayHint(nameProp.exp.loc, 'name'));
+				ctx.inlayHints.push(createVBindShorthandInlayHintInfo(nameProp.exp.loc, 'name'));
 			}
 			const slotExpVar = ctx.getInternalVariable();
 			yield `var ${slotExpVar} = `;

diff --git a/packages/language-core/lib/codegen/types.ts b/packages/language-core/lib/codegen/types.ts