diff --git a/package.json b/package.json index e696a5d0581ae8a9ac43c250bb528ff4ad59b542..dfaa22c60c8da06b66a21a2947a85f9bd29c254e 100755 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "default": "warning", "markdownDescription": "", "scope": "language-overridable" }, - "tailwindCSS.lint.invalidApply": { + "tailwindCSS.lint.unsupportedApply": { "type": "string", "enum": [ "ignore", @@ -98,7 +98,7 @@ "default": "error", "markdownDescription": "", "scope": "language-overridable" }, - "tailwindCSS.lint.invalidScreen": { + "tailwindCSS.lint.unknownScreen": { "type": "string", "enum": [ "ignore", @@ -109,7 +109,7 @@ "default": "error", "markdownDescription": "", "scope": "language-overridable" }, - "tailwindCSS.lint.invalidVariant": { + "tailwindCSS.lint.unknownVariant": { "type": "string", "enum": [ "ignore", @@ -120,7 +120,7 @@ "default": "error", "markdownDescription": "", "scope": "language-overridable" }, - "tailwindCSS.lint.invalidConfigPath": { + "tailwindCSS.lint.invalidHelperKey": { "type": "string", "enum": [ "ignore", @@ -131,7 +131,7 @@ "default": "error", "markdownDescription": "", "scope": "language-overridable" }, - "tailwindCSS.lint.invalidTailwindDirective": { + "tailwindCSS.lint.unsupportedTailwindDirective": { "type": "string", "enum": [ "ignore", diff --git a/src/lsp/providers/diagnosticsProvider.ts b/src/lsp/providers/diagnosticsProvider.ts index 5945837bd639a4360bd03f61298581529aba7f7d..4d0e58032a84fcbe68bb55100ada5a682b2943c9 100644 --- a/src/lsp/providers/diagnosticsProvider.ts +++ b/src/lsp/providers/diagnosticsProvider.ts @@ -25,12 +25,12 @@ import { isObject } from '../../class-names/isObject' import { stringToPath } from '../util/stringToPath' import { closest } from '../util/closest' -function getInvalidApplyDiagnostics( +function getUnsupportedApplyDiagnostics( state: State, document: TextDocument, settings: Settings ): Diagnostic[] { - let severity = settings.lint.invalidApply + let severity = settings.lint.unsupportedApply if (severity === 'ignore') return [] const classNames = findClassNamesInRange(document, undefined, 'css') @@ -138,12 +138,12 @@ return diagnostics } -function getInvalidScreenDiagnostics( +function getUnknownScreenDiagnostics( state: State, document: TextDocument, settings: Settings ): Diagnostic[] { - let severity = settings.lint.invalidScreen + let severity = settings.lint.unknownScreen if (severity === 'ignore') return [] let diagnostics: Diagnostic[] = [] @@ -199,12 +199,12 @@ return diagnostics } -function getInvalidVariantDiagnostics( +function getUnknownVariantDiagnostics( state: State, document: TextDocument, settings: Settings ): Diagnostic[] { - let severity = settings.lint.invalidVariant + let severity = settings.lint.unknownVariant if (severity === 'ignore') return [] let diagnostics: Diagnostic[] = [] @@ -263,12 +263,12 @@ return diagnostics } -function getInvalidConfigPathDiagnostics( +function getInvalidHelperKeyDiagnostics( state: State, document: TextDocument, settings: Settings ): Diagnostic[] { - let severity = settings.lint.invalidConfigPath + let severity = settings.lint.invalidHelperKey if (severity === 'ignore') return [] let diagnostics: Diagnostic[] = [] @@ -396,12 +396,12 @@ return diagnostics } -function getInvalidTailwindDirectiveDiagnostics( +function getUnsupportedTailwindDirectiveDiagnostics( state: State, document: TextDocument, settings: Settings ): Diagnostic[] { - let severity = settings.lint.invalidTailwindDirective + let severity = settings.lint.unsupportedTailwindDirective if (severity === 'ignore') return [] let diagnostics: Diagnostic[] = [] @@ -473,11 +473,15 @@ const diagnostics: Diagnostic[] = settings.validate ? [ ...getUtilityConflictDiagnostics(state, document, settings), - ...getInvalidApplyDiagnostics(state, document, settings), - ...getInvalidScreenDiagnostics(state, document, settings), - ...getInvalidVariantDiagnostics(state, document, settings), - ...getInvalidConfigPathDiagnostics(state, document, settings), - ...getInvalidTailwindDirectiveDiagnostics(state, document, settings), + ...getUnsupportedApplyDiagnostics(state, document, settings), + ...getUnknownScreenDiagnostics(state, document, settings), + ...getUnknownVariantDiagnostics(state, document, settings), + ...getInvalidHelperKeyDiagnostics(state, document, settings), + ...getUnsupportedTailwindDirectiveDiagnostics( + state, + document, + settings + ), ] : [] diff --git a/src/lsp/server.ts b/src/lsp/server.ts index 3d3753228e38f037757b3918bba07360142791b1..8e9addff1790460044f406c65302aadc70cc75c6 100644 --- a/src/lsp/server.ts +++ b/src/lsp/server.ts @@ -44,11 +44,11 @@ includeLanguages: {}, validate: true, lint: { utilityConflicts: 'warning', - invalidApply: 'error', - invalidScreen: 'error', - invalidVariant: 'error', - invalidConfigPath: 'error', - invalidTailwindDirective: 'error', + unsupportedApply: 'error', + unknownScreen: 'error', + unknownVariant: 'error', + invalidHelperKey: 'error', + unsupportedTailwindDirective: 'error', }, } let globalSettings: Settings = defaultSettings diff --git a/src/lsp/util/state.ts b/src/lsp/util/state.ts index 091650be432c4382b4fdb0430501df58d04c8e9c..4df2d1e168fc1f84badf86058b868218444f3cbf 100644 --- a/src/lsp/util/state.ts +++ b/src/lsp/util/state.ts @@ -34,11 +34,11 @@ includeLanguages: Record validate: boolean lint: { utilityConflicts: DiagnosticSeveritySetting - invalidApply: DiagnosticSeveritySetting - invalidScreen: DiagnosticSeveritySetting - invalidVariant: DiagnosticSeveritySetting - invalidConfigPath: DiagnosticSeveritySetting - invalidTailwindDirective: DiagnosticSeveritySetting + unsupportedApply: DiagnosticSeveritySetting + unknownScreen: DiagnosticSeveritySetting + unknownVariant: DiagnosticSeveritySetting + invalidHelperKey: DiagnosticSeveritySetting + unsupportedTailwindDirective: DiagnosticSeveritySetting } }