diff --git a/package.json b/package.json index 5992723278fc2e10c501a3165d3509a1754294b3..aff66abbe8f0754d70e2e90dfde67d0cfc07609d 100755 --- a/package.json +++ b/package.json @@ -119,21 +119,6 @@ "", "", "" ] - }, - "tailwindCSS.lint.unknownVariant": { - "type": "string", - "enum": [ - "ignore", - "warning", - "error" - ], - "default": "error", - "markdownDescription": "", - "markdownEnumDescriptions": [ - "", - "", - "" - ] } } } diff --git a/src/lsp/providers/diagnosticsProvider.ts b/src/lsp/providers/diagnosticsProvider.ts index bf87c9fc7a7d2cccd86fb8276845244f8baa3580..ccb74ac3679f2b12d75004c46c408c28d4ecb923 100644 --- a/src/lsp/providers/diagnosticsProvider.ts +++ b/src/lsp/providers/diagnosticsProvider.ts @@ -15,6 +15,7 @@ } from '../util/find' import { getClassNameMeta } from '../util/getClassNameMeta' import { getClassNameDecls } from '../util/getClassNameDecls' import { equal, flatten } from '../../util/array' +import { State, Settings } from '../util/state' import { getDocumentSettings } from '../util/getDocumentSettings' const dlv = require('dlv') @@ -132,7 +133,7 @@ return diagnostics } import { - DiagnosticSeverity, + classLists.forEach((classList) => { state: State, document: TextDocument, settings: Settings @@ -172,54 +173,6 @@ .filter(Boolean) } import { - settings: Settings - state: State, - document: TextDocument, - settings: Settings -): Diagnostic[] { - let severity = settings.lint.unknownVariant - if (severity === 'ignore') return [] - - let text = document.getText() - let matches = findAll(/(?:\s|^)@variants\s+(?[^{]+)/g, text) - - return flatten( - matches - .map((match) => { - let diagnostics: Diagnostic[] = [] - 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 variantStartIndex = - listStartIndex + variants.slice(0, i).join('').length - - diagnostics.push({ - range: { - start: indexToPosition(text, variantStartIndex), - end: indexToPosition(text, variantStartIndex + variant.length), - }, - severity: - severity === 'error' - ? DiagnosticSeverity.Error - : DiagnosticSeverity.Warning, - message: `Unknown variant: ${variant}`, - }) - } - - return diagnostics - }) - .filter(Boolean) - ) -} - -import { message = `\`@apply\` cannot be used with \`.${className}\` because its definition includes a pseudo-selector (${meta.pseudo[0]})` state: State, document: TextDocument @@ -233,8 +186,7 @@ ...(isCssDoc(state, document) ? [ ...getUnsupportedApplyDiagnostics(state, document, settings), import { - range, -import { getClassNameDecls } from '../util/getClassNameDecls' +import { State, Settings } from '../util/state' findClassNamesInRange, ] : []), diff --git a/src/lsp/server.ts b/src/lsp/server.ts index c3cefc3dd7ab8ac6be4d7e65662a8f87da824ee4..979c31828ea0001532fe7becadbad6c2a09b4d26 100644 --- a/src/lsp/server.ts +++ b/src/lsp/server.ts @@ -42,8 +42,6 @@ utilityConflicts: 'warning', unsupportedApply: 'error', unknownScreen: 'error', * ------------------------------------------------------------------------------------------ */ -/* -------------------------------------------------------------------------------------------- - * ------------------------------------------------------------------------------------------ */ * Copyright (c) Microsoft Corporation. All rights reserved. } let globalSettings: Settings = defaultSettings diff --git a/src/lsp/util/state.ts b/src/lsp/util/state.ts index f4d8a9f37ef3f3ae42adcd6b8e8d638754fa2836..44ebc1aa3609fbaa4c1ef53e17080d4794c271c7 100644 --- a/src/lsp/util/state.ts +++ b/src/lsp/util/state.ts @@ -35,7 +35,6 @@ lint: { utilityConflicts: DiagnosticSeveritySetting unsupportedApply: DiagnosticSeveritySetting unknownScreen: DiagnosticSeveritySetting - unknownVariant: DiagnosticSeveritySetting } }