diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index c8885a042c5eb51664c1109dc4c802983a5013fe..4ed21b6f18858fbfb7eb37c1beef89b537f2203b 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -476,12 +476,12 @@ document: TextDocument, position: Position, context?: CompletionContext ): CompletionList { - if (isCssContext(state, document, position)) { - return provideAtApplyCompletions(state, document, position) - } - if (isHtmlContext(state, document, position) || isJsContext(state, document, position)) { return provideClassAttributeCompletions(state, document, position, context) + } + + if (isCssContext(state, document, position)) { + return provideAtApplyCompletions(state, document, position) } return null diff --git a/packages/tailwindcss-language-service/src/util/css.ts b/packages/tailwindcss-language-service/src/util/css.ts index da8f84d6c5cca4d7fab344df8ab07349c9c67136..1b590c05c3ef17d2a3ebbb7ee918ec064b92b176 100644 --- a/packages/tailwindcss-language-service/src/util/css.ts +++ b/packages/tailwindcss-language-service/src/util/css.ts @@ -1,24 +1,35 @@ import type { TextDocument, Position } from 'vscode-languageserver' import { isInsideTag, isVueDoc, isSvelteDoc, isHtmlDoc } from './html' -import { isJsDoc } from './js' import { State } from './state' -export const CSS_LANGUAGES = ['css', 'less', 'postcss', 'sass', 'scss', 'stylus', 'sugarss'] +export const CSS_LANGUAGES = [ + 'css', + 'less', + 'postcss', + 'sass', + 'scss', + 'stylus', + 'sugarss', +] export function isCssDoc(state: State, doc: TextDocument): boolean { - const userCssLanguages = Object.keys(state.editor.userLanguages).filter((lang) => - CSS_LANGUAGES.includes(state.editor.userLanguages[lang]) - ) + const userCssLanguages = Object.keys( + state.editor.userLanguages + ).filter((lang) => CSS_LANGUAGES.includes(state.editor.userLanguages[lang])) return [...CSS_LANGUAGES, ...userCssLanguages].indexOf(doc.languageId) !== -1 } -export function isCssContext(state: State, doc: TextDocument, position: Position): boolean { +export function isCssContext( + state: State, + doc: TextDocument, + position: Position +): boolean { if (isCssDoc(state, doc)) { return true } - if (isHtmlDoc(state, doc) || isVueDoc(doc) || isSvelteDoc(doc) || isJsDoc(state, doc)) { + if (isHtmlDoc(state, doc) || isVueDoc(doc) || isSvelteDoc(doc)) { let str = doc.getText({ start: { line: 0, character: 0 }, end: position,