Skip to content
Merged
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
Original file line number Diff line number Diff line change
@@ -1,35 +1,46 @@
import { State } from '../util/state'
import type {
CodeActionParams,
CodeAction,
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[]> {
if (!diagnostic.suggestion) return [];

debugger;
return [
{
title: `Replace with '${diagnostic.suggestion}'`,
kind: 'quickfix', // CodeActionKind.QuickFix,
diagnostics: [diagnostic],
edit: {
changes: {
[params.textDocument.uri]: [
{
range: diagnostic.range,
newText: diagnostic.suggestion,
},
],
},
},
},
]
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,7 +8,7 @@ import { getInvalidVariantDiagnostics } from './getInvalidVariantDiagnostics'
import { getInvalidConfigPathDiagnostics } from './getInvalidConfigPathDiagnostics'
import { getInvalidTailwindDirectiveDiagnostics } from './getInvalidTailwindDirectiveDiagnostics'
import { getRecommendedVariantOrderDiagnostics } from './getRecommendedVariantOrderDiagnostics'
import { getUnknownClassesDiagnostics } from './getUnknownClassesDiagnostics'
import { getInvalidValueDiagnostics } from './getInvalidValueDiagnostics'

export async function doValidate(
state: State,
Expand All @@ -29,7 +29,7 @@ export async function doValidate(
return settings.tailwindCSS.validate
? [
...(only.includes(DiagnosticKind.InvalidIdentifier)
? await getUnknownClassesDiagnostics(state, document, settings)
? await getInvalidValueDiagnostics(state, document, settings)
: []),
...(only.includes(DiagnosticKind.CssConflict)
? await getCssConflictDiagnostics(state, document, settings)
Expand Down
Loading