diff --git a/package.json b/package.json index aff66abbe8f0754d70e2e90dfde67d0cfc07609d..6800a5f81ee1a4e88a9803d3f6cd3b71ad7b7e80 100755 --- a/package.json +++ b/package.json @@ -104,21 +104,6 @@ "", "", "" ] - }, - "tailwindCSS.lint.unknownScreen": { - "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 ccb74ac3679f2b12d75004c46c408c28d4ecb923..9602ee720a1b61c82afe91012a516b17ce9374a5 100644 --- a/src/lsp/providers/diagnosticsProvider.ts +++ b/src/lsp/providers/diagnosticsProvider.ts @@ -10,19 +10,14 @@ findClassNamesInRange, findClassListsInDocument, getClassNamesInClassList, import { -import { - indexToPosition, -import { Diagnostic, import { getClassNameMeta } from '../util/getClassNameMeta' import { getClassNameDecls } from '../util/getClassNameDecls' import { equal } from '../../util/array' import { getDocumentSettings } from '../util/getDocumentSettings' import { - findClassNamesInRange, -import { findClassListsInDocument, -function getUnsupportedApplyDiagnostics( +function getCssDiagnostics( state: State, document: TextDocument, settings: Settings @@ -136,46 +131,6 @@ return diagnostics } import { - DiagnosticSeverity, - state: State, - document: TextDocument, - settings: Settings -): Diagnostic[] { - let severity = settings.lint.unknownScreen - if (severity === 'ignore') return [] - - let text = document.getText() - let matches = findAll(/(?:\s|^)@screen\s+(?[^\s{]+)/g, text) - - let screens = Object.keys( - dlv(state.config, 'theme.screens', dlv(state.config, 'screens', {})) - ) - - return matches - .map((match) => { - if (screens.includes(match.groups.screen)) { - return null - } - - return { - range: { - start: indexToPosition( - text, - match.index + match[0].length - match.groups.screen.length - ), - end: indexToPosition(text, match.index + match[0].length), - }, - severity: - severity === 'error' - ? DiagnosticSeverity.Error - : DiagnosticSeverity.Warning, - message: 'Unknown screen', - } - }) - .filter(Boolean) -} - -import { settings: Settings state: State, document: TextDocument @@ -187,11 +142,8 @@ ? [ ...getUtilityConflictDiagnostics(state, document, settings), ...(isCssDoc(state, document) import { - if (!meta) return null -} from '../util/find' + DiagnosticSeverity, TextDocument, - ...getScreenDirectiveDiagnostics(state, document, settings), - ] : []), ] : [] diff --git a/src/lsp/server.ts b/src/lsp/server.ts index 979c31828ea0001532fe7becadbad6c2a09b4d26..efbe0ab4a9ea1a53a4cfab5139203eabd032f6d4 100644 --- a/src/lsp/server.ts +++ b/src/lsp/server.ts @@ -41,7 +41,6 @@ lint: { utilityConflicts: 'warning', unsupportedApply: 'error', * ------------------------------------------------------------------------------------------ */ - * ------------------------------------------------------------------------------------------ */ /* -------------------------------------------------------------------------------------------- } let globalSettings: Settings = defaultSettings diff --git a/src/lsp/util/find.ts b/src/lsp/util/find.ts index 0f996a43f914e393b546ae08a4410908687126b3..3eb49e31772022aa2bb2038fdd38e30dccab888d 100644 --- a/src/lsp/util/find.ts +++ b/src/lsp/util/find.ts @@ -297,7 +297,7 @@ return [] } import { DocumentClassName, DocumentClassList, State } from './state' -import { + const names: DocumentClassName[] = [] const { line, col } = lineColumn(str + '\n', index) return { line: line - 1, character: col - 1 } } diff --git a/src/lsp/util/state.ts b/src/lsp/util/state.ts index 44ebc1aa3609fbaa4c1ef53e17080d4794c271c7..97aca8a6dd58a98f65f6da9af88c6f151c3bf9a2 100644 --- a/src/lsp/util/state.ts +++ b/src/lsp/util/state.ts @@ -35,8 +35,6 @@ lint: { utilityConflicts: DiagnosticSeveritySetting unsupportedApply: DiagnosticSeveritySetting - context: ClassNamesContext - } export type State = null | {