Skip to content

Expand classRegex search range #840

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

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Expand classRegex search range #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/tailwindcss-language-service/src/completionProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,8 @@ async function provideCustomClassNameCompletions(
const positionOffset = document.offsetAt(position)

const searchRange: Range = {
start: document.positionAt(Math.max(0, positionOffset - 1000)),
end: document.positionAt(positionOffset + 1000),
start: document.positionAt(0),
end: document.positionAt(positionOffset + 2000),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this PR @bradlc, it makes the situation with #837 much better.

Do you think if it’s possible to expose 2000 as an extension option? In our codebase, we have several instances of cva() which are pretty heavy on comments, so they end up being more than 2K characters long.

I guess that if we look for cva( + ), the regexp might still not work. Or is it necessary to rewrite it? What do you reckon?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I'm open to adding it as a config option. Can you share an example from your project that wouldn't be caught within the new range?

Copy link

@kachkaev kachkaev Aug 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The project is closed sourced, so I can’t share the snippet, sorry. You can imagine chadcn → button.tsx (which is 1000 chars long), but with:

  • a few more variants, including compoundVariants
  • extra spacing between groups of lines
  • comments explaining the difference between variants
  • a few more class names with selectors (hover:, sm:, data-[some-state=some-value]:, [&>svg]: and so on)

It’s quite easy to go beyond 2K symbols with all these.

Copy link

@kachkaev kachkaev Aug 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is an ‘aerial view’ of a real-life cva() call with 10,724 characters in-between 😁

}

let str = document.getText(searchRange)
Expand Down
2 changes: 1 addition & 1 deletion packages/tailwindcss-language-service/src/util/find.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ async function findCustomClassLists(

if (!Array.isArray(regexes) || regexes.length === 0) return []

const text = doc.getText(range)
const text = doc.getText(range ? { ...range, start: doc.positionAt(0) } : undefined)
const result: DocumentClassList[] = []

for (let i = 0; i < regexes.length; i++) {
Expand Down