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
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
|
diff --git a/src/lsp/providers/codeActionProvider/index.ts b/src/lsp/providers/codeActionProvider/index.ts
index 28b51444d56fb61000f2e34b32affdfdd19e4f01..959411af30b8194c3b3cf7531771774e91424ead 100644
--- a/src/lsp/providers/codeActionProvider/index.ts
+++ b/src/lsp/providers/codeActionProvider/index.ts
@@ -22,7 +22,10 @@ DiagnosticKind,
isInvalidApplyDiagnostic,
AugmentedDiagnostic,
InvalidApplyDiagnostic,
+ isUtilityConflictsDiagnostic,
+ UtilityConflictsDiagnostic,
} from '../diagnostics/types'
+import { flatten, dedupeBy } from '../../../util/array'
async function getDiagnosticsFromCodeActionParams(
state: State,
@@ -35,7 +38,11 @@
return params.context.diagnostics
.map((diagnostic) => {
return diagnostics.find((d) => {
- return rangesEqual(d.range, diagnostic.range)
+ return (
+ d.code === diagnostic.code &&
+ d.message === diagnostic.message &&
+ rangesEqual(d.range, diagnostic.range)
+ )
})
})
.filter(Boolean)
@@ -55,40 +62,46 @@ params,
codes
)
- return Promise.all(
- diagnostics
- .map((diagnostic) => {
- if (isInvalidApplyDiagnostic(diagnostic)) {
- return provideInvalidApplyCodeAction(state, params, diagnostic)
- }
+ let actions = diagnostics.map((diagnostic) => {
+ if (isInvalidApplyDiagnostic(diagnostic)) {
+ return provideInvalidApplyCodeActions(state, params, diagnostic)
+ }
+
+ if (isUtilityConflictsDiagnostic(diagnostic)) {
+ return provideUtilityConflictsCodeActions(state, params, diagnostic)
+ }
- let match = findLast(
- / Did you mean (?:something like )?'(?<replacement>[^']+)'\?$/g,
- diagnostic.message
- )
+ let match = findLast(
+ / Did you mean (?:something like )?'(?<replacement>[^']+)'\?$/g,
+ diagnostic.message
+ )
- if (!match) {
- return null
- }
+ if (!match) {
+ return []
+ }
- return {
- title: `Replace with '${match.groups.replacement}'`,
- kind: CodeActionKind.QuickFix,
- diagnostics: [diagnostic],
- edit: {
- changes: {
- [params.textDocument.uri]: [
- {
- range: diagnostic.range,
- newText: match.groups.replacement,
- },
- ],
- },
+ return [
+ {
+ title: `Replace with '${match.groups.replacement}'`,
+ kind: CodeActionKind.QuickFix,
+ diagnostics: [diagnostic],
+ edit: {
+ changes: {
+ [params.textDocument.uri]: [
+ {
+ range: diagnostic.range,
+ newText: match.groups.replacement,
+ },
+ ],
},
- }
- })
- .filter(Boolean)
- )
+ },
+ },
+ ]
+ })
+
+ return Promise.all(actions)
+ .then(flatten)
+ .then((x) => dedupeBy(x, (item) => JSON.stringify(item.edit)))
}
function classNameToAst(
@@ -154,11 +167,56 @@
return cssObjToAst(obj, state.modules.postcss)
}
-async function provideInvalidApplyCodeAction(
+async function provideUtilityConflictsCodeActions(
+ state: State,
+ params: CodeActionParams,
+ diagnostic: UtilityConflictsDiagnostic
+): Promise<CodeAction[]> {
+ return [
+ {
+ title: `Delete '${diagnostic.className.className}'`,
+ kind: CodeActionKind.QuickFix,
+ diagnostics: [diagnostic],
+ edit: {
+ changes: {
+ [params.textDocument.uri]: [
+ {
+ range: diagnostic.className.classList.range,
+ newText: removeRangeFromString(
+ diagnostic.className.classList.classList,
+ diagnostic.className.relativeRange
+ ),
+ },
+ ],
+ },
+ },
+ },
+ {
+ title: `Delete '${diagnostic.otherClassName.className}'`,
+ kind: CodeActionKind.QuickFix,
+ diagnostics: [diagnostic],
+ edit: {
+ changes: {
+ [params.textDocument.uri]: [
+ {
+ range: diagnostic.className.classList.range,
+ newText: removeRangeFromString(
+ diagnostic.className.classList.classList,
+ diagnostic.otherClassName.relativeRange
+ ),
+ },
+ ],
+ },
+ },
+ },
+ ]
+}
+
+async function provideInvalidApplyCodeActions(
state: State,
params: CodeActionParams,
diagnostic: InvalidApplyDiagnostic
-): Promise<CodeAction> {
+): Promise<CodeAction[]> {
let document = state.editor.documents.get(params.textDocument.uri)
let documentText = document.getText()
const { postcss } = state.modules
@@ -250,30 +308,32 @@ }),
]).process(documentText, { from: undefined })
if (!change) {
- return null
+ return []
}
- return {
- title: 'Extract to new rule.',
- kind: CodeActionKind.QuickFix,
- diagnostics: [diagnostic],
- edit: {
- changes: {
- [params.textDocument.uri]: [
- ...(totalClassNamesInClassList > 1
- ? [
- {
- range: diagnostic.className.classList.range,
- newText: removeRangeFromString(
- diagnostic.className.classList.classList,
- diagnostic.className.relativeRange
- ),
- },
- ]
- : []),
- change,
- ],
+ return [
+ {
+ title: 'Extract to new rule',
+ kind: CodeActionKind.QuickFix,
+ diagnostics: [diagnostic],
+ edit: {
+ changes: {
+ [params.textDocument.uri]: [
+ ...(totalClassNamesInClassList > 1
+ ? [
+ {
+ range: diagnostic.className.classList.range,
+ newText: removeRangeFromString(
+ diagnostic.className.classList.classList,
+ diagnostic.className.relativeRange
+ ),
+ },
+ ]
+ : []),
+ change,
+ ],
+ },
},
},
- }
+ ]
}
|