Skip to content

Commit f4507ee

Browse files
committed
update lint setting names
1 parent bb3605c commit f4507ee

File tree

4 files changed

+30
-34
lines changed

4 files changed

+30
-34
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"markdownDescription": "",
8888
"scope": "language-overridable"
8989
},
90-
"tailwindCSS.lint.unsupportedApply": {
90+
"tailwindCSS.lint.invalidApply": {
9191
"type": "string",
9292
"enum": [
9393
"ignore",
@@ -98,7 +98,7 @@
9898
"markdownDescription": "",
9999
"scope": "language-overridable"
100100
},
101-
"tailwindCSS.lint.unknownScreen": {
101+
"tailwindCSS.lint.invalidScreen": {
102102
"type": "string",
103103
"enum": [
104104
"ignore",
@@ -109,7 +109,7 @@
109109
"markdownDescription": "",
110110
"scope": "language-overridable"
111111
},
112-
"tailwindCSS.lint.unknownVariant": {
112+
"tailwindCSS.lint.invalidVariant": {
113113
"type": "string",
114114
"enum": [
115115
"ignore",
@@ -120,7 +120,7 @@
120120
"markdownDescription": "",
121121
"scope": "language-overridable"
122122
},
123-
"tailwindCSS.lint.invalidHelperKey": {
123+
"tailwindCSS.lint.invalidConfigPath": {
124124
"type": "string",
125125
"enum": [
126126
"ignore",
@@ -131,7 +131,7 @@
131131
"markdownDescription": "",
132132
"scope": "language-overridable"
133133
},
134-
"tailwindCSS.lint.unsupportedTailwindDirective": {
134+
"tailwindCSS.lint.invalidTailwindDirective": {
135135
"type": "string",
136136
"enum": [
137137
"ignore",

src/lsp/providers/diagnosticsProvider.ts

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ import { isObject } from '../../class-names/isObject'
2525
import { stringToPath } from '../util/stringToPath'
2626
import { closest } from '../util/closest'
2727

28-
function getUnsupportedApplyDiagnostics(
28+
function getInvalidApplyDiagnostics(
2929
state: State,
3030
document: TextDocument,
3131
settings: Settings
3232
): Diagnostic[] {
33-
let severity = settings.lint.unsupportedApply
33+
let severity = settings.lint.invalidApply
3434
if (severity === 'ignore') return []
3535

3636
const classNames = findClassNamesInRange(document, undefined, 'css')
@@ -138,12 +138,12 @@ function getUtilityConflictDiagnostics(
138138
return diagnostics
139139
}
140140

141-
function getUnknownScreenDiagnostics(
141+
function getInvalidScreenDiagnostics(
142142
state: State,
143143
document: TextDocument,
144144
settings: Settings
145145
): Diagnostic[] {
146-
let severity = settings.lint.unknownScreen
146+
let severity = settings.lint.invalidScreen
147147
if (severity === 'ignore') return []
148148

149149
let diagnostics: Diagnostic[] = []
@@ -199,12 +199,12 @@ function getUnknownScreenDiagnostics(
199199
return diagnostics
200200
}
201201

202-
function getUnknownVariantDiagnostics(
202+
function getInvalidVariantDiagnostics(
203203
state: State,
204204
document: TextDocument,
205205
settings: Settings
206206
): Diagnostic[] {
207-
let severity = settings.lint.unknownVariant
207+
let severity = settings.lint.invalidVariant
208208
if (severity === 'ignore') return []
209209

210210
let diagnostics: Diagnostic[] = []
@@ -263,12 +263,12 @@ function getUnknownVariantDiagnostics(
263263
return diagnostics
264264
}
265265

266-
function getInvalidHelperKeyDiagnostics(
266+
function getInvalidConfigPathDiagnostics(
267267
state: State,
268268
document: TextDocument,
269269
settings: Settings
270270
): Diagnostic[] {
271-
let severity = settings.lint.invalidHelperKey
271+
let severity = settings.lint.invalidConfigPath
272272
if (severity === 'ignore') return []
273273

274274
let diagnostics: Diagnostic[] = []
@@ -396,12 +396,12 @@ function getInvalidHelperKeyDiagnostics(
396396
return diagnostics
397397
}
398398

399-
function getUnsupportedTailwindDirectiveDiagnostics(
399+
function getInvalidTailwindDirectiveDiagnostics(
400400
state: State,
401401
document: TextDocument,
402402
settings: Settings
403403
): Diagnostic[] {
404-
let severity = settings.lint.unsupportedTailwindDirective
404+
let severity = settings.lint.invalidTailwindDirective
405405
if (severity === 'ignore') return []
406406

407407
let diagnostics: Diagnostic[] = []
@@ -473,15 +473,11 @@ export async function provideDiagnostics(
473473
const diagnostics: Diagnostic[] = settings.validate
474474
? [
475475
...getUtilityConflictDiagnostics(state, document, settings),
476-
...getUnsupportedApplyDiagnostics(state, document, settings),
477-
...getUnknownScreenDiagnostics(state, document, settings),
478-
...getUnknownVariantDiagnostics(state, document, settings),
479-
...getInvalidHelperKeyDiagnostics(state, document, settings),
480-
...getUnsupportedTailwindDirectiveDiagnostics(
481-
state,
482-
document,
483-
settings
484-
),
476+
...getInvalidApplyDiagnostics(state, document, settings),
477+
...getInvalidScreenDiagnostics(state, document, settings),
478+
...getInvalidVariantDiagnostics(state, document, settings),
479+
...getInvalidConfigPathDiagnostics(state, document, settings),
480+
...getInvalidTailwindDirectiveDiagnostics(state, document, settings),
485481
]
486482
: []
487483

src/lsp/server.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ const defaultSettings: Settings = {
4444
validate: true,
4545
lint: {
4646
utilityConflicts: 'warning',
47-
unsupportedApply: 'error',
48-
unknownScreen: 'error',
49-
unknownVariant: 'error',
50-
invalidHelperKey: 'error',
51-
unsupportedTailwindDirective: 'error',
47+
invalidApply: 'error',
48+
invalidScreen: 'error',
49+
invalidVariant: 'error',
50+
invalidConfigPath: 'error',
51+
invalidTailwindDirective: 'error',
5252
},
5353
}
5454
let globalSettings: Settings = defaultSettings

src/lsp/util/state.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ export type Settings = {
3434
validate: boolean
3535
lint: {
3636
utilityConflicts: DiagnosticSeveritySetting
37-
unsupportedApply: DiagnosticSeveritySetting
38-
unknownScreen: DiagnosticSeveritySetting
39-
unknownVariant: DiagnosticSeveritySetting
40-
invalidHelperKey: DiagnosticSeveritySetting
41-
unsupportedTailwindDirective: DiagnosticSeveritySetting
37+
invalidApply: DiagnosticSeveritySetting
38+
invalidScreen: DiagnosticSeveritySetting
39+
invalidVariant: DiagnosticSeveritySetting
40+
invalidConfigPath: DiagnosticSeveritySetting
41+
invalidTailwindDirective: DiagnosticSeveritySetting
4242
}
4343
}
4444

0 commit comments

Comments
 (0)