From c9acd0d12493cee03aeddb942a8ace1fbe674556 Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Thu, 13 Oct 2022 09:23:19 +0100 Subject: [PATCH] Fix IntelliSense when separator is `--` (#628) * Fix IntelliSense when separator is `--` * Tidy up --- .../tailwindcss-language-server/src/server.ts | 5 +- .../src/util/getVariantsFromClassName.ts | 78 ++++++------------- 2 files changed, 27 insertions(+), 56 deletions(-) diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index 15d1900..dbc1f0b 100644 --- a/packages/tailwindcss-language-server/src/server.ts +++ b/packages/tailwindcss-language-server/src/server.ts @@ -1504,7 +1504,10 @@ class TW { resolveProvider: true, triggerCharacters: [ ...TRIGGER_CHARACTERS, - ...projects.map((project) => project.state.separator).filter(Boolean), + ...projects + .map((project) => project.state.separator) + .filter((sep) => typeof sep === 'string') + .map((sep) => sep.slice(-1)), ].filter(Boolean), }) diff --git a/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts b/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts index 795569e..10dfe90 100644 --- a/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts +++ b/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts @@ -6,7 +6,7 @@ export function getVariantsFromClassName( className: string ): { variants: string[]; offset: number } { let allVariants = Object.keys(state.variants) - let parts = Array.from(splitAtTopLevelOnly(className, state.separator)).filter(Boolean) + let parts = splitAtTopLevelOnly(className, state.separator).filter(Boolean) let variants = new Set() let offset = 0 @@ -29,66 +29,34 @@ export function getVariantsFromClassName( return { variants: Array.from(variants), offset } } -const REGEX_SPECIAL = /[\\^$.*+?()[\]{}|]/g -const REGEX_HAS_SPECIAL = RegExp(REGEX_SPECIAL.source) +// https://github.com/tailwindlabs/tailwindcss/blob/a8a2e2a7191fbd4bee044523aecbade5823a8664/src/util/splitAtTopLevelOnly.js +function splitAtTopLevelOnly(input: string, separator: string): string[] { + let stack: string[] = [] + let parts: string[] = [] + let lastPos = 0 -function regexEscape(string: string): string { - return string && REGEX_HAS_SPECIAL.test(string) - ? string.replace(REGEX_SPECIAL, '\\$&') - : string || '' -} + for (let idx = 0; idx < input.length; idx++) { + let char = input[idx] -function* splitAtTopLevelOnly(input: string, separator: string): Generator { - let SPECIALS = new RegExp(`[(){}\\[\\]${regexEscape(separator)}]`, 'g') - - let depth = 0 - let lastIndex = 0 - let found = false - let separatorIndex = 0 - let separatorStart = 0 - let separatorLength = separator.length - - // Find all paren-like things & character - // And only split on commas if they're top-level - for (let match of input.matchAll(SPECIALS)) { - let matchesSeparator = match[0] === separator[separatorIndex] - let atEndOfSeparator = separatorIndex === separatorLength - 1 - let matchesFullSeparator = matchesSeparator && atEndOfSeparator - - if (match[0] === '(') depth++ - if (match[0] === ')') depth-- - if (match[0] === '[') depth++ - if (match[0] === ']') depth-- - if (match[0] === '{') depth++ - if (match[0] === '}') depth-- - - if (matchesSeparator && depth === 0) { - if (separatorStart === 0) { - separatorStart = match.index + if (stack.length === 0 && char === separator[0]) { + if (separator.length === 1 || input.slice(idx, idx + separator.length) === separator) { + parts.push(input.slice(lastPos, idx)) + lastPos = idx + separator.length } - - separatorIndex++ } - if (matchesFullSeparator && depth === 0) { - found = true - - yield input.substring(lastIndex, separatorStart) - lastIndex = separatorStart + separatorLength - } - - if (separatorIndex === separatorLength) { - separatorIndex = 0 - separatorStart = 0 + if (char === '(' || char === '[' || char === '{') { + stack.push(char) + } else if ( + (char === ')' && stack[stack.length - 1] === '(') || + (char === ']' && stack[stack.length - 1] === '[') || + (char === '}' && stack[stack.length - 1] === '{') + ) { + stack.pop() } } - // Provide the last segment of the string if available - // Otherwise the whole string since no `char`s were found - // This mirrors the behavior of string.split() - if (found) { - yield input.substring(lastIndex) - } else { - yield input - } + parts.push(input.slice(lastPos)) + + return parts }