Skip to content

Commit cd444ab

Browse files
committed
make pseudo class name meta always an array
1 parent b51fd51 commit cd444ab

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

src/class-names/extractClassNames.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function getClassNamesFromSelector(selector) {
3636
className: node.value.trim(),
3737
scope: createSelectorFromNodes(scope),
3838
__rule: j === subSelectors[i].nodes.length - 1,
39-
__pseudo: pseudo.length === 0 ? null : pseudo.map(String),
39+
__pseudo: pseudo.map(String),
4040
})
4141
}
4242
scope.push(node, ...pseudo)
@@ -115,9 +115,7 @@ async function process(groups) {
115115

116116
dsetEach(tree, [...baseKeys, ...index], decls)
117117
}
118-
if (classNames[i].__pseudo) {
119-
dset(tree, [...baseKeys, '__pseudo'], classNames[i].__pseudo)
120-
}
118+
dset(tree, [...baseKeys, ...index, '__pseudo'], classNames[i].__pseudo)
121119
dset(tree, [...baseKeys, ...index, '__scope'], classNames[i].scope)
122120
dset(
123121
tree,
@@ -126,9 +124,7 @@ async function process(groups) {
126124
)
127125

128126
// common context
129-
if (classNames[i].__pseudo) {
130-
context.push(...classNames[i].__pseudo)
131-
}
127+
context.push(...classNames[i].__pseudo)
132128

133129
for (let i = 0; i < contextKeys.length; i++) {
134130
if (typeof commonContext[contextKeys[i]] === 'undefined') {

src/lsp/providers/completionProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ function provideAtApplyCompletions(
200200
return (
201201
!Array.isArray(info) &&
202202
info.__source === 'utilities' &&
203-
(info.__context || []).length === 0 &&
204-
(info.__pseudo || []).length === 0
203+
info.__context.length === 0 &&
204+
info.__pseudo.length === 0
205205
)
206206
}
207207
)

src/lsp/util/stringify.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function stringifyCss(className: string, obj: any): string {
5454
}
5555

5656
function augmentClassName(className: string, obj: any): string {
57-
const pseudo = obj.__pseudo ? obj.__pseudo.join('') : ''
57+
const pseudo = obj.__pseudo.join('')
5858
const scope = obj.__scope ? `${obj.__scope} ` : ''
5959
return `${scope}.${escapeClassName(className)}${pseudo}`
6060
}

0 commit comments

Comments
 (0)