Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(language-core): optimize matching of scoped class and v-bind() #4679

Merged
merged 6 commits into from
Aug 25, 2024
Merged

fix(language-core): optimize matching of scoped class and v-bind() #4679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ada472
fix: optimize matching of scoped class
KazariEX Aug 11, 2024
cb9e020
fix: optimize matching of `v-bind()`
KazariEX Aug 13, 2024
99f7be2
fix: `\w*`
KazariEX Aug 13, 2024
f5c42d4
test: drop incorrect case
KazariEX Aug 13, 2024
44634ba
Merge branch 'master' into pr/4679
johnsoncodehk Aug 25, 2024
7d095d6
Update renaming.spec.ts
johnsoncodehk Aug 25, 2024
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: 4 additions & 6 deletions packages/language-core/lib/utils/parseCssClassNames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import { clearComments } from './parseCssVars';

const cssClassNameReg = /(?=([\.]{1}[a-zA-Z_]+[\w\_\-]*)[\s\.\,\+\{\>#\:]{1})/g;
const cssClassNameReg = /(?=(\.[a-z_][-\w]*)[\s.,+~>:#[{])/gi;

export function* parseCssClassNames(styleContent: string) {
styleContent = clearComments(styleContent);
const matches = styleContent.matchAll(cssClassNameReg);
for (const match of matches) {
if (match.index !== undefined) {
const matchText = match[1];
if (matchText !== undefined) {
yield { offset: match.index, text: matchText };
}
const matchText = match[1];
if (matchText) {
yield { offset: match.index, text: matchText };
}
}
}
12 changes: 5 additions & 7 deletions packages/language-core/lib/utils/parseCssVars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
// https://github.com/vuejs/core/blob/main/packages/compiler-sfc/src/cssVars.ts#L47-L61

const vBindCssVarReg = /\bv-bind\(\s*(?:'([^']+)'|"([^"]+)"|([^'"][^)]*))\s*\)/g;
const vBindCssVarReg = /\bv-bind\(\s*(?:'([^']+)'|"([^"]+)"|([a-z_]\w*))\s*\)/gi;
const commentReg1 = /\/\*([\s\S]*?)\*\//g;
const commentReg2 = /\/\/([\s\S]*?)\n/g;

export function* parseCssVars(styleContent: string) {
styleContent = clearComments(styleContent);
const matchs = styleContent.matchAll(vBindCssVarReg);
for (const match of matchs) {
if (match.index !== undefined) {
const matchText = match[1] ?? match[2] ?? match[3];
if (matchText !== undefined) {
const offset = match.index + styleContent.slice(match.index).indexOf(matchText);
yield { offset, text: matchText };
}
const matchText = match.slice(1).find(t => t);
if (matchText) {
const offset = match.index + styleContent.slice(match.index).indexOf(matchText);
yield { offset, text: matchText };
}
}
}
Expand Down
43 changes: 8 additions & 35 deletions packages/language-server/tests/renaming.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ describe('Renaming', async () => {
.bar { color: v-bind(foo|); }
.bar { color: v-bind('foo'); }
.bar { color: v-bind("foo"); }
.bar { color: v-bind(foo + foo); }
.bar { color: v-bind('foo + foo'); }
.bar { color: v-bind("foo + foo"); }
.bar { color: v-bind(); }
Expand All @@ -199,32 +198,6 @@ describe('Renaming', async () => {
{
"changes": {
"file://\${testWorkspacePath}/fixture.vue": [
{
"newText": "bar",
"range": {
"end": {
"character": 34,
"line": 10,
},
"start": {
"character": 31,
"line": 10,
},
},
},
{
"newText": "bar",
"range": {
"end": {
"character": 28,
"line": 10,
},
"start": {
"character": 25,
"line": 10,
},
},
},
{
"newText": "bar",
"range": {
Expand Down Expand Up @@ -256,11 +229,11 @@ describe('Renaming', async () => {
"range": {
"end": {
"character": 35,
"line": 12,
"line": 11,
},
"start": {
"character": 32,
"line": 12,
"line": 11,
},
},
},
Expand All @@ -269,11 +242,11 @@ describe('Renaming', async () => {
"range": {
"end": {
"character": 29,
"line": 12,
"line": 11,
},
"start": {
"character": 26,
"line": 12,
"line": 11,
},
},
},
Expand All @@ -282,11 +255,11 @@ describe('Renaming', async () => {
"range": {
"end": {
"character": 35,
"line": 11,
"line": 10,
},
"start": {
"character": 32,
"line": 11,
"line": 10,
},
},
},
Expand All @@ -295,11 +268,11 @@ describe('Renaming', async () => {
"range": {
"end": {
"character": 29,
"line": 11,
"line": 10,
},
"start": {
"character": 26,
"line": 11,
"line": 10,
},
},
},
Expand Down