From 5601a37597caf9b0f758357d1875376f6b628e4e Mon Sep 17 00:00:00 2001 From: Leonard Grosoli Date: Sat, 4 Mar 2023 02:25:11 +0100 Subject: [PATCH 1/2] Fix InvalidTailwindDirective in notSemicolonLanguages with CRLF file endings --- .../src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts index 59f6de73..f9824a88 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts @@ -35,7 +35,7 @@ export function getInvalidTailwindDirectiveDiagnostics( (state.editor && notSemicolonLanguages.includes(state.editor.userLanguages[document.languageId])) ) { - regex = /(?:\s|^)@tailwind\s+(?[^\n]+)/g + regex = /(?:\s|^)@tailwind\s+(?[^(\r)?\n]+)/g } else { regex = /(?:\s|^)@tailwind\s+(?[^;]+)/g } From 2965d5366b2f761190acf5e2e322614418cff8de Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Mon, 6 Mar 2023 09:37:00 -0500 Subject: [PATCH 2/2] Fix regex --- .../src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts index f9824a88..74e26f94 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts @@ -35,7 +35,7 @@ export function getInvalidTailwindDirectiveDiagnostics( (state.editor && notSemicolonLanguages.includes(state.editor.userLanguages[document.languageId])) ) { - regex = /(?:\s|^)@tailwind\s+(?[^(\r)?\n]+)/g + regex = /(?:\s|^)@tailwind\s+(?[^\r\n]+)/g } else { regex = /(?:\s|^)@tailwind\s+(?[^;]+)/g }