From d07fa10664f3ead9e0fdeb940b1b9f0817255b60 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Tue, 4 Nov 2025 10:02:15 -0500 Subject: [PATCH 1/4] Add a source to all emitted diagnostics --- .../src/diagnostics/canonical-classes.ts | 1 + .../src/diagnostics/getCssConflictDiagnostics.ts | 3 +++ .../src/diagnostics/getInvalidApplyDiagnostics.ts | 1 + .../src/diagnostics/getInvalidConfigPathDiagnostics.ts | 1 + .../src/diagnostics/getInvalidScreenDiagnostics.ts | 1 + .../src/diagnostics/getInvalidSourceDiagnostics.ts | 1 + .../src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts | 1 + .../src/diagnostics/getInvalidVariantDiagnostics.ts | 1 + .../src/diagnostics/getRecommendedVariantOrderDiagnostics.ts | 1 + .../src/diagnostics/getUsedBlocklistedClassDiagnostics.ts | 1 + 10 files changed, 12 insertions(+) diff --git a/packages/tailwindcss-language-service/src/diagnostics/canonical-classes.ts b/packages/tailwindcss-language-service/src/diagnostics/canonical-classes.ts index 3f30f3371..cd85a9921 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/canonical-classes.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/canonical-classes.ts @@ -46,6 +46,7 @@ export async function getSuggestCanonicalClassesDiagnostics( diagnostics.push({ code: DiagnosticKind.SuggestCanonicalClasses, + source: 'Tailwind CSS', range: className.range, severity: severity === 'error' diff --git a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts index dcf610893..f7c73b0ff 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts @@ -60,6 +60,7 @@ export async function getCssConflictDiagnostics( for (let [className, conflictingClassNames] of findConflicts(classNames, groups)) { diagnostics.push({ code: DiagnosticKind.CssConflict, + source: 'Tailwind CSS', className, otherClassNames: conflictingClassNames, range: className.range, @@ -144,6 +145,7 @@ export async function getCssConflictDiagnostics( diagnostics.push({ code: DiagnosticKind.CssConflict, + source: 'Tailwind CSS', className, otherClassNames: conflictingClassNames, range: className.range, @@ -198,6 +200,7 @@ export async function getCssConflictDiagnostics( diagnostics.push({ code: DiagnosticKind.CssConflict, + source: 'Tailwind CSS', className, otherClassNames: conflictingClassNames, range: className.range, diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts index bb1cca603..fca3570bf 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts @@ -23,6 +23,7 @@ export async function getInvalidApplyDiagnostics( return { code: DiagnosticKind.InvalidApply, + source: 'Tailwind CSS', severity: severity === 'error' ? 1 /* DiagnosticSeverity.Error */ diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts index 76864281c..83e3a2d1a 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts @@ -199,6 +199,7 @@ export function getInvalidConfigPathDiagnostics( diagnostics.push({ code: DiagnosticKind.InvalidConfigPath, + source: 'Tailwind CSS', range: helperFn.ranges.path, severity: severity === 'error' diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts index f03c672c4..caedab0f7 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts @@ -48,6 +48,7 @@ export function getInvalidScreenDiagnostics( diagnostics.push({ code: DiagnosticKind.InvalidScreen, + source: 'Tailwind CSS', range: absoluteRange( { start: indexToPosition( diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidSourceDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidSourceDiagnostics.ts index 24fdcd9c3..7c29d7a89 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidSourceDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidSourceDiagnostics.ts @@ -31,6 +31,7 @@ export function getInvalidSourceDiagnostics( function add(diag: Omit) { diagnostics.push({ code: DiagnosticKind.InvalidSourceDirective, + source: 'Tailwind CSS', severity: severity === 'error' ? 1 /* DiagnosticSeverity.Error */ diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts index 480bb8cd7..840da5838 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts @@ -51,6 +51,7 @@ export function getInvalidTailwindDirectiveDiagnostics( diagnostics.push({ code: DiagnosticKind.InvalidTailwindDirective, + source: 'Tailwind CSS', range: absoluteRange( { start: indexToPosition(text, match.index + match[0].length - layerName.length), diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts index 1401e2ee8..f8b04997a 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts @@ -73,6 +73,7 @@ export function getInvalidVariantDiagnostics( diagnostics.push({ code: DiagnosticKind.InvalidVariant, + source: 'Tailwind CSS', range: absoluteRange( { start: indexToPosition(text, variantStartIndex), diff --git a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts index 11ce2fcd6..89be87e91 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts @@ -38,6 +38,7 @@ export async function getRecommendedVariantOrderDiagnostics( if (!equalExact(variants, sortedVariants)) { diagnostics.push({ code: DiagnosticKind.RecommendedVariantOrder, + source: 'Tailwind CSS', suggestions: [ [...sortedVariants, className.className.substr(offset)].join(state.separator), ], diff --git a/packages/tailwindcss-language-service/src/diagnostics/getUsedBlocklistedClassDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getUsedBlocklistedClassDiagnostics.ts index 07f1084c5..ed617ca74 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getUsedBlocklistedClassDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getUsedBlocklistedClassDiagnostics.ts @@ -27,6 +27,7 @@ export async function getUsedBlocklistedClassDiagnostics( diagnostics.push({ code: DiagnosticKind.UsedBlocklistedClass, + source: 'Tailwind CSS', range: className.range, severity: severity === 'error' From d2eb128a3e63cdbeac4194b19215f2984b472cf0 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Tue, 4 Nov 2025 10:07:56 -0500 Subject: [PATCH 2/4] Update tests --- .../tests/code-actions/conflict.json | 2 ++ .../tests/code-actions/invalid-screen.json | 1 + .../tests/code-actions/invalid-theme.json | 1 + .../tests/code-actions/invalid-variant.json | 1 + .../tests/code-actions/variant-order.json | 1 + .../tests/diagnostics/css-conflict/css.json | 2 ++ .../css-conflict/jsx-concat-positive.json | 2 ++ .../diagnostics/css-conflict/simple.json | 2 ++ .../css-conflict/variants-positive.json | 2 ++ .../css-conflict/vue-style-lang-sass.json | 2 ++ .../tests/diagnostics/diagnostics.test.js | 20 +++++++++++++++++++ .../diagnostics/invalid-screen/simple.json | 1 + .../diagnostics/invalid-theme/simple.json | 1 + .../diagnostics/source-diagnostics.test.js | 10 ++++++++++ 14 files changed, 48 insertions(+) diff --git a/packages/tailwindcss-language-server/tests/code-actions/conflict.json b/packages/tailwindcss-language-server/tests/code-actions/conflict.json index eccb14464..23649f377 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/conflict.json +++ b/packages/tailwindcss-language-server/tests/code-actions/conflict.json @@ -7,6 +7,7 @@ "diagnostics": [ { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "lowercase", "classList": { @@ -85,6 +86,7 @@ "diagnostics": [ { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "uppercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/code-actions/invalid-screen.json b/packages/tailwindcss-language-server/tests/code-actions/invalid-screen.json index 9c49c1b92..e8cae5fdb 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/invalid-screen.json +++ b/packages/tailwindcss-language-server/tests/code-actions/invalid-screen.json @@ -8,6 +8,7 @@ "diagnostics": [ { "code": "invalidScreen", + "source": "Tailwind CSS", "range": { "start": { "line": 0, "character": 8 }, "end": { "line": 0, "character": 13 } diff --git a/packages/tailwindcss-language-server/tests/code-actions/invalid-theme.json b/packages/tailwindcss-language-server/tests/code-actions/invalid-theme.json index 7aceb38ea..5211bb400 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/invalid-theme.json +++ b/packages/tailwindcss-language-server/tests/code-actions/invalid-theme.json @@ -8,6 +8,7 @@ "diagnostics": [ { "code": "invalidConfigPath", + "source": "Tailwind CSS", "range": { "start": { "line": 0, "character": 21 }, "end": { "line": 0, "character": 35 } diff --git a/packages/tailwindcss-language-server/tests/code-actions/invalid-variant.json b/packages/tailwindcss-language-server/tests/code-actions/invalid-variant.json index 5fbd5a7a6..9a4981e71 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/invalid-variant.json +++ b/packages/tailwindcss-language-server/tests/code-actions/invalid-variant.json @@ -8,6 +8,7 @@ "diagnostics": [ { "code": "invalidVariant", + "source": "Tailwind CSS", "range": { "start": { "line": 0, "character": 10 }, "end": { "line": 0, "character": 16 } diff --git a/packages/tailwindcss-language-server/tests/code-actions/variant-order.json b/packages/tailwindcss-language-server/tests/code-actions/variant-order.json index 6d44068fa..1bb881345 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/variant-order.json +++ b/packages/tailwindcss-language-server/tests/code-actions/variant-order.json @@ -7,6 +7,7 @@ "diagnostics": [ { "code": "recommendedVariantOrder", + "source": "Tailwind CSS", "suggestions": ["focus:hover:uppercase"], "range": { "start": { "line": 0, "character": 12 }, diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/css.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/css.json index da506bf12..8e73e9901 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/css.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/css.json @@ -4,6 +4,7 @@ "expected": [ { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "uppercase", "classList": { @@ -59,6 +60,7 @@ }, { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "lowercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/jsx-concat-positive.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/jsx-concat-positive.json index 39cbb515a..7525739db 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/jsx-concat-positive.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/jsx-concat-positive.json @@ -4,6 +4,7 @@ "expected": [ { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "lowercase", "classList": { @@ -57,6 +58,7 @@ }, { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "uppercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/simple.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/simple.json index c98280a11..2dcb3e08d 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/simple.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/simple.json @@ -3,6 +3,7 @@ "expected": [ { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "uppercase", "classList": { @@ -56,6 +57,7 @@ }, { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "lowercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/variants-positive.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/variants-positive.json index 15fcb4572..47bdaf96d 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/variants-positive.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/variants-positive.json @@ -3,6 +3,7 @@ "expected": [ { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "sm:uppercase", "classList": { @@ -56,6 +57,7 @@ }, { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "sm:lowercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/vue-style-lang-sass.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/vue-style-lang-sass.json index 7e9da86be..23beca1bb 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/vue-style-lang-sass.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/vue-style-lang-sass.json @@ -4,6 +4,7 @@ "expected": [ { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "uppercase", "classList": { @@ -59,6 +60,7 @@ }, { "code": "cssConflict", + "source": "Tailwind CSS", "className": { "className": "lowercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js b/packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js index 42faee537..8a8994456 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js +++ b/packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js @@ -95,6 +95,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidConfigPath', + source: 'Tailwind CSS', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 36 } }, severity: 1, message: "'--color-red-901' does not exist in your theme. Did you mean '--color-red-900'?", @@ -109,6 +110,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidConfigPath', + source: 'Tailwind CSS', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 37 } }, severity: 1, message: "'--colors-red-901' does not exist in your theme. Did you mean '--color-red-900'?", @@ -123,6 +125,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidConfigPath', + source: 'Tailwind CSS', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 42 } }, severity: 1, message: "'--font-obliqueness-90' does not exist in your theme.", @@ -143,6 +146,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidConfigPath', + source: 'Tailwind CSS', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 35 } }, severity: 1, message: "'colors.red.901' does not exist in your theme config.", @@ -194,6 +198,7 @@ withFixture('v4/with-prefix', (c) => { expected: [ { code: 'invalidConfigPath', + source: 'Tailwind CSS', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 36 } }, severity: 1, message: "'--color-red-901' does not exist in your theme. Did you mean '--color-red-900'?", @@ -208,6 +213,7 @@ withFixture('v4/with-prefix', (c) => { expected: [ { code: 'invalidConfigPath', + source: 'Tailwind CSS', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 37 } }, severity: 1, message: "'--colors-red-901' does not exist in your theme. Did you mean '--color-red-900'?", @@ -222,6 +228,7 @@ withFixture('v4/with-prefix', (c) => { expected: [ { code: 'invalidConfigPath', + source: 'Tailwind CSS', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 42 } }, severity: 1, message: "'--font-obliqueness-90' does not exist in your theme.", @@ -242,6 +249,7 @@ withFixture('v4/with-prefix', (c) => { expected: [ { code: 'invalidConfigPath', + source: 'Tailwind CSS', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 35 } }, severity: 1, message: "'colors.red.901' does not exist in your theme config.", @@ -280,6 +288,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'cssConflict', + source: 'Tailwind CSS', message: "'max-w-4xl' applies the same CSS properties as 'max-w-6xl'.", className: { className: 'max-w-4xl', @@ -298,6 +307,7 @@ withFixture('v4/basic', (c) => { }, { code: 'cssConflict', + source: 'Tailwind CSS', message: "'max-w-6xl' applies the same CSS properties as 'max-w-4xl'.", className: { className: 'max-w-6xl', @@ -329,6 +339,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidTailwindDirective', + source: 'Tailwind CSS', message: "'@tailwind base' is no longer available in v4. Use '@import \"tailwindcss/preflight\"' instead.", suggestions: [], @@ -340,6 +351,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidTailwindDirective', + source: 'Tailwind CSS', message: "'@tailwind preflight' is no longer available in v4. Use '@import \"tailwindcss/preflight\"' instead.", suggestions: [], @@ -351,6 +363,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidTailwindDirective', + source: 'Tailwind CSS', message: "'@tailwind components' is no longer available in v4. Use '@tailwind utilities' instead.", suggestions: ['utilities'], @@ -362,6 +375,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidTailwindDirective', + source: 'Tailwind CSS', message: "'@tailwind screens' is no longer available in v4. Use '@tailwind utilities' instead.", suggestions: ['utilities'], @@ -373,6 +387,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidTailwindDirective', + source: 'Tailwind CSS', message: "'@tailwind variants' is no longer available in v4. Use '@tailwind utilities' instead.", suggestions: ['utilities'], @@ -406,6 +421,7 @@ defineTest({ expect(diagnostics).toEqual([ { code: 'usedBlocklistedClass', + source: 'Tailwind CSS', message: 'The class "flex" will not be generated as it has been blocklisted', range: { start: { line: 0, character: 12 }, @@ -415,6 +431,7 @@ defineTest({ }, { code: 'usedBlocklistedClass', + source: 'Tailwind CSS', message: 'The class "hover:flex" will not be generated as it has been blocklisted', range: { start: { line: 0, character: 27 }, @@ -463,6 +480,7 @@ defineTest({ expect(diagnostics).toEqual([ { code: 'suggestCanonicalClasses', + source: 'Tailwind CSS', message: 'The class `[@media_print]:flex` can be written as `print:flex`', range: { start: { line: 0, character: 12 }, @@ -473,6 +491,7 @@ defineTest({ }, { code: 'suggestCanonicalClasses', + source: 'Tailwind CSS', message: 'The class `[color:red]/50` can be written as `text-[red]/50`', range: { start: { line: 0, character: 32 }, @@ -483,6 +502,7 @@ defineTest({ }, { code: 'suggestCanonicalClasses', + source: 'Tailwind CSS', message: 'The class `mt-[16px]` can be written as `mt-4`', range: { start: { line: 0, character: 47 }, diff --git a/packages/tailwindcss-language-server/tests/diagnostics/invalid-screen/simple.json b/packages/tailwindcss-language-server/tests/diagnostics/invalid-screen/simple.json index 61974b86e..e15023614 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/invalid-screen/simple.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/invalid-screen/simple.json @@ -4,6 +4,7 @@ "expected": [ { "code": "invalidScreen", + "source": "Tailwind CSS", "range": { "start": { "line": 0, "character": 8 }, "end": { "line": 0, "character": 13 } }, "severity": 1, "message": "The screen 'small' does not exist in your theme config. Did you mean 'sm'?", diff --git a/packages/tailwindcss-language-server/tests/diagnostics/invalid-theme/simple.json b/packages/tailwindcss-language-server/tests/diagnostics/invalid-theme/simple.json index 861a8b4ea..6fbfdcced 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/invalid-theme/simple.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/invalid-theme/simple.json @@ -4,6 +4,7 @@ "expected": [ { "code": "invalidConfigPath", + "source": "Tailwind CSS", "range": { "start": { "line": 0, "character": 21 }, "end": { "line": 0, "character": 35 } }, "severity": 1, "message": "'colors.red.901' does not exist in your theme config. Did you mean 'colors.red.900'?", diff --git a/packages/tailwindcss-language-server/tests/diagnostics/source-diagnostics.test.js b/packages/tailwindcss-language-server/tests/diagnostics/source-diagnostics.test.js index f6287b63d..07cd7777e 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/source-diagnostics.test.js +++ b/packages/tailwindcss-language-server/tests/diagnostics/source-diagnostics.test.js @@ -32,6 +32,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: 'The source directive requires a path to a directory.', range: { start: { line: 1, character: 35 }, @@ -40,6 +41,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: 'The source directive requires a path to a directory.', range: { start: { line: 2, character: 35 }, @@ -48,6 +50,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: 'The source directive requires a path to a directory.', range: { start: { line: 3, character: 35 }, @@ -56,6 +59,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: 'The source directive requires a path to a directory.', range: { start: { line: 4, character: 33 }, @@ -64,6 +68,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: 'The source directive requires a path to a directory.', range: { start: { line: 5, character: 33 }, @@ -72,6 +77,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: 'The source directive requires a path to a directory.', range: { start: { line: 6, character: 33 }, @@ -90,6 +96,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: '`source(no)` is invalid. Did you mean `source(none)`?', range: { start: { line: 1, character: 35 }, @@ -98,6 +105,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: '`source(no)` is invalid. Did you mean `source(none)`?', range: { start: { line: 2, character: 33 }, @@ -127,6 +135,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: 'POSIX-style paths are required with `source(…)` but `C:\\absolute\\path` is a Windows-style path.', range: { @@ -136,6 +145,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', + source: 'Tailwind CSS', message: 'POSIX-style paths are required with `source(…)` but `C:relative.txt` is a Windows-style path.', range: { From 10de83677472976483652388f8398ab1303778b5 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Tue, 4 Nov 2025 10:09:44 -0500 Subject: [PATCH 3/4] Update changelog --- packages/vscode-tailwindcss/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md index ae2344e51..d8c536d02 100644 --- a/packages/vscode-tailwindcss/CHANGELOG.md +++ b/packages/vscode-tailwindcss/CHANGELOG.md @@ -2,7 +2,7 @@ ## Prerelease -- Nothing yet! +- Add a source to all emitted diagnostics ([#1491](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1491)) ## 0.14.29 From 18d16a87472f6ee6fa3c7a92fc1a75cdd2038b32 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Tue, 4 Nov 2025 10:22:29 -0500 Subject: [PATCH 4/4] Use lowercase, one-word form for diagnostic source --- .../tests/code-actions/conflict.json | 4 +- .../tests/code-actions/invalid-screen.json | 2 +- .../tests/code-actions/invalid-theme.json | 2 +- .../tests/code-actions/invalid-variant.json | 2 +- .../tests/code-actions/variant-order.json | 2 +- .../tests/diagnostics/css-conflict/css.json | 4 +- .../css-conflict/jsx-concat-positive.json | 4 +- .../diagnostics/css-conflict/simple.json | 4 +- .../css-conflict/variants-positive.json | 4 +- .../css-conflict/vue-style-lang-sass.json | 4 +- .../tests/diagnostics/diagnostics.test.js | 40 +++++++++---------- .../diagnostics/invalid-screen/simple.json | 2 +- .../diagnostics/invalid-theme/simple.json | 2 +- .../diagnostics/source-diagnostics.test.js | 20 +++++----- .../src/diagnostics/canonical-classes.ts | 2 +- .../diagnostics/getCssConflictDiagnostics.ts | 6 +-- .../diagnostics/getInvalidApplyDiagnostics.ts | 2 +- .../getInvalidConfigPathDiagnostics.ts | 2 +- .../getInvalidScreenDiagnostics.ts | 2 +- .../getInvalidSourceDiagnostics.ts | 2 +- .../getInvalidTailwindDirectiveDiagnostics.ts | 2 +- .../getInvalidVariantDiagnostics.ts | 2 +- .../getRecommendedVariantOrderDiagnostics.ts | 2 +- .../getUsedBlocklistedClassDiagnostics.ts | 2 +- 24 files changed, 60 insertions(+), 60 deletions(-) diff --git a/packages/tailwindcss-language-server/tests/code-actions/conflict.json b/packages/tailwindcss-language-server/tests/code-actions/conflict.json index 23649f377..bd7fc028a 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/conflict.json +++ b/packages/tailwindcss-language-server/tests/code-actions/conflict.json @@ -7,7 +7,7 @@ "diagnostics": [ { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "lowercase", "classList": { @@ -86,7 +86,7 @@ "diagnostics": [ { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "uppercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/code-actions/invalid-screen.json b/packages/tailwindcss-language-server/tests/code-actions/invalid-screen.json index e8cae5fdb..2b5b5364b 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/invalid-screen.json +++ b/packages/tailwindcss-language-server/tests/code-actions/invalid-screen.json @@ -8,7 +8,7 @@ "diagnostics": [ { "code": "invalidScreen", - "source": "Tailwind CSS", + "source": "tailwindcss", "range": { "start": { "line": 0, "character": 8 }, "end": { "line": 0, "character": 13 } diff --git a/packages/tailwindcss-language-server/tests/code-actions/invalid-theme.json b/packages/tailwindcss-language-server/tests/code-actions/invalid-theme.json index 5211bb400..958ecf0d8 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/invalid-theme.json +++ b/packages/tailwindcss-language-server/tests/code-actions/invalid-theme.json @@ -8,7 +8,7 @@ "diagnostics": [ { "code": "invalidConfigPath", - "source": "Tailwind CSS", + "source": "tailwindcss", "range": { "start": { "line": 0, "character": 21 }, "end": { "line": 0, "character": 35 } diff --git a/packages/tailwindcss-language-server/tests/code-actions/invalid-variant.json b/packages/tailwindcss-language-server/tests/code-actions/invalid-variant.json index 9a4981e71..20bd2f361 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/invalid-variant.json +++ b/packages/tailwindcss-language-server/tests/code-actions/invalid-variant.json @@ -8,7 +8,7 @@ "diagnostics": [ { "code": "invalidVariant", - "source": "Tailwind CSS", + "source": "tailwindcss", "range": { "start": { "line": 0, "character": 10 }, "end": { "line": 0, "character": 16 } diff --git a/packages/tailwindcss-language-server/tests/code-actions/variant-order.json b/packages/tailwindcss-language-server/tests/code-actions/variant-order.json index 1bb881345..d5b1491dc 100644 --- a/packages/tailwindcss-language-server/tests/code-actions/variant-order.json +++ b/packages/tailwindcss-language-server/tests/code-actions/variant-order.json @@ -7,7 +7,7 @@ "diagnostics": [ { "code": "recommendedVariantOrder", - "source": "Tailwind CSS", + "source": "tailwindcss", "suggestions": ["focus:hover:uppercase"], "range": { "start": { "line": 0, "character": 12 }, diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/css.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/css.json index 8e73e9901..0458b7893 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/css.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/css.json @@ -4,7 +4,7 @@ "expected": [ { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "uppercase", "classList": { @@ -60,7 +60,7 @@ }, { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "lowercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/jsx-concat-positive.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/jsx-concat-positive.json index 7525739db..fed900d78 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/jsx-concat-positive.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/jsx-concat-positive.json @@ -4,7 +4,7 @@ "expected": [ { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "lowercase", "classList": { @@ -58,7 +58,7 @@ }, { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "uppercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/simple.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/simple.json index 2dcb3e08d..08137dc7e 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/simple.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/simple.json @@ -3,7 +3,7 @@ "expected": [ { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "uppercase", "classList": { @@ -57,7 +57,7 @@ }, { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "lowercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/variants-positive.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/variants-positive.json index 47bdaf96d..edcc7c4fa 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/variants-positive.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/variants-positive.json @@ -3,7 +3,7 @@ "expected": [ { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "sm:uppercase", "classList": { @@ -57,7 +57,7 @@ }, { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "sm:lowercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/vue-style-lang-sass.json b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/vue-style-lang-sass.json index 23beca1bb..eaf85246d 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/vue-style-lang-sass.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/css-conflict/vue-style-lang-sass.json @@ -4,7 +4,7 @@ "expected": [ { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "uppercase", "classList": { @@ -60,7 +60,7 @@ }, { "code": "cssConflict", - "source": "Tailwind CSS", + "source": "tailwindcss", "className": { "className": "lowercase", "classList": { diff --git a/packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js b/packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js index 8a8994456..957185d0f 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js +++ b/packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js @@ -95,7 +95,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidConfigPath', - source: 'Tailwind CSS', + source: 'tailwindcss', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 36 } }, severity: 1, message: "'--color-red-901' does not exist in your theme. Did you mean '--color-red-900'?", @@ -110,7 +110,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidConfigPath', - source: 'Tailwind CSS', + source: 'tailwindcss', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 37 } }, severity: 1, message: "'--colors-red-901' does not exist in your theme. Did you mean '--color-red-900'?", @@ -125,7 +125,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidConfigPath', - source: 'Tailwind CSS', + source: 'tailwindcss', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 42 } }, severity: 1, message: "'--font-obliqueness-90' does not exist in your theme.", @@ -146,7 +146,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidConfigPath', - source: 'Tailwind CSS', + source: 'tailwindcss', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 35 } }, severity: 1, message: "'colors.red.901' does not exist in your theme config.", @@ -198,7 +198,7 @@ withFixture('v4/with-prefix', (c) => { expected: [ { code: 'invalidConfigPath', - source: 'Tailwind CSS', + source: 'tailwindcss', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 36 } }, severity: 1, message: "'--color-red-901' does not exist in your theme. Did you mean '--color-red-900'?", @@ -213,7 +213,7 @@ withFixture('v4/with-prefix', (c) => { expected: [ { code: 'invalidConfigPath', - source: 'Tailwind CSS', + source: 'tailwindcss', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 37 } }, severity: 1, message: "'--colors-red-901' does not exist in your theme. Did you mean '--color-red-900'?", @@ -228,7 +228,7 @@ withFixture('v4/with-prefix', (c) => { expected: [ { code: 'invalidConfigPath', - source: 'Tailwind CSS', + source: 'tailwindcss', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 42 } }, severity: 1, message: "'--font-obliqueness-90' does not exist in your theme.", @@ -249,7 +249,7 @@ withFixture('v4/with-prefix', (c) => { expected: [ { code: 'invalidConfigPath', - source: 'Tailwind CSS', + source: 'tailwindcss', range: { start: { line: 0, character: 21 }, end: { line: 0, character: 35 } }, severity: 1, message: "'colors.red.901' does not exist in your theme config.", @@ -288,7 +288,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'cssConflict', - source: 'Tailwind CSS', + source: 'tailwindcss', message: "'max-w-4xl' applies the same CSS properties as 'max-w-6xl'.", className: { className: 'max-w-4xl', @@ -307,7 +307,7 @@ withFixture('v4/basic', (c) => { }, { code: 'cssConflict', - source: 'Tailwind CSS', + source: 'tailwindcss', message: "'max-w-6xl' applies the same CSS properties as 'max-w-4xl'.", className: { className: 'max-w-6xl', @@ -339,7 +339,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidTailwindDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: "'@tailwind base' is no longer available in v4. Use '@import \"tailwindcss/preflight\"' instead.", suggestions: [], @@ -351,7 +351,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidTailwindDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: "'@tailwind preflight' is no longer available in v4. Use '@import \"tailwindcss/preflight\"' instead.", suggestions: [], @@ -363,7 +363,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidTailwindDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: "'@tailwind components' is no longer available in v4. Use '@tailwind utilities' instead.", suggestions: ['utilities'], @@ -375,7 +375,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidTailwindDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: "'@tailwind screens' is no longer available in v4. Use '@tailwind utilities' instead.", suggestions: ['utilities'], @@ -387,7 +387,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidTailwindDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: "'@tailwind variants' is no longer available in v4. Use '@tailwind utilities' instead.", suggestions: ['utilities'], @@ -421,7 +421,7 @@ defineTest({ expect(diagnostics).toEqual([ { code: 'usedBlocklistedClass', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The class "flex" will not be generated as it has been blocklisted', range: { start: { line: 0, character: 12 }, @@ -431,7 +431,7 @@ defineTest({ }, { code: 'usedBlocklistedClass', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The class "hover:flex" will not be generated as it has been blocklisted', range: { start: { line: 0, character: 27 }, @@ -480,7 +480,7 @@ defineTest({ expect(diagnostics).toEqual([ { code: 'suggestCanonicalClasses', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The class `[@media_print]:flex` can be written as `print:flex`', range: { start: { line: 0, character: 12 }, @@ -491,7 +491,7 @@ defineTest({ }, { code: 'suggestCanonicalClasses', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The class `[color:red]/50` can be written as `text-[red]/50`', range: { start: { line: 0, character: 32 }, @@ -502,7 +502,7 @@ defineTest({ }, { code: 'suggestCanonicalClasses', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The class `mt-[16px]` can be written as `mt-4`', range: { start: { line: 0, character: 47 }, diff --git a/packages/tailwindcss-language-server/tests/diagnostics/invalid-screen/simple.json b/packages/tailwindcss-language-server/tests/diagnostics/invalid-screen/simple.json index e15023614..9fb1ded22 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/invalid-screen/simple.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/invalid-screen/simple.json @@ -4,7 +4,7 @@ "expected": [ { "code": "invalidScreen", - "source": "Tailwind CSS", + "source": "tailwindcss", "range": { "start": { "line": 0, "character": 8 }, "end": { "line": 0, "character": 13 } }, "severity": 1, "message": "The screen 'small' does not exist in your theme config. Did you mean 'sm'?", diff --git a/packages/tailwindcss-language-server/tests/diagnostics/invalid-theme/simple.json b/packages/tailwindcss-language-server/tests/diagnostics/invalid-theme/simple.json index 6fbfdcced..3be41f4b8 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/invalid-theme/simple.json +++ b/packages/tailwindcss-language-server/tests/diagnostics/invalid-theme/simple.json @@ -4,7 +4,7 @@ "expected": [ { "code": "invalidConfigPath", - "source": "Tailwind CSS", + "source": "tailwindcss", "range": { "start": { "line": 0, "character": 21 }, "end": { "line": 0, "character": 35 } }, "severity": 1, "message": "'colors.red.901' does not exist in your theme config. Did you mean 'colors.red.900'?", diff --git a/packages/tailwindcss-language-server/tests/diagnostics/source-diagnostics.test.js b/packages/tailwindcss-language-server/tests/diagnostics/source-diagnostics.test.js index 07cd7777e..0024ed43e 100644 --- a/packages/tailwindcss-language-server/tests/diagnostics/source-diagnostics.test.js +++ b/packages/tailwindcss-language-server/tests/diagnostics/source-diagnostics.test.js @@ -32,7 +32,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The source directive requires a path to a directory.', range: { start: { line: 1, character: 35 }, @@ -41,7 +41,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The source directive requires a path to a directory.', range: { start: { line: 2, character: 35 }, @@ -50,7 +50,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The source directive requires a path to a directory.', range: { start: { line: 3, character: 35 }, @@ -59,7 +59,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The source directive requires a path to a directory.', range: { start: { line: 4, character: 33 }, @@ -68,7 +68,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The source directive requires a path to a directory.', range: { start: { line: 5, character: 33 }, @@ -77,7 +77,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'The source directive requires a path to a directory.', range: { start: { line: 6, character: 33 }, @@ -96,7 +96,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: '`source(no)` is invalid. Did you mean `source(none)`?', range: { start: { line: 1, character: 35 }, @@ -105,7 +105,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: '`source(no)` is invalid. Did you mean `source(none)`?', range: { start: { line: 2, character: 33 }, @@ -135,7 +135,7 @@ withFixture('v4/basic', (c) => { expected: [ { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'POSIX-style paths are required with `source(…)` but `C:\\absolute\\path` is a Windows-style path.', range: { @@ -145,7 +145,7 @@ withFixture('v4/basic', (c) => { }, { code: 'invalidSourceDirective', - source: 'Tailwind CSS', + source: 'tailwindcss', message: 'POSIX-style paths are required with `source(…)` but `C:relative.txt` is a Windows-style path.', range: { diff --git a/packages/tailwindcss-language-service/src/diagnostics/canonical-classes.ts b/packages/tailwindcss-language-service/src/diagnostics/canonical-classes.ts index cd85a9921..d7e3dfe99 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/canonical-classes.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/canonical-classes.ts @@ -46,7 +46,7 @@ export async function getSuggestCanonicalClassesDiagnostics( diagnostics.push({ code: DiagnosticKind.SuggestCanonicalClasses, - source: 'Tailwind CSS', + source: 'tailwindcss', range: className.range, severity: severity === 'error' diff --git a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts index f7c73b0ff..09317bf6a 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts @@ -60,7 +60,7 @@ export async function getCssConflictDiagnostics( for (let [className, conflictingClassNames] of findConflicts(classNames, groups)) { diagnostics.push({ code: DiagnosticKind.CssConflict, - source: 'Tailwind CSS', + source: 'tailwindcss', className, otherClassNames: conflictingClassNames, range: className.range, @@ -145,7 +145,7 @@ export async function getCssConflictDiagnostics( diagnostics.push({ code: DiagnosticKind.CssConflict, - source: 'Tailwind CSS', + source: 'tailwindcss', className, otherClassNames: conflictingClassNames, range: className.range, @@ -200,7 +200,7 @@ export async function getCssConflictDiagnostics( diagnostics.push({ code: DiagnosticKind.CssConflict, - source: 'Tailwind CSS', + source: 'tailwindcss', className, otherClassNames: conflictingClassNames, range: className.range, diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts index fca3570bf..ca9a2d823 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts @@ -23,7 +23,7 @@ export async function getInvalidApplyDiagnostics( return { code: DiagnosticKind.InvalidApply, - source: 'Tailwind CSS', + source: 'tailwindcss', severity: severity === 'error' ? 1 /* DiagnosticSeverity.Error */ diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts index 83e3a2d1a..1d36d4b6d 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts @@ -199,7 +199,7 @@ export function getInvalidConfigPathDiagnostics( diagnostics.push({ code: DiagnosticKind.InvalidConfigPath, - source: 'Tailwind CSS', + source: 'tailwindcss', range: helperFn.ranges.path, severity: severity === 'error' diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts index caedab0f7..7eef058ba 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts @@ -48,7 +48,7 @@ export function getInvalidScreenDiagnostics( diagnostics.push({ code: DiagnosticKind.InvalidScreen, - source: 'Tailwind CSS', + source: 'tailwindcss', range: absoluteRange( { start: indexToPosition( diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidSourceDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidSourceDiagnostics.ts index 7c29d7a89..b7a948ca8 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidSourceDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidSourceDiagnostics.ts @@ -31,7 +31,7 @@ export function getInvalidSourceDiagnostics( function add(diag: Omit) { diagnostics.push({ code: DiagnosticKind.InvalidSourceDirective, - source: 'Tailwind CSS', + source: 'tailwindcss', severity: severity === 'error' ? 1 /* DiagnosticSeverity.Error */ diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts index 840da5838..7d98ff5da 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts @@ -51,7 +51,7 @@ export function getInvalidTailwindDirectiveDiagnostics( diagnostics.push({ code: DiagnosticKind.InvalidTailwindDirective, - source: 'Tailwind CSS', + source: 'tailwindcss', range: absoluteRange( { start: indexToPosition(text, match.index + match[0].length - layerName.length), diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts index f8b04997a..923f1dd9f 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts @@ -73,7 +73,7 @@ export function getInvalidVariantDiagnostics( diagnostics.push({ code: DiagnosticKind.InvalidVariant, - source: 'Tailwind CSS', + source: 'tailwindcss', range: absoluteRange( { start: indexToPosition(text, variantStartIndex), diff --git a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts index 89be87e91..959bb87f7 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts @@ -38,7 +38,7 @@ export async function getRecommendedVariantOrderDiagnostics( if (!equalExact(variants, sortedVariants)) { diagnostics.push({ code: DiagnosticKind.RecommendedVariantOrder, - source: 'Tailwind CSS', + source: 'tailwindcss', suggestions: [ [...sortedVariants, className.className.substr(offset)].join(state.separator), ], diff --git a/packages/tailwindcss-language-service/src/diagnostics/getUsedBlocklistedClassDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getUsedBlocklistedClassDiagnostics.ts index ed617ca74..a0743eae7 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getUsedBlocklistedClassDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getUsedBlocklistedClassDiagnostics.ts @@ -27,7 +27,7 @@ export async function getUsedBlocklistedClassDiagnostics( diagnostics.push({ code: DiagnosticKind.UsedBlocklistedClass, - source: 'Tailwind CSS', + source: 'tailwindcss', range: className.range, severity: severity === 'error'