Skip to content

Commit 0921bc8

Browse files
committed
fix: prevent process $$ | $
1 parent b6a99d9 commit 0921bc8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ function transformReactivityFunction(code: string, id: string) {
100100
if (node.type !== 'CallExpression') return
101101

102102
if (
103-
/^\$(?!(\$|ref|computed|shallowRef|toRef|customRef|defineProp|defineProps|defineModels)?(\(|$))/.test(
103+
/^\$(?!(\$|ref|computed|shallowRef|toRef|customRef|defineProp|defineProps|defineModels)?$)/.test(
104104
s.sliceNode(node.callee, { offset })
105105
)
106106
) {
107107
s.appendRight(node.callee.start! + offset + 1, '(')
108108
s.appendRight(node.end! + offset, ')')
109109
}
110110

111-
if (s.sliceNode(node.callee, { offset }).endsWith('$')) {
111+
if (/(?<!^(\$)?)\$$/.test(s.sliceNode(node.callee, { offset }))) {
112112
s.remove(node.callee.end! + offset - 1, node.callee.end! + offset)
113113

114114
node.arguments.forEach((argument) => {

Diff for: src/volar.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function transform({
9797
) {
9898
if (ts.isCallExpression(node)) {
9999
if (
100-
/^\$(?!(\$|ref|computed|shallowRef|toRef|customRef|defineProp|defineProps|defineModels)?(\(|$))/.test(
100+
/^\$(?!(\$|ref|computed|shallowRef|toRef|customRef|defineProp|defineProps|defineModels)?$)/.test(
101101
node.expression.getText(ast)
102102
)
103103
) {
@@ -111,7 +111,7 @@ function transform({
111111
replaceSourceRange(codes, source, node.getEnd(), node.getEnd(), ')')
112112
}
113113

114-
if (node.expression.getText(ast).endsWith('$')) {
114+
if (/(?<!^(\$)?)\$$/.test(node.expression.getText(ast))) {
115115
replaceSourceRange(
116116
codes,
117117
source,

0 commit comments

Comments
 (0)