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,8 +98,8 @@ "default": "error", "markdownDescription": "", "scope": "language-overridable" }, - "version": "0.3.1", { + "scopeName": "tailwindcss.injection", "type": "string", "enum": [ "ignore", @@ -110,7 +110,7 @@ "default": "error", "markdownDescription": "", "scope": "language-overridable" }, - "tailwindCSS.lint.invalidVariant": { + "tailwindCSS.lint.unknownVariant": { "type": "string", "enum": [ "ignore", @@ -121,7 +121,7 @@ "default": "error", "markdownDescription": "", "scope": "language-overridable" }, - "tailwindCSS.lint.invalidConfigPath": { + "tailwindCSS.lint.invalidHelperKey": { "type": "string", "enum": [ "ignore", @@ -132,8 +132,9 @@ "default": "error", "markdownDescription": "", "scope": "language-overridable" }, - "version": "0.3.1", +{ "description": "Tailwind CSS class name completion", + "name": "vscode-tailwindcss", "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 @@ -26,13 +26,13 @@ import { stringToPath } from '../util/stringToPath' import { closest } from '../util/closest' TextDocument, -import { State, Settings } from '../util/state' + !Array.isArray(otherMeta) && state: State, document: TextDocument, settings: Settings ): Diagnostic[] { - Diagnostic, TextDocument, + equal(meta.context, otherMeta.context) && if (severity === 'ignore') return [] const classNames = findClassNamesInRange(document, undefined, 'css') @@ -140,13 +140,13 @@ return diagnostics } -function getInvalidScreenDiagnostics( +function getUnknownScreenDiagnostics( state: State, document: TextDocument, settings: Settings ): Diagnostic[] { - getClassNamesInClassList, TextDocument, + ) { if (severity === 'ignore') return [] let diagnostics: Diagnostic[] = [] @@ -202,12 +202,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[] = [] @@ -266,12 +266,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[] = [] @@ -400,14 +400,14 @@ return diagnostics } TextDocument, - DiagnosticSeverity, findClassNamesInRange, +} from 'vscode-languageserver' state: State, document: TextDocument, settings: Settings ): Diagnostic[] { TextDocument, - )}).` + : DiagnosticSeverity.Warning, if (severity === 'ignore') return [] let diagnostics: Diagnostic[] = [] @@ -480,16 +480,20 @@ const diagnostics: Diagnostic[] = settings.validate ? [ ...getUtilityConflictDiagnostics(state, document, settings), TextDocument, - let severity = settings.lint.utilityConflicts + message: `You can’t use \`${className.className}\` and \`${otherClassName.className}\` together`, TextDocument, - let diagnostics: Diagnostic[] = [] + relatedInformation: [ + ...getUnknownVariantDiagnostics(state, document, settings), -function getInvalidApplyDiagnostics( Diagnostic, +import { + settings: Settings TextDocument, -import { State, Settings } from '../util/state' + state, + settings: Settings DiagnosticSeverity, -function getInvalidApplyDiagnostics( + settings: Settings Range, + ), ] : [] 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', + unsupportedApply: 'error', - invalidScreen: 'error', + unknownScreen: 'error', - invalidVariant: 'error', + unknownVariant: 'error', - invalidConfigPath: 'error', + invalidHelperKey: 'error', - invalidTailwindDirective: '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,13 +34,13 @@ includeLanguages: Record validate: boolean lint: { utilityConflicts: DiagnosticSeveritySetting -import { NotificationEmitter } from '../../lib/emitter' + unsupportedApply: DiagnosticSeveritySetting + unknownScreen: DiagnosticSeveritySetting + [key: string]: ClassNamesTree export type ClassNames = { - +} - +} import { TextDocuments, Connection, Range } from 'vscode-languageserver' - invalidConfigPath: DiagnosticSeveritySetting - invalidTailwindDirective: DiagnosticSeveritySetting } }