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
|
diff --git a/src/lsp/providers/diagnosticsProvider.ts b/src/lsp/providers/diagnosticsProvider.ts
index 9f483ac9f69be7fbc5deeae70607194fafacf66b..9602ee720a1b61c82afe91012a516b17ce9374a5 100644
--- a/src/lsp/providers/diagnosticsProvider.ts
+++ b/src/lsp/providers/diagnosticsProvider.ts
@@ -3,7 +3,7 @@ TextDocument,
Diagnostic,
DiagnosticSeverity,
} from 'vscode-languageserver'
-import { State } from '../util/state'
+import { State, Settings } from '../util/state'
import { isCssDoc } from '../util/css'
import {
findClassNamesInRange,
@@ -13,8 +13,16 @@ } from '../util/find'
import { getClassNameMeta } from '../util/getClassNameMeta'
import { getClassNameDecls } from '../util/getClassNameDecls'
import { equal } from '../../util/array'
+import { getDocumentSettings } from '../util/getDocumentSettings'
-function getCssDiagnostics(state: State, document: TextDocument): Diagnostic[] {
+function getCssDiagnostics(
+ state: State,
+ document: TextDocument,
+ settings: Settings
+): Diagnostic[] {
+ let severity = settings.lint.unsupportedApply
+ if (severity === 'ignore') return []
+
const classNames = findClassNamesInRange(document, undefined, 'css')
let diagnostics: Diagnostic[] = classNames
@@ -49,7 +57,10 @@
if (!message) return null
return {
- severity: DiagnosticSeverity.Error,
+ severity:
+ severity === 'error'
+ ? DiagnosticSeverity.Error
+ : DiagnosticSeverity.Warning,
range,
message,
}
@@ -59,10 +70,14 @@
return diagnostics
}
-function getConflictDiagnostics(
+function getUtilityConflictDiagnostics(
state: State,
- document: TextDocument
+ document: TextDocument,
+ settings: Settings
): Diagnostic[] {
+ let severity = settings.lint.utilityConflicts
+ if (severity === 'ignore') return []
+
let diagnostics: Diagnostic[] = []
const classLists = findClassListsInDocument(state, document)
@@ -90,7 +105,10 @@ equal(meta.pseudo, otherMeta.pseudo)
) {
diagnostics.push({
range: className.range,
- severity: DiagnosticSeverity.Warning,
+ severity:
+ severity === 'error'
+ ? DiagnosticSeverity.Error
+ : DiagnosticSeverity.Warning,
message: `You can’t use \`${className.className}\` and \`${otherClassName.className}\` together`,
relatedInformation: [
{
@@ -114,11 +132,19 @@ export async function provideDiagnostics(
state: State,
document: TextDocument
): Promise<void> {
+ const settings = await getDocumentSettings(state, document.uri)
+
+ const diagnostics: Diagnostic[] = settings.validate
+ ? [
+ ...getUtilityConflictDiagnostics(state, document, settings),
+ ...(isCssDoc(state, document)
+ ? getCssDiagnostics(state, document, settings)
+ : []),
+ ]
+ : []
+
state.editor.connection.sendDiagnostics({
uri: document.uri,
- diagnostics: [
- ...getConflictDiagnostics(state, document),
- ...(isCssDoc(state, document) ? getCssDiagnostics(state, document) : []),
- ],
+ diagnostics,
})
}
|