Skip to content

Commit b7bf51f

Browse files
committed
fix completions and hovers inside <style> (fixes tailwindlabs#334)
1 parent b8dc88d commit b7bf51f

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

packages/tailwindcss-language-service/src/completionProvider.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -476,14 +476,14 @@ function provideClassNameCompletions(
476476
position: Position,
477477
context?: CompletionContext
478478
): CompletionList {
479-
if (isHtmlContext(state, document, position) || isJsContext(state, document, position)) {
480-
return provideClassAttributeCompletions(state, document, position, context)
481-
}
482-
483479
if (isCssContext(state, document, position)) {
484480
return provideAtApplyCompletions(state, document, position)
485481
}
486482

483+
if (isHtmlContext(state, document, position) || isJsContext(state, document, position)) {
484+
return provideClassAttributeCompletions(state, document, position, context)
485+
}
486+
487487
return null
488488
}
489489

packages/tailwindcss-language-service/src/util/css.ts

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,24 @@
11
import type { TextDocument, Position } from 'vscode-languageserver'
22
import { isInsideTag, isVueDoc, isSvelteDoc, isHtmlDoc } from './html'
3+
import { isJsDoc } from './js'
34
import { State } from './state'
45

5-
export const CSS_LANGUAGES = [
6-
'css',
7-
'less',
8-
'postcss',
9-
'sass',
10-
'scss',
11-
'stylus',
12-
'sugarss',
13-
]
6+
export const CSS_LANGUAGES = ['css', 'less', 'postcss', 'sass', 'scss', 'stylus', 'sugarss']
147

158
export function isCssDoc(state: State, doc: TextDocument): boolean {
16-
const userCssLanguages = Object.keys(
17-
state.editor.userLanguages
18-
).filter((lang) => CSS_LANGUAGES.includes(state.editor.userLanguages[lang]))
9+
const userCssLanguages = Object.keys(state.editor.userLanguages).filter((lang) =>
10+
CSS_LANGUAGES.includes(state.editor.userLanguages[lang])
11+
)
1912

2013
return [...CSS_LANGUAGES, ...userCssLanguages].indexOf(doc.languageId) !== -1
2114
}
2215

23-
export function isCssContext(
24-
state: State,
25-
doc: TextDocument,
26-
position: Position
27-
): boolean {
16+
export function isCssContext(state: State, doc: TextDocument, position: Position): boolean {
2817
if (isCssDoc(state, doc)) {
2918
return true
3019
}
3120

32-
if (isHtmlDoc(state, doc) || isVueDoc(doc) || isSvelteDoc(doc)) {
21+
if (isHtmlDoc(state, doc) || isVueDoc(doc) || isSvelteDoc(doc) || isJsDoc(state, doc)) {
3322
let str = doc.getText({
3423
start: { line: 0, character: 0 },
3524
end: position,

0 commit comments

Comments
 (0)