1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts
index 941554f165372cf461f94d82d5f1a7f4aa9f6c4c..adacd136a9a752e0df6731784e1a5fbf05345fd8 100644
--- a/packages/tailwindcss-language-service/src/completionProvider.ts
+++ b/packages/tailwindcss-language-service/src/completionProvider.ts
@@ -1,4 +1,4 @@
-import { Settings, State } from './util/state'
+import { Settings, State, Variant } from './util/state'
import type {
CompletionItem,
CompletionItemKind,
@@ -110,7 +110,6 @@ }
}
}
- let allVariants = Object.keys(state.variants)
let { variants: existingVariants, offset } = getVariantsFromClassName(state, partialClassName)
replacementRange.start.character += offset
@@ -123,55 +122,109 @@
let items: CompletionItem[] = []
if (!important) {
- let shouldSortVariants = !semver.gte(state.version, '2.99.0')
+ let variantOrder = 0
+
+ function variantItem(
+ item: Omit<CompletionItem, 'kind' | 'data' | 'sortText' | 'textEdit'> & {
+ textEdit?: { newText: string; range?: Range }
+ }
+ ): CompletionItem {
+ return {
+ kind: 9,
+ data: 'variant',
+ command:
+ item.insertTextFormat === 2 // Snippet
+ ? undefined
+ : {
+ title: '',
+ command: 'editor.action.triggerSuggest',
+ },
+ sortText: '-' + naturalExpand(variantOrder++),
+ ...item,
+ textEdit: {
+ newText: item.label,
+ range: replacementRange,
+ ...item.textEdit,
+ },
+ }
+ }
items.push(
- ...Object.entries(state.variants)
- .filter(([variant]) => !existingVariants.includes(variant))
- .map(([variant, definition], index) => {
- let resultingVariants = [...existingVariants, variant]
+ ...state.variants.flatMap((variant) => {
+ let items: CompletionItem[] = []
+
+ if (variant.isArbitrary) {
+ items.push(
+ variantItem({
+ label: `${variant.name}${variant.hasDash ? '-' : ''}[]${sep}`,
+ insertTextFormat: 2,
+ textEdit: {
+ newText: `${variant.name}-[\${1:&}]${sep}\${0}`,
+ },
+ // command: {
+ // title: '',
+ // command: 'tailwindCSS.onInsertArbitraryVariantSnippet',
+ // arguments: [variant.name, replacementRange],
+ // },
+ })
+ )
+ } else if (!existingVariants.includes(variant.name)) {
+ let shouldSortVariants = !semver.gte(state.version, '2.99.0')
+ let resultingVariants = [...existingVariants, variant.name]
if (shouldSortVariants) {
+ let allVariants = state.variants.map(({ name }) => name)
resultingVariants = resultingVariants.sort(
(a, b) => allVariants.indexOf(b) - allVariants.indexOf(a)
)
}
- return {
- label: variant + sep,
- kind: 9,
- detail: definition,
- data: 'variant',
- command: {
- title: '',
- command: 'editor.action.triggerSuggest',
- },
- sortText: '-' + naturalExpand(index),
- textEdit: {
- newText: resultingVariants[resultingVariants.length - 1] + sep,
- range: replacementRange,
- },
- additionalTextEdits:
- shouldSortVariants && resultingVariants.length > 1
- ? [
- {
- newText:
- resultingVariants.slice(0, resultingVariants.length - 1).join(sep) + sep,
- range: {
- start: {
- ...classListRange.start,
- character: classListRange.end.character - partialClassName.length,
- },
- end: {
- ...replacementRange.start,
- character: replacementRange.start.character,
+ items.push(
+ variantItem({
+ label: `${variant.name}${sep}`,
+ detail: variant.selectors().join(', '),
+ textEdit: {
+ newText: resultingVariants[resultingVariants.length - 1] + sep,
+ },
+ additionalTextEdits:
+ shouldSortVariants && resultingVariants.length > 1
+ ? [
+ {
+ newText:
+ resultingVariants.slice(0, resultingVariants.length - 1).join(sep) +
+ sep,
+ range: {
+ start: {
+ ...classListRange.start,
+ character: classListRange.end.character - partialClassName.length,
+ },
+ end: {
+ ...replacementRange.start,
+ character: replacementRange.start.character,
+ },
},
},
- },
- ]
- : [],
- } as CompletionItem
- })
+ ]
+ : [],
+ })
+ )
+ }
+
+ if (variant.values.length) {
+ items.push(
+ ...variant.values
+ .filter((value) => !existingVariants.includes(`${variant.name}-${value}`))
+ .map((value) =>
+ variantItem({
+ label: `${variant.name}${variant.hasDash ? '-' : ''}${value}${sep}`,
+ detail: variant.selectors({ value }).join(', '),
+ })
+ )
+ )
+ }
+
+ return items
+ })
)
}
@@ -790,7 +843,12 @@ const parts = match.groups.partial.split(/\s*,\s*/)
if (/\s+/.test(parts[parts.length - 1])) return null
- let possibleVariants = Object.keys(state.variants)
+ let possibleVariants = state.variants.flatMap((variant) => {
+ if (variant.values.length) {
+ return variant.values.map((value) => `${variant.name}${variant.hasDash ? '-' : ''}${value}`)
+ }
+ return [variant.name]
+ })
const existingVariants = parts.slice(0, parts.length - 1)
if (state.jit) {
|