Skip to content
Merged
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
10 changes: 5 additions & 5 deletions packages/language-core/lib/codegen/script/scriptSetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ function* generateSetupFunction(
}
}
if (scriptSetupRanges.cssModules.length) {
for (const { exp, arg } of scriptSetupRanges.cssModules) {
for (const { define: { arg, exp } } of scriptSetupRanges.cssModules) {
setupCodeModifies.push([
arg ? [
` as Omit<__VLS_StyleModules, '$style'>[`,
Expand All @@ -219,8 +219,8 @@ function* generateSetupFunction(
generateSfcBlockSection(scriptSetup, define.arg.start, define.arg.end, codeFeatures.navigation),
`], keyof __VLS_TemplateResult['refs']>`
],
define.arg.start - 1,
define.arg.start - 1
define.exp.end,
define.exp.end
]);
}
}
Expand Down Expand Up @@ -273,8 +273,8 @@ function* generateDefineWithType(
scriptSetup: NonNullable<Sfc['scriptSetup']>,
name: string | undefined,
define: {
statement: TextRange,
typeArg?: TextRange
statement: TextRange;
typeArg?: TextRange;
},
expression: TextRange,
defaultName: string,
Expand Down
19 changes: 8 additions & 11 deletions packages/language-core/lib/parsers/scriptSetupRanges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,11 @@ export function parseScriptSetupRanges(
inheritAttrs?: string;
} = {};
const cssModules: {
exp: TextRange;
arg?: TextRange;
define: ReturnType<typeof parseDefineFunction>;
}[] = [];
const templateRefs: {
name?: string;
define?: ReturnType<typeof parseDefineFunction>;
define: ReturnType<typeof parseDefineFunction>;
}[] = [];
const definePropProposalA = vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition' || ast.text.trimStart().startsWith('// @experimentalDefinePropProposal=kevinEdition');
const definePropProposalB = vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition' || ast.text.trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition');
Expand Down Expand Up @@ -130,11 +129,13 @@ export function parseScriptSetupRanges(
}

function parseDefineFunction(node: ts.CallExpression): TextRange & {
exp: TextRange;
arg?: TextRange;
typeArg?: TextRange;
} {
return {
..._getStartEnd(node),
exp: _getStartEnd(node.expression),
arg: node.arguments.length ? _getStartEnd(node.arguments[0]) : undefined,
typeArg: node.typeArguments?.length ? _getStartEnd(node.typeArguments[0]) : undefined,
};
Expand Down Expand Up @@ -371,7 +372,6 @@ export function parseScriptSetupRanges(
}
} else if (vueCompilerOptions.composibles.useTemplateRef.includes(callText) && node.arguments.length && !node.typeArguments?.length) {
const define = parseDefineFunction(node);
define.arg = _getStartEnd(node.arguments[0]);
let name;
if (ts.isVariableDeclaration(parent)) {
name = getNodeText(ts, parent.name, ast);
Expand All @@ -382,13 +382,10 @@ export function parseScriptSetupRanges(
});
}
else if (vueCompilerOptions.composibles.useCssModule.includes(callText)) {
const module: (typeof cssModules)[number] = {
exp: _getStartEnd(node)
};
if (node.arguments.length) {
module.arg = _getStartEnd(node.arguments[0]);
}
cssModules.push(module);
const define = parseDefineFunction(node);
cssModules.push({
define
});
}
}
ts.forEachChild(node, child => {
Expand Down
1 change: 1 addition & 0 deletions test-workspace/tsc/passedFixtures/vue2/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"../vue3/#4777",
"../vue3/#4820",
"../vue3/#4822",
"../vue3/#4828",
"../vue3/components",
"../vue3/defineEmits",
"../vue3/defineModel",
Expand Down
1 change: 1 addition & 0 deletions test-workspace/tsc/passedFixtures/vue3.4/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"../vue3/#3820",
"../vue3/#4777",
"../vue3/#4820",
"../vue3/#4828",
"../vue3/rootEl",
"../vue3/templateRef",
"../vue3/templateRef_native",
Expand Down
14 changes: 14 additions & 0 deletions test-workspace/tsc/passedFixtures/vue3/#4828/main.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<script setup lang="ts">
import { exactType } from '../../shared';
import { useTemplateRef } from 'vue';

const ref1 = useTemplateRef('input');
const ref2 = useTemplateRef( 'input');

exactType(ref1.value!, {} as HTMLInputElement);
exactType(ref2.value!, {} as HTMLInputElement);
</script>

<template>
<input ref="input">
</template>