Skip to content

Commit 34fb4b5

Browse files
Show source diagnostics when imports contain a layer (#1204)
Fixes #1099
1 parent 1417211 commit 34fb4b5

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

Diff for: packages/tailwindcss-language-service/src/completions/file-paths.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const PATTERN_CUSTOM_V3 = /@(?<directive>config)\s*(?<partial>'[^']*|"[^"]*)$/
77
// @import … source('…')
88
// @tailwind utilities source('…')
99
const PATTERN_IMPORT_SOURCE =
10-
/@(?<directive>(?:import|reference))\s*(?<path>'[^']*'|"[^"]*")\s*source\((?<partial>'[^']*|"[^"]*)$/
10+
/@(?<directive>(?:import|reference))\s*(?<path>'[^']*'|"[^"]*")\s*(layer\([^)]+\)\s*)?source\((?<partial>'[^']*|"[^"]*)$/
1111
const PATTERN_UTIL_SOURCE =
1212
/@(?<directive>tailwind)\s+utilities\s+source\((?<partial>'[^']*|"[^"]*)?$/
1313

Diff for: packages/tailwindcss-language-service/src/diagnostics/getInvalidSourceDiagnostics.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { absoluteRange } from '../util/absoluteRange'
88
// @import … source('…')
99
// @tailwind utilities source('…')
1010
const PATTERN_IMPORT_SOURCE =
11-
/(?:\s|^)@(?<directive>(?:import|reference))\s*(?<path>'[^']*'|"[^"]*")\s*source\((?<source>'[^']*'?|"[^"]*"?|[a-z]*|\)|;)/dg
11+
/(?:\s|^)@(?<directive>(?:import|reference))\s*(?<path>'[^']*'|"[^"]*")\s*(layer\([^)]+\)\s*)?source\((?<source>'[^']*'?|"[^"]*"?|[a-z]*|\)|;)/dg
1212
const PATTERN_UTIL_SOURCE =
1313
/(?:\s|^)@(?<directive>tailwind)\s+(?<layer>\S+)\s+source\((?<source>'[^']*'?|"[^"]*"?|[a-z]*|\)|;)/dg
1414

Diff for: packages/tailwindcss-language-service/src/documentLinksProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export function getDocumentLinks(
1919
patterns.push(
2020
/@plugin\s*(?<path>'[^']+'|"[^"]+")/g,
2121
/@source\s*(?<path>'[^']+'|"[^"]+")/g,
22-
/@import\s*('[^']*'|"[^"]*")\s*source\((?<path>'[^']*'?|"[^"]*"?)/g,
22+
/@import\s*('[^']*'|"[^"]*")\s*(layer\([^)]+\)\s*)?source\((?<path>'[^']*'?|"[^"]*"?)/g,
2323
/@reference\s*('[^']*'|"[^"]*")\s*source\((?<path>'[^']*'?|"[^"]*"?)/g,
2424
/@tailwind\s*utilities\s*source\((?<path>'[^']*'?|"[^"]*"?)/g,
2525
)

Diff for: packages/vscode-tailwindcss/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- Show light color swatch from light-dark() functions ([#1199](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1199))
66
- Ignore comments when matching class attributes ([#1202](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1202))
7+
- Show source diagnostics when imports contain a layer ([#1204](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1204))
78

89
## 0.14.4
910

0 commit comments

Comments
 (0)