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

diff --git a/src/lsp/providers/codeActionProvider/index.ts b/src/lsp/providers/codeActions/codeActionProvider.ts
rename from src/lsp/providers/codeActionProvider/index.ts
rename to src/lsp/providers/codeActions/codeActionProvider.ts
index 22298dad00a8abe4bea08c7a41651849e6c5e6dd..62d2f09b41a553dac7bec6db1f963d07d5102b6c 100644
--- a/src/lsp/providers/codeActionProvider/index.ts
+++ b/src/lsp/providers/codeActions/codeActionProvider.ts
@@ -33,6 +33,7 @@ import { joinWithAnd } from '../../util/joinWithAnd'
 import { getLanguageBoundaries } from '../../util/getLanguageBoundaries'
 import { isCssDoc } from '../../util/css'
 import { absoluteRange } from '../../util/absoluteRange'
+import type { NodeSource, Root } from 'postcss'
 
 async function getDiagnosticsFromCodeActionParams(
   state: State,
@@ -201,6 +202,19 @@     },
   ]
 }
 
+function postcssSourceToRange(source: NodeSource): Range {
+  return {
+    start: {
+      line: source.start.line - 1,
+      character: source.start.column - 1,
+    },
+    end: {
+      line: source.end.line - 1,
+      character: source.end.column,
+    },
+  }
+}
+
 async function provideInvalidApplyCodeActions(
   state: State,
   params: CodeActionParams,
@@ -211,7 +225,7 @@   let documentText = document.getText()
   let cssRange: Range
   let cssText = documentText
   const { postcss } = state.modules
-  let change: TextEdit
+  let changes: TextEdit[] = []
 
   let totalClassNamesInClassList = diagnostic.className.classList.classList.split(
     /\s+/
@@ -238,30 +252,18 @@
   try {
     await postcss([
       postcss.plugin('', (_options = {}) => {
-        return (root) => {
+        return (root: Root) => {
           root.walkRules((rule) => {
-            if (change) return false
+            if (changes.length) return false
 
             rule.walkAtRules('apply', (atRule) => {
-              let { start, end } = atRule.source
-              let atRuleRange: Range = {
-                start: {
-                  line: start.line - 1,
-                  character: start.column - 1,
-                },
-                end: {
-                  line: end.line - 1,
-                  character: end.column - 1,
-                },
-              }
+              let atRuleRange = postcssSourceToRange(atRule.source)
               if (cssRange) {
                 atRuleRange = absoluteRange(atRuleRange, cssRange)
               }
 
-              if (!isWithinRange(diagnostic.range.start, atRuleRange)) {
-                // keep looking
+              if (!isWithinRange(diagnostic.range.start, atRuleRange))
                 return true
-              }
 
               let ast = classNameToAst(
                 state,
@@ -270,35 +272,33 @@                 rule.selector,
                 diagnostic.className.classList.important
               )
 
-              if (!ast) {
-                return false
-              }
+              if (!ast) return false
 
               rule.after(ast.nodes)
               let insertedRule = rule.next()
+              if (!insertedRule) return false
 
               if (totalClassNamesInClassList === 1) {
                 atRule.remove()
+              } else {
+                changes.push({
+                  range: diagnostic.className.classList.range,
+                  newText: removeRangesFromString(
+                    diagnostic.className.classList.classList,
+                    diagnostic.className.relativeRange
+                  ),
+                })
               }
 
-              let outputIndent: string
-              let documentIndent = detectIndent(documentText)
-
-              let ruleRange: Range = {
-                start: {
-                  line: rule.source.start.line - 1,
-                  character: rule.source.start.column - 1,
-                },
-                end: {
-                  line: rule.source.end.line - 1,
-                  character: rule.source.end.column,
-                },
-              }
+              let ruleRange = postcssSourceToRange(rule.source)
               if (cssRange) {
                 ruleRange = absoluteRange(ruleRange, cssRange)
               }
 
-              change = {
+              let outputIndent: string
+              let documentIndent = detectIndent(documentText)
+
+              changes.push({
                 range: ruleRange,
                 newText:
                   rule.toString() +
@@ -315,7 +315,7 @@                         new RegExp(outputIndent, 'g'),
                         documentIndent.indent
                       )
                     }),
-              }
+              })
 
               return false
             })
@@ -327,7 +327,7 @@   } catch (_) {
     return []
   }
 
-  if (!change) {
+  if (!changes.length) {
     return []
   }
 
@@ -338,20 +338,7 @@       kind: CodeActionKind.QuickFix,
       diagnostics: [diagnostic],
       edit: {
         changes: {
-          [params.textDocument.uri]: [
-            ...(totalClassNamesInClassList > 1
-              ? [
-                  {
-                    range: diagnostic.className.classList.range,
-                    newText: removeRangesFromString(
-                      diagnostic.className.classList.classList,
-                      diagnostic.className.relativeRange
-                    ),
-                  },
-                ]
-              : []),
-            change,
-          ],
+          [params.textDocument.uri]: changes,
         },
       },
     },

  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
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530

diff --git a/src/lsp/providers/diagnostics/diagnosticsProvider.ts b/src/lsp/providers/diagnostics/diagnosticsProvider.ts
index 91ca0e3eedd6db523fbaf2a96198b659330771ab..60956f0dd34ff63f5973d6308cd5fc47f59bfcea 100644
--- a/src/lsp/providers/diagnostics/diagnosticsProvider.ts
+++ b/src/lsp/providers/diagnostics/diagnosticsProvider.ts
@@ -1,516 +1,13 @@
-import { TextDocument, DiagnosticSeverity, Range } from 'vscode-languageserver'
-import { State, Settings } from '../../util/state'
-import { isCssDoc } from '../../util/css'
-import {
-  findClassNamesInRange,
-  findClassListsInDocument,
-  getClassNamesInClassList,
-  findAll,
-  indexToPosition,
-} from '../../util/find'
-import { getClassNameMeta } from '../../util/getClassNameMeta'
-import { getClassNameDecls } from '../../util/getClassNameDecls'
-import { equal } from '../../../util/array'
+import { TextDocument } from 'vscode-languageserver'
+import { State } from '../../util/state'
 import { getDocumentSettings } from '../../util/getDocumentSettings'
-const dlv = require('dlv')
-import semver from 'semver'
-import { getLanguageBoundaries } from '../../util/getLanguageBoundaries'
-import { absoluteRange } from '../../util/absoluteRange'
-import { isObject } from '../../../class-names/isObject'
-import { stringToPath } from '../../util/stringToPath'
-import { closest } from '../../util/closest'
-import {
-  InvalidApplyDiagnostic,
-  DiagnosticKind,
-  UtilityConflictsDiagnostic,
-  InvalidScreenDiagnostic,
-  InvalidVariantDiagnostic,
-  InvalidConfigPathDiagnostic,
-  InvalidTailwindDirectiveDiagnostic,
-  AugmentedDiagnostic,
-} from './types'
-import { joinWithAnd } from '../../util/joinWithAnd'
-
-function getInvalidApplyDiagnostics(
-  state: State,
-  document: TextDocument,
-  settings: Settings
-): InvalidApplyDiagnostic[] {
-  let severity = settings.lint.invalidApply
-  if (severity === 'ignore') return []
-
-  const classNames = findClassNamesInRange(document, undefined, 'css')
-
-  let diagnostics: InvalidApplyDiagnostic[] = classNames.map((className) => {
-    const meta = getClassNameMeta(state, className.className)
-    if (!meta) return null
-
-    let message: string
-
-    if (Array.isArray(meta)) {
-      message = `'@apply' cannot be used with '${className.className}' because it is included in multiple rulesets.`
-    } else if (meta.source !== 'utilities') {
-      message = `'@apply' cannot be used with '${className.className}' because it is not a utility.`
-    } else if (meta.context && meta.context.length > 0) {
-      if (meta.context.length === 1) {
-        message = `'@apply' cannot be used with '${className.className}' because it is nested inside of an at-rule ('${meta.context[0]}').`
-      } else {
-        message = `'@apply' cannot be used with '${
-          className.className
-        }' because it is nested inside of at-rules (${meta.context
-          .map((c) => `'${c}'`)
-          .join(', ')}).`
-      }
-    } else if (meta.pseudo && meta.pseudo.length > 0) {
-      if (meta.pseudo.length === 1) {
-        message = `'@apply' cannot be used with '${className.className}' because its definition includes a pseudo-selector ('${meta.pseudo[0]}')`
-      } else {
-        message = `'@apply' cannot be used with '${
-          className.className
-        }' because its definition includes pseudo-selectors (${meta.pseudo
-          .map((p) => `'${p}'`)
-          .join(', ')}).`
-      }
-    }
-
-    if (!message) return null
-
-    return {
-      code: DiagnosticKind.InvalidApply,
-      severity:
-        severity === 'error'
-          ? DiagnosticSeverity.Error
-          : DiagnosticSeverity.Warning,
-      range: className.range,
-      message,
-      className,
-    }
-  })
-
-  return diagnostics.filter(Boolean)
-}
-
-function getUtilityConflictDiagnostics(
-  state: State,
-  document: TextDocument,
-  settings: Settings
-): UtilityConflictsDiagnostic[] {
-  let severity = settings.lint.utilityConflicts
-  if (severity === 'ignore') return []
-
-  let diagnostics: UtilityConflictsDiagnostic[] = []
-  const classLists = findClassListsInDocument(state, document)
-
-  classLists.forEach((classList) => {
-    const classNames = getClassNamesInClassList(classList)
-
-    classNames.forEach((className, index) => {
-      let decls = getClassNameDecls(state, className.className)
-      if (!decls) return
-
-      let properties = Object.keys(decls)
-      let meta = getClassNameMeta(state, className.className)
-
-      let otherClassNames = classNames.filter((_className, i) => i !== index)
-
-      let conflictingClassNames = otherClassNames.filter((otherClassName) => {
-        let otherDecls = getClassNameDecls(state, otherClassName.className)
-        if (!otherDecls) return false
-
-        let otherMeta = getClassNameMeta(state, otherClassName.className)
-
-        return (
-          equal(properties, Object.keys(otherDecls)) &&
-          !Array.isArray(meta) &&
-          !Array.isArray(otherMeta) &&
-          equal(meta.context, otherMeta.context) &&
-          equal(meta.pseudo, otherMeta.pseudo)
-        )
-      })
-
-      if (conflictingClassNames.length === 0) return
-
-      diagnostics.push({
-        code: DiagnosticKind.UtilityConflicts,
-        className,
-        otherClassNames: conflictingClassNames,
-        range: className.range,
-        severity:
-          severity === 'error'
-            ? DiagnosticSeverity.Error
-            : DiagnosticSeverity.Warning,
-        message: `'${className.className}' applies the same CSS ${
-          properties.length === 1 ? 'property' : 'properties'
-        } as ${joinWithAnd(
-          conflictingClassNames.map(
-            (conflictingClassName) => `'${conflictingClassName.className}'`
-          )
-        )}.`,
-        relatedInformation: conflictingClassNames.map(
-          (conflictingClassName) => {
-            return {
-              message: conflictingClassName.className,
-              location: {
-                uri: document.uri,
-                range: conflictingClassName.range,
-              },
-            }
-          }
-        ),
-      })
-    })
-  })
-
-  return diagnostics
-}
-
-function getInvalidScreenDiagnostics(
-  state: State,
-  document: TextDocument,
-  settings: Settings
-): InvalidScreenDiagnostic[] {
-  let severity = settings.lint.invalidScreen
-  if (severity === 'ignore') return []
-
-  let diagnostics: InvalidScreenDiagnostic[] = []
-  let ranges: Range[] = []
-
-  if (isCssDoc(state, document)) {
-    ranges.push(undefined)
-  } else {
-    let boundaries = getLanguageBoundaries(state, document)
-    if (!boundaries) return []
-    ranges.push(...boundaries.css)
-  }
-
-  ranges.forEach((range) => {
-    let text = document.getText(range)
-    let matches = findAll(/(?:\s|^)@screen\s+(?<screen>[^\s{]+)/g, text)
-
-    let screens = Object.keys(
-      dlv(state.config, 'theme.screens', dlv(state.config, 'screens', {}))
-    )
-
-    matches.forEach((match) => {
-      if (screens.includes(match.groups.screen)) {
-        return null
-      }
-
-      let message = `The screen '${match.groups.screen}' does not exist in your theme config.`
-      let suggestions: string[] = []
-      let suggestion = closest(match.groups.screen, screens)
-
-      if (suggestion) {
-        suggestions.push(suggestion)
-        message += ` Did you mean '${suggestion}'?`
-      }
-
-      diagnostics.push({
-        code: DiagnosticKind.InvalidScreen,
-        range: absoluteRange(
-          {
-            start: indexToPosition(
-              text,
-              match.index + match[0].length - match.groups.screen.length
-            ),
-            end: indexToPosition(text, match.index + match[0].length),
-          },
-          range
-        ),
-        severity:
-          severity === 'error'
-            ? DiagnosticSeverity.Error
-            : DiagnosticSeverity.Warning,
-        message,
-        suggestions,
-      })
-    })
-  })
-
-  return diagnostics
-}
-
-function getInvalidVariantDiagnostics(
-  state: State,
-  document: TextDocument,
-  settings: Settings
-): InvalidVariantDiagnostic[] {
-  let severity = settings.lint.invalidVariant
-  if (severity === 'ignore') return []
-
-  let diagnostics: InvalidVariantDiagnostic[] = []
-  let ranges: Range[] = []
-
-  if (isCssDoc(state, document)) {
-    ranges.push(undefined)
-  } else {
-    let boundaries = getLanguageBoundaries(state, document)
-    if (!boundaries) return []
-    ranges.push(...boundaries.css)
-  }
-
-  ranges.forEach((range) => {
-    let text = document.getText(range)
-    let matches = findAll(/(?:\s|^)@variants\s+(?<variants>[^{]+)/g, text)
-
-    matches.forEach((match) => {
-      let variants = match.groups.variants.split(/(\s*,\s*)/)
-      let listStartIndex =
-        match.index + match[0].length - match.groups.variants.length
-
-      for (let i = 0; i < variants.length; i += 2) {
-        let variant = variants[i].trim()
-        if (state.variants.includes(variant)) {
-          continue
-        }
-
-        let message = `The variant '${variant}' does not exist.`
-        let suggestions: string[] = []
-        let suggestion = closest(variant, state.variants)
-
-        if (suggestion) {
-          suggestions.push(suggestion)
-          message += ` Did you mean '${suggestion}'?`
-        }
-
-        let variantStartIndex =
-          listStartIndex + variants.slice(0, i).join('').length
-
-        diagnostics.push({
-          code: DiagnosticKind.InvalidVariant,
-          range: absoluteRange(
-            {
-              start: indexToPosition(text, variantStartIndex),
-              end: indexToPosition(text, variantStartIndex + variant.length),
-            },
-            range
-          ),
-          severity:
-            severity === 'error'
-              ? DiagnosticSeverity.Error
-              : DiagnosticSeverity.Warning,
-          message,
-          suggestions,
-        })
-      }
-    })
-  })
-
-  return diagnostics
-}
-
-function getInvalidConfigPathDiagnostics(
-  state: State,
-  document: TextDocument,
-  settings: Settings
-): InvalidConfigPathDiagnostic[] {
-  let severity = settings.lint.invalidConfigPath
-  if (severity === 'ignore') return []
-
-  let diagnostics: InvalidConfigPathDiagnostic[] = []
-  let ranges: Range[] = []
-
-  if (isCssDoc(state, document)) {
-    ranges.push(undefined)
-  } else {
-    let boundaries = getLanguageBoundaries(state, document)
-    if (!boundaries) return []
-    ranges.push(...boundaries.css)
-  }
-
-  ranges.forEach((range) => {
-    let text = document.getText(range)
-    let matches = findAll(
-      /(?<prefix>\s|^)(?<helper>config|theme)\((?<quote>['"])(?<key>[^)]+)\k<quote>\)/g,
-      text
-    )
-
-    matches.forEach((match) => {
-      let base = match.groups.helper === 'theme' ? ['theme'] : []
-      let keys = stringToPath(match.groups.key)
-      let value = dlv(state.config, [...base, ...keys])
-
-      const isValid = (val: unknown): boolean =>
-        typeof val === 'string' ||
-        typeof val === 'number' ||
-        val instanceof String ||
-        val instanceof Number ||
-        Array.isArray(val)
-
-      const stitch = (keys: string[]): string =>
-        keys.reduce((acc, cur, i) => {
-          if (i === 0) return cur
-          if (cur.includes('.')) return `${acc}[${cur}]`
-          return `${acc}.${cur}`
-        }, '')
-
-      let message: string
-      let suggestions: string[] = []
-
-      if (isValid(value)) {
-        // The value resolves successfully, but we need to check that there
-        // wasn't any funny business. If you have a theme object:
-        // { msg: 'hello' } and do theme('msg.0')
-        // this will resolve to 'h', which is probably not intentional, so we
-        // check that all of the keys are object or array keys (i.e. not string
-        // indexes)
-        let valid = true
-        for (let i = keys.length - 1; i >= 0; i--) {
-          let key = keys[i]
-          let parentValue = dlv(state.config, [...base, ...keys.slice(0, i)])
-          if (/^[0-9]+$/.test(key)) {
-            if (!isObject(parentValue) && !Array.isArray(parentValue)) {
-              valid = false
-              break
-            }
-          } else if (!isObject(parentValue)) {
-            valid = false
-            break
-          }
-        }
-        if (!valid) {
-          message = `'${match.groups.key}' does not exist in your theme config.`
-        }
-      } else if (typeof value === 'undefined') {
-        message = `'${match.groups.key}' does not exist in your theme config.`
-        let parentValue = dlv(state.config, [
-          ...base,
-          ...keys.slice(0, keys.length - 1),
-        ])
-        if (isObject(parentValue)) {
-          let closestValidKey = closest(
-            keys[keys.length - 1],
-            Object.keys(parentValue).filter((key) => isValid(parentValue[key]))
-          )
-          if (closestValidKey) {
-            suggestions.push(
-              stitch([...keys.slice(0, keys.length - 1), closestValidKey])
-            )
-            message += ` Did you mean '${suggestions[0]}'?`
-          }
-        }
-      } else {
-        message = `'${match.groups.key}' was found but does not resolve to a string.`
-
-        if (isObject(value)) {
-          let validKeys = Object.keys(value).filter((key) =>
-            isValid(value[key])
-          )
-          if (validKeys.length) {
-            suggestions.push(
-              ...validKeys.map((validKey) => stitch([...keys, validKey]))
-            )
-            message += ` Did you mean something like '${suggestions[0]}'?`
-          }
-        }
-      }
-
-      if (!message) {
-        return null
-      }
-
-      let startIndex =
-        match.index +
-        match.groups.prefix.length +
-        match.groups.helper.length +
-        1 + // open paren
-        match.groups.quote.length
-
-      diagnostics.push({
-        code: DiagnosticKind.InvalidConfigPath,
-        range: absoluteRange(
-          {
-            start: indexToPosition(text, startIndex),
-            end: indexToPosition(text, startIndex + match.groups.key.length),
-          },
-          range
-        ),
-        severity:
-          severity === 'error'
-            ? DiagnosticSeverity.Error
-            : DiagnosticSeverity.Warning,
-        message,
-        suggestions,
-      })
-    })
-  })
-
-  return diagnostics
-}
-
-function getInvalidTailwindDirectiveDiagnostics(
-  state: State,
-  document: TextDocument,
-  settings: Settings
-): InvalidTailwindDirectiveDiagnostic[] {
-  let severity = settings.lint.invalidTailwindDirective
-  if (severity === 'ignore') return []
-
-  let diagnostics: InvalidTailwindDirectiveDiagnostic[] = []
-  let ranges: Range[] = []
-
-  if (isCssDoc(state, document)) {
-    ranges.push(undefined)
-  } else {
-    let boundaries = getLanguageBoundaries(state, document)
-    if (!boundaries) return []
-    ranges.push(...boundaries.css)
-  }
-
-  ranges.forEach((range) => {
-    let text = document.getText(range)
-    let matches = findAll(/(?:\s|^)@tailwind\s+(?<value>[^;]+)/g, text)
-
-    let valid = [
-      'utilities',
-      'components',
-      'screens',
-      semver.gte(state.version, '1.0.0-beta.1') ? 'base' : 'preflight',
-    ]
-
-    matches.forEach((match) => {
-      if (valid.includes(match.groups.value)) {
-        return null
-      }
-
-      let message = `'${match.groups.value}' is not a valid group.`
-      let suggestions: string[] = []
-
-      if (match.groups.value === 'preflight') {
-        suggestions.push('base')
-        message += ` Did you mean 'base'?`
-      } else {
-        let suggestion = closest(match.groups.value, valid)
-        if (suggestion) {
-          suggestions.push(suggestion)
-          message += ` Did you mean '${suggestion}'?`
-        }
-      }
-
-      diagnostics.push({
-        code: DiagnosticKind.InvalidTailwindDirective,
-        range: absoluteRange(
-          {
-            start: indexToPosition(
-              text,
-              match.index + match[0].length - match.groups.value.length
-            ),
-            end: indexToPosition(text, match.index + match[0].length),
-          },
-          range
-        ),
-        severity:
-          severity === 'error'
-            ? DiagnosticSeverity.Error
-            : DiagnosticSeverity.Warning,
-        message,
-        suggestions,
-      })
-    })
-  })
-
-  return diagnostics
-}
+import { DiagnosticKind, AugmentedDiagnostic } from './types'
+import { getUtilityConflictDiagnostics } from './getUtilityConflictDiagnostics'
+import { getInvalidApplyDiagnostics } from './getInvalidApplyDiagnostics'
+import { getInvalidScreenDiagnostics } from './getInvalidScreenDiagnostics'
+import { getInvalidVariantDiagnostics } from './getInvalidVariantDiagnostics'
+import { getInvalidConfigPathDiagnostics } from './getInvalidConfigPathDiagnostics'
+import { getInvalidTailwindDirectiveDiagnostics } from './getInvalidTailwindDirectiveDiagnostics'
 
 export async function getDiagnostics(
   state: State,

 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

diff --git a/src/lsp/providers/diagnostics/getInvalidApplyDiagnostics.ts b/src/lsp/providers/diagnostics/getInvalidApplyDiagnostics.ts
new file mode 100644
index 0000000000000000000000000000000000000000..66fc540125ce57a44e5550b89d9b6f1551085141
--- /dev/null
+++ b/src/lsp/providers/diagnostics/getInvalidApplyDiagnostics.ts
@@ -0,0 +1,64 @@
+import { findClassNamesInRange } from '../../util/find'
+import { InvalidApplyDiagnostic, DiagnosticKind } from './types'
+import { Settings, State } from '../../util/state'
+import { TextDocument, DiagnosticSeverity } from 'vscode-languageserver'
+import { getClassNameMeta } from '../../util/getClassNameMeta'
+
+export function getInvalidApplyDiagnostics(
+  state: State,
+  document: TextDocument,
+  settings: Settings
+): InvalidApplyDiagnostic[] {
+  let severity = settings.lint.invalidApply
+  if (severity === 'ignore') return []
+
+  const classNames = findClassNamesInRange(document, undefined, 'css')
+
+  let diagnostics: InvalidApplyDiagnostic[] = classNames.map((className) => {
+    const meta = getClassNameMeta(state, className.className)
+    if (!meta) return null
+
+    let message: string
+
+    if (Array.isArray(meta)) {
+      message = `'@apply' cannot be used with '${className.className}' because it is included in multiple rulesets.`
+    } else if (meta.source !== 'utilities') {
+      message = `'@apply' cannot be used with '${className.className}' because it is not a utility.`
+    } else if (meta.context && meta.context.length > 0) {
+      if (meta.context.length === 1) {
+        message = `'@apply' cannot be used with '${className.className}' because it is nested inside of an at-rule ('${meta.context[0]}').`
+      } else {
+        message = `'@apply' cannot be used with '${
+          className.className
+        }' because it is nested inside of at-rules (${meta.context
+          .map((c) => `'${c}'`)
+          .join(', ')}).`
+      }
+    } else if (meta.pseudo && meta.pseudo.length > 0) {
+      if (meta.pseudo.length === 1) {
+        message = `'@apply' cannot be used with '${className.className}' because its definition includes a pseudo-selector ('${meta.pseudo[0]}')`
+      } else {
+        message = `'@apply' cannot be used with '${
+          className.className
+        }' because its definition includes pseudo-selectors (${meta.pseudo
+          .map((p) => `'${p}'`)
+          .join(', ')}).`
+      }
+    }
+
+    if (!message) return null
+
+    return {
+      code: DiagnosticKind.InvalidApply,
+      severity:
+        severity === 'error'
+          ? DiagnosticSeverity.Error
+          : DiagnosticSeverity.Warning,
+      range: className.range,
+      message,
+      className,
+    }
+  })
+
+  return diagnostics.filter(Boolean)
+}

  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

diff --git a/src/lsp/providers/diagnostics/getInvalidConfigPathDiagnostics.ts b/src/lsp/providers/diagnostics/getInvalidConfigPathDiagnostics.ts
new file mode 100644
index 0000000000000000000000000000000000000000..95293341d536810ead06332a6125e96c6a77a776
--- /dev/null
+++ b/src/lsp/providers/diagnostics/getInvalidConfigPathDiagnostics.ts
@@ -0,0 +1,150 @@
+import { State, Settings } from '../../util/state'
+import { TextDocument, Range, DiagnosticSeverity } from 'vscode-languageserver'
+import { InvalidConfigPathDiagnostic, DiagnosticKind } from './types'
+import { isCssDoc } from '../../util/css'
+import { getLanguageBoundaries } from '../../util/getLanguageBoundaries'
+import { findAll, indexToPosition } from '../../util/find'
+import { stringToPath } from '../../util/stringToPath'
+import isObject from '../../../util/isObject'
+import { closest } from '../../util/closest'
+import { absoluteRange } from '../../util/absoluteRange'
+const dlv = require('dlv')
+
+export function getInvalidConfigPathDiagnostics(
+  state: State,
+  document: TextDocument,
+  settings: Settings
+): InvalidConfigPathDiagnostic[] {
+  let severity = settings.lint.invalidConfigPath
+  if (severity === 'ignore') return []
+
+  let diagnostics: InvalidConfigPathDiagnostic[] = []
+  let ranges: Range[] = []
+
+  if (isCssDoc(state, document)) {
+    ranges.push(undefined)
+  } else {
+    let boundaries = getLanguageBoundaries(state, document)
+    if (!boundaries) return []
+    ranges.push(...boundaries.css)
+  }
+
+  ranges.forEach((range) => {
+    let text = document.getText(range)
+    let matches = findAll(
+      /(?<prefix>\s|^)(?<helper>config|theme)\((?<quote>['"])(?<key>[^)]+)\k<quote>\)/g,
+      text
+    )
+
+    matches.forEach((match) => {
+      let base = match.groups.helper === 'theme' ? ['theme'] : []
+      let keys = stringToPath(match.groups.key)
+      let value = dlv(state.config, [...base, ...keys])
+
+      const isValid = (val: unknown): boolean =>
+        typeof val === 'string' ||
+        typeof val === 'number' ||
+        val instanceof String ||
+        val instanceof Number ||
+        Array.isArray(val)
+
+      const stitch = (keys: string[]): string =>
+        keys.reduce((acc, cur, i) => {
+          if (i === 0) return cur
+          if (cur.includes('.')) return `${acc}[${cur}]`
+          return `${acc}.${cur}`
+        }, '')
+
+      let message: string
+      let suggestions: string[] = []
+
+      if (isValid(value)) {
+        // The value resolves successfully, but we need to check that there
+        // wasn't any funny business. If you have a theme object:
+        // { msg: 'hello' } and do theme('msg.0')
+        // this will resolve to 'h', which is probably not intentional, so we
+        // check that all of the keys are object or array keys (i.e. not string
+        // indexes)
+        let valid = true
+        for (let i = keys.length - 1; i >= 0; i--) {
+          let key = keys[i]
+          let parentValue = dlv(state.config, [...base, ...keys.slice(0, i)])
+          if (/^[0-9]+$/.test(key)) {
+            if (!isObject(parentValue) && !Array.isArray(parentValue)) {
+              valid = false
+              break
+            }
+          } else if (!isObject(parentValue)) {
+            valid = false
+            break
+          }
+        }
+        if (!valid) {
+          message = `'${match.groups.key}' does not exist in your theme config.`
+        }
+      } else if (typeof value === 'undefined') {
+        message = `'${match.groups.key}' does not exist in your theme config.`
+        let parentValue = dlv(state.config, [
+          ...base,
+          ...keys.slice(0, keys.length - 1),
+        ])
+        if (isObject(parentValue)) {
+          let closestValidKey = closest(
+            keys[keys.length - 1],
+            Object.keys(parentValue).filter((key) => isValid(parentValue[key]))
+          )
+          if (closestValidKey) {
+            suggestions.push(
+              stitch([...keys.slice(0, keys.length - 1), closestValidKey])
+            )
+            message += ` Did you mean '${suggestions[0]}'?`
+          }
+        }
+      } else {
+        message = `'${match.groups.key}' was found but does not resolve to a string.`
+
+        if (isObject(value)) {
+          let validKeys = Object.keys(value).filter((key) =>
+            isValid(value[key])
+          )
+          if (validKeys.length) {
+            suggestions.push(
+              ...validKeys.map((validKey) => stitch([...keys, validKey]))
+            )
+            message += ` Did you mean something like '${suggestions[0]}'?`
+          }
+        }
+      }
+
+      if (!message) {
+        return null
+      }
+
+      let startIndex =
+        match.index +
+        match.groups.prefix.length +
+        match.groups.helper.length +
+        1 + // open paren
+        match.groups.quote.length
+
+      diagnostics.push({
+        code: DiagnosticKind.InvalidConfigPath,
+        range: absoluteRange(
+          {
+            start: indexToPosition(text, startIndex),
+            end: indexToPosition(text, startIndex + match.groups.key.length),
+          },
+          range
+        ),
+        severity:
+          severity === 'error'
+            ? DiagnosticSeverity.Error
+            : DiagnosticSeverity.Warning,
+        message,
+        suggestions,
+      })
+    })
+  })
+
+  return diagnostics
+}

 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

diff --git a/src/lsp/providers/diagnostics/getInvalidScreenDiagnostics.ts b/src/lsp/providers/diagnostics/getInvalidScreenDiagnostics.ts
new file mode 100644
index 0000000000000000000000000000000000000000..b0e4252438ea6bb7dd47071189c3881aae219225
--- /dev/null
+++ b/src/lsp/providers/diagnostics/getInvalidScreenDiagnostics.ts
@@ -0,0 +1,75 @@
+import { State, Settings } from '../../util/state'
+import { TextDocument, Range, DiagnosticSeverity } from 'vscode-languageserver'
+import { InvalidScreenDiagnostic, DiagnosticKind } from './types'
+import { isCssDoc } from '../../util/css'
+import { getLanguageBoundaries } from '../../util/getLanguageBoundaries'
+import { findAll, indexToPosition } from '../../util/find'
+import { closest } from '../../util/closest'
+import { absoluteRange } from '../../util/absoluteRange'
+const dlv = require('dlv')
+
+export function getInvalidScreenDiagnostics(
+  state: State,
+  document: TextDocument,
+  settings: Settings
+): InvalidScreenDiagnostic[] {
+  let severity = settings.lint.invalidScreen
+  if (severity === 'ignore') return []
+
+  let diagnostics: InvalidScreenDiagnostic[] = []
+  let ranges: Range[] = []
+
+  if (isCssDoc(state, document)) {
+    ranges.push(undefined)
+  } else {
+    let boundaries = getLanguageBoundaries(state, document)
+    if (!boundaries) return []
+    ranges.push(...boundaries.css)
+  }
+
+  ranges.forEach((range) => {
+    let text = document.getText(range)
+    let matches = findAll(/(?:\s|^)@screen\s+(?<screen>[^\s{]+)/g, text)
+
+    let screens = Object.keys(
+      dlv(state.config, 'theme.screens', dlv(state.config, 'screens', {}))
+    )
+
+    matches.forEach((match) => {
+      if (screens.includes(match.groups.screen)) {
+        return null
+      }
+
+      let message = `The screen '${match.groups.screen}' does not exist in your theme config.`
+      let suggestions: string[] = []
+      let suggestion = closest(match.groups.screen, screens)
+
+      if (suggestion) {
+        suggestions.push(suggestion)
+        message += ` Did you mean '${suggestion}'?`
+      }
+
+      diagnostics.push({
+        code: DiagnosticKind.InvalidScreen,
+        range: absoluteRange(
+          {
+            start: indexToPosition(
+              text,
+              match.index + match[0].length - match.groups.screen.length
+            ),
+            end: indexToPosition(text, match.index + match[0].length),
+          },
+          range
+        ),
+        severity:
+          severity === 'error'
+            ? DiagnosticSeverity.Error
+            : DiagnosticSeverity.Warning,
+        message,
+        suggestions,
+      })
+    })
+  })
+
+  return diagnostics
+}

 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

diff --git a/src/lsp/providers/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts b/src/lsp/providers/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts
new file mode 100644
index 0000000000000000000000000000000000000000..9b88bdb06e0e5c3754c6c5eecbf23af7c342a21d
--- /dev/null
+++ b/src/lsp/providers/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts
@@ -0,0 +1,83 @@
+import { State, Settings } from '../../util/state'
+import { TextDocument, Range, DiagnosticSeverity } from 'vscode-languageserver'
+import { InvalidTailwindDirectiveDiagnostic, DiagnosticKind } from './types'
+import { isCssDoc } from '../../util/css'
+import { getLanguageBoundaries } from '../../util/getLanguageBoundaries'
+import { findAll, indexToPosition } from '../../util/find'
+import semver from 'semver'
+import { closest } from '../../util/closest'
+import { absoluteRange } from '../../util/absoluteRange'
+
+export function getInvalidTailwindDirectiveDiagnostics(
+  state: State,
+  document: TextDocument,
+  settings: Settings
+): InvalidTailwindDirectiveDiagnostic[] {
+  let severity = settings.lint.invalidTailwindDirective
+  if (severity === 'ignore') return []
+
+  let diagnostics: InvalidTailwindDirectiveDiagnostic[] = []
+  let ranges: Range[] = []
+
+  if (isCssDoc(state, document)) {
+    ranges.push(undefined)
+  } else {
+    let boundaries = getLanguageBoundaries(state, document)
+    if (!boundaries) return []
+    ranges.push(...boundaries.css)
+  }
+
+  ranges.forEach((range) => {
+    let text = document.getText(range)
+    let matches = findAll(/(?:\s|^)@tailwind\s+(?<value>[^;]+)/g, text)
+
+    let valid = [
+      'utilities',
+      'components',
+      'screens',
+      semver.gte(state.version, '1.0.0-beta.1') ? 'base' : 'preflight',
+    ]
+
+    matches.forEach((match) => {
+      if (valid.includes(match.groups.value)) {
+        return null
+      }
+
+      let message = `'${match.groups.value}' is not a valid group.`
+      let suggestions: string[] = []
+
+      if (match.groups.value === 'preflight') {
+        suggestions.push('base')
+        message += ` Did you mean 'base'?`
+      } else {
+        let suggestion = closest(match.groups.value, valid)
+        if (suggestion) {
+          suggestions.push(suggestion)
+          message += ` Did you mean '${suggestion}'?`
+        }
+      }
+
+      diagnostics.push({
+        code: DiagnosticKind.InvalidTailwindDirective,
+        range: absoluteRange(
+          {
+            start: indexToPosition(
+              text,
+              match.index + match[0].length - match.groups.value.length
+            ),
+            end: indexToPosition(text, match.index + match[0].length),
+          },
+          range
+        ),
+        severity:
+          severity === 'error'
+            ? DiagnosticSeverity.Error
+            : DiagnosticSeverity.Warning,
+        message,
+        suggestions,
+      })
+    })
+  })
+
+  return diagnostics
+}

 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

diff --git a/src/lsp/providers/diagnostics/getInvalidVariantDiagnostics.ts b/src/lsp/providers/diagnostics/getInvalidVariantDiagnostics.ts
new file mode 100644
index 0000000000000000000000000000000000000000..006740103c2776d4d68d6452dd5f808b8100a5d2
--- /dev/null
+++ b/src/lsp/providers/diagnostics/getInvalidVariantDiagnostics.ts
@@ -0,0 +1,77 @@
+import { State, Settings } from '../../util/state'
+import { TextDocument, Range, DiagnosticSeverity } from 'vscode-languageserver'
+import { InvalidVariantDiagnostic, DiagnosticKind } from './types'
+import { isCssDoc } from '../../util/css'
+import { getLanguageBoundaries } from '../../util/getLanguageBoundaries'
+import { findAll, indexToPosition } from '../../util/find'
+import { closest } from '../../util/closest'
+import { absoluteRange } from '../../util/absoluteRange'
+
+export function getInvalidVariantDiagnostics(
+  state: State,
+  document: TextDocument,
+  settings: Settings
+): InvalidVariantDiagnostic[] {
+  let severity = settings.lint.invalidVariant
+  if (severity === 'ignore') return []
+
+  let diagnostics: InvalidVariantDiagnostic[] = []
+  let ranges: Range[] = []
+
+  if (isCssDoc(state, document)) {
+    ranges.push(undefined)
+  } else {
+    let boundaries = getLanguageBoundaries(state, document)
+    if (!boundaries) return []
+    ranges.push(...boundaries.css)
+  }
+
+  ranges.forEach((range) => {
+    let text = document.getText(range)
+    let matches = findAll(/(?:\s|^)@variants\s+(?<variants>[^{]+)/g, text)
+
+    matches.forEach((match) => {
+      let variants = match.groups.variants.split(/(\s*,\s*)/)
+      let listStartIndex =
+        match.index + match[0].length - match.groups.variants.length
+
+      for (let i = 0; i < variants.length; i += 2) {
+        let variant = variants[i].trim()
+        if (state.variants.includes(variant)) {
+          continue
+        }
+
+        let message = `The variant '${variant}' does not exist.`
+        let suggestions: string[] = []
+        let suggestion = closest(variant, state.variants)
+
+        if (suggestion) {
+          suggestions.push(suggestion)
+          message += ` Did you mean '${suggestion}'?`
+        }
+
+        let variantStartIndex =
+          listStartIndex + variants.slice(0, i).join('').length
+
+        diagnostics.push({
+          code: DiagnosticKind.InvalidVariant,
+          range: absoluteRange(
+            {
+              start: indexToPosition(text, variantStartIndex),
+              end: indexToPosition(text, variantStartIndex + variant.length),
+            },
+            range
+          ),
+          severity:
+            severity === 'error'
+              ? DiagnosticSeverity.Error
+              : DiagnosticSeverity.Warning,
+          message,
+          suggestions,
+        })
+      }
+    })
+  })
+
+  return diagnostics
+}

 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

diff --git a/src/lsp/providers/diagnostics/getUtilityConflictDiagnostics.ts b/src/lsp/providers/diagnostics/getUtilityConflictDiagnostics.ts
new file mode 100644
index 0000000000000000000000000000000000000000..80216e09d137b326a30211fcb7283dc32c2fea8d
--- /dev/null
+++ b/src/lsp/providers/diagnostics/getUtilityConflictDiagnostics.ts
@@ -0,0 +1,85 @@
+import { joinWithAnd } from '../../util/joinWithAnd'
+import { State, Settings } from '../../util/state'
+import { TextDocument, DiagnosticSeverity } from 'vscode-languageserver'
+import { UtilityConflictsDiagnostic, DiagnosticKind } from './types'
+import {
+  findClassListsInDocument,
+  getClassNamesInClassList,
+} from '../../util/find'
+import { getClassNameDecls } from '../../util/getClassNameDecls'
+import { getClassNameMeta } from '../../util/getClassNameMeta'
+import { equal } from '../../../util/array'
+
+export function getUtilityConflictDiagnostics(
+  state: State,
+  document: TextDocument,
+  settings: Settings
+): UtilityConflictsDiagnostic[] {
+  let severity = settings.lint.utilityConflicts
+  if (severity === 'ignore') return []
+
+  let diagnostics: UtilityConflictsDiagnostic[] = []
+  const classLists = findClassListsInDocument(state, document)
+
+  classLists.forEach((classList) => {
+    const classNames = getClassNamesInClassList(classList)
+
+    classNames.forEach((className, index) => {
+      let decls = getClassNameDecls(state, className.className)
+      if (!decls) return
+
+      let properties = Object.keys(decls)
+      let meta = getClassNameMeta(state, className.className)
+
+      let otherClassNames = classNames.filter((_className, i) => i !== index)
+
+      let conflictingClassNames = otherClassNames.filter((otherClassName) => {
+        let otherDecls = getClassNameDecls(state, otherClassName.className)
+        if (!otherDecls) return false
+
+        let otherMeta = getClassNameMeta(state, otherClassName.className)
+
+        return (
+          equal(properties, Object.keys(otherDecls)) &&
+          !Array.isArray(meta) &&
+          !Array.isArray(otherMeta) &&
+          equal(meta.context, otherMeta.context) &&
+          equal(meta.pseudo, otherMeta.pseudo)
+        )
+      })
+
+      if (conflictingClassNames.length === 0) return
+
+      diagnostics.push({
+        code: DiagnosticKind.UtilityConflicts,
+        className,
+        otherClassNames: conflictingClassNames,
+        range: className.range,
+        severity:
+          severity === 'error'
+            ? DiagnosticSeverity.Error
+            : DiagnosticSeverity.Warning,
+        message: `'${className.className}' applies the same CSS ${
+          properties.length === 1 ? 'property' : 'properties'
+        } as ${joinWithAnd(
+          conflictingClassNames.map(
+            (conflictingClassName) => `'${conflictingClassName.className}'`
+          )
+        )}.`,
+        relatedInformation: conflictingClassNames.map(
+          (conflictingClassName) => {
+            return {
+              message: conflictingClassName.className,
+              location: {
+                uri: document.uri,
+                range: conflictingClassName.range,
+              },
+            }
+          }
+        ),
+      })
+    })
+  })
+
+  return diagnostics
+}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/src/lsp/server.ts b/src/lsp/server.ts
index f4b8013534ea0de51cbb9c67f30c90d3187afb76..d543c304df5ad3c9d358ac820cd530ea6e4b5bb6 100644
--- a/src/lsp/server.ts
+++ b/src/lsp/server.ts
@@ -34,7 +34,7 @@   updateAllDiagnostics,
   clearAllDiagnostics,
 } from './providers/diagnostics/diagnosticsProvider'
 import { createEmitter } from '../lib/emitter'
-import { provideCodeActions } from './providers/codeActionProvider'
+import { provideCodeActions } from './providers/codeActions/codeActionProvider'
 
 let connection = createConnection(ProposedFeatures.all)
 let state: State = { enabled: false, emitter: createEmitter(connection) }