Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Invalid value detection #872

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/tailwindcss-language-server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ async function getConfiguration(uri?: string) {
colorDecorators: true,
rootFontSize: 16,
lint: {
invalidClass: 'error',
cssConflict: 'warning',
invalidApply: 'error',
invalidScreen: 'error',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ import {
isInvalidScreenDiagnostic,
isInvalidVariantDiagnostic,
isRecommendedVariantOrderDiagnostic,
isInvalidIdentifierDiagnostic,
} from '../diagnostics/types'
import { flatten, dedupeBy } from '../util/array'
import { provideCssConflictCodeActions } from './provideCssConflictCodeActions'
import { provideInvalidApplyCodeActions } from './provideInvalidApplyCodeActions'
import { provideSuggestionCodeActions } from './provideSuggestionCodeActions'
import { provideInvalidIdentifierCodeActions } from './provideInvalidIdentifierCodeActions'


async function getDiagnosticsFromCodeActionParams(
state: State,
Expand Down Expand Up @@ -65,6 +68,10 @@ export async function doCodeActions(state: State, params: CodeActionParams, docu
return provideCssConflictCodeActions(state, params, diagnostic)
}

if (isInvalidIdentifierDiagnostic(diagnostic)) {
return provideInvalidIdentifierCodeActions(state, params, diagnostic)
}

if (
isInvalidConfigPathDiagnostic(diagnostic) ||
isInvalidTailwindDirectiveDiagnostic(diagnostic) ||
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { State } from '../util/state'
import {
type CodeActionParams, CodeAction,
CodeActionKind,
Command,
} from 'vscode-languageserver'
import { CssConflictDiagnostic, InvalidIdentifierDiagnostic } from '../diagnostics/types'
import { joinWithAnd } from '../util/joinWithAnd'
import { removeRangesFromString } from '../util/removeRangesFromString'


export async function provideInvalidIdentifierCodeActions(
_state: State,
params: CodeActionParams,
diagnostic: InvalidIdentifierDiagnostic
): Promise<CodeAction[]> {
const actions: CodeAction[] = [{
title: `Ignore '${diagnostic.chunk}' in this workspace`,
kind: CodeActionKind.QuickFix,
diagnostics: [diagnostic],
command: Command.create(`Ignore '${diagnostic.chunk}' in this workspace`, 'tailwindCSS.addWordToWorkspaceFileFromServer', diagnostic.chunk)
}];

if (typeof diagnostic.suggestion == 'string') {
actions.push({
title: `Replace with '${diagnostic.suggestion}'`,
kind: CodeActionKind.QuickFix,
diagnostics: [diagnostic],
isPreferred: true,
edit: {
changes: {
[params.textDocument.uri]: [
{
range: diagnostic.range,
newText: diagnostic.suggestion,
},
],
},
},
})
} else {
// unimplemented.
}

return actions;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { getInvalidVariantDiagnostics } from './getInvalidVariantDiagnostics'
import { getInvalidConfigPathDiagnostics } from './getInvalidConfigPathDiagnostics'
import { getInvalidTailwindDirectiveDiagnostics } from './getInvalidTailwindDirectiveDiagnostics'
import { getRecommendedVariantOrderDiagnostics } from './getRecommendedVariantOrderDiagnostics'
import { getInvalidValueDiagnostics } from './getInvalidValueDiagnostics'

export async function doValidate(
state: State,
Expand All @@ -18,6 +19,7 @@ export async function doValidate(
DiagnosticKind.InvalidScreen,
DiagnosticKind.InvalidVariant,
DiagnosticKind.InvalidConfigPath,
DiagnosticKind.InvalidIdentifier,
DiagnosticKind.InvalidTailwindDirective,
DiagnosticKind.RecommendedVariantOrder,
]
Expand All @@ -26,7 +28,10 @@ export async function doValidate(

return settings.tailwindCSS.validate
? [
...(only.includes(DiagnosticKind.CssConflict)
...(only.includes(DiagnosticKind.InvalidIdentifier)
? await getInvalidValueDiagnostics(state, document, settings)
: []),
...(only.includes(DiagnosticKind.CssConflict)
? await getCssConflictDiagnostics(state, document, settings)
: []),
...(only.includes(DiagnosticKind.InvalidApply)
Expand Down
Loading