Merge branch 'master' into v3

Author: bradlc

packages/tailwindcss-language-server/src/server.ts

@@ -240,13 +240,13 @@ async function createProjectService(
       let file = normalizePath(change.file)
 
       for (let ignorePattern of ignore) {
-        if (minimatch(file, ignorePattern)) {
+        if (minimatch(file, ignorePattern, { dot: true })) {
           continue
         }
       }
 
-      let isConfigFile = minimatch(file, `**/${CONFIG_FILE_GLOB}`)
-      let isPackageFile = minimatch(file, '**/package.json')
+      let isConfigFile = minimatch(file, `**/${CONFIG_FILE_GLOB}`, { dot: true })
+      let isPackageFile = minimatch(file, '**/package.json', { dot: true })
       let isDependency = state.dependencies && state.dependencies.includes(change.file)
 
       if (!isConfigFile && !isPackageFile && !isDependency) continue

packages/tailwindcss-language-server/src/util/resolveFrom.ts

@@ -6,9 +6,7 @@ function createResolver(options: Partial<ResolveOptions> = {}): Resolver {
     fileSystem: new CachedInputFileSystem(fs, 4000),
     useSyncFileSystemCalls: true,
     // cachePredicate: () => false,
-    exportsFields: [],
-    conditionNames: ['node'],
-    extensions: ['.js', '.json', '.node'],
+    conditionNames: ['node', 'require'],
     ...options,
   })
 }

packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts

@@ -9,10 +9,7 @@ export interface LanguageBoundaries {
   css: Range[]
 }
 
-export function getLanguageBoundaries(
-  state: State,
-  doc: TextDocument
-): LanguageBoundaries | null {
+export function getLanguageBoundaries(state: State, doc: TextDocument): LanguageBoundaries | null {
   if (isVueDoc(doc)) {
     let text = doc.getText()
     let blocks = findAll(
@@ -23,10 +20,7 @@ export function getLanguageBoundaries(
     let cssRanges: Range[] = []
     for (let i = 0; i < blocks.length; i++) {
       let range = {
-        start: indexToPosition(
-          text,
-          blocks[i].index + blocks[i].groups.open.length
-        ),
+        start: indexToPosition(text, blocks[i].index + blocks[i].groups.open.length),
         end: indexToPosition(
           text,
           blocks[i].index + blocks[i][0].length - blocks[i].groups.close.length
@@ -48,7 +42,7 @@ export function getLanguageBoundaries(
   if (isHtmlDoc(state, doc) || isJsDoc(state, doc) || isSvelteDoc(doc)) {
     let text = doc.getText()
     let styleBlocks = findAll(
-      /(?<open><style(?:\s[^>]*>|>)).*?(?<close><\/style>|$)/gis,
+      /(?<open><style(?:\s[^>]*[^\/]>|\s*>)).*?(?<close><\/style>|$)/gis,
       text
     )
     let htmlRanges: Range[] = []
@@ -61,15 +55,10 @@ export function getLanguageBoundaries(
         end: indexToPosition(text, styleBlocks[i].index),
       })
       cssRanges.push({
-        start: indexToPosition(
-          text,
-          styleBlocks[i].index + styleBlocks[i].groups.open.length
-        ),
+        start: indexToPosition(text, styleBlocks[i].index + styleBlocks[i].groups.open.length),
         end: indexToPosition(
           text,
-          styleBlocks[i].index +
-            styleBlocks[i][0].length -
-            styleBlocks[i].groups.close.length
+          styleBlocks[i].index + styleBlocks[i][0].length - styleBlocks[i].groups.close.length
         ),
       })
       currentIndex = styleBlocks[i].index + styleBlocks[i][0].length

packages/tailwindcss-language-service/src/util/html.ts

@@ -44,7 +44,7 @@ export function isInsideTag(str: string, tag: string | string[]): boolean {
   let close = 0
   let match: RegExpExecArray
   let tags = Array.isArray(tag) ? tag : [tag]
-  let regex = new RegExp(`<(?<slash>/?)(?:${tags.join('|')})\\b`, 'ig')
+  let regex = new RegExp(`<(?<slash>/?)(?:${tags.join('|')})(?:\\s[^>]*[^\/]>|\\s*>)`, 'ig')
   while ((match = regex.exec(str)) !== null) {
     if (match.groups.slash) {
       close += 1

packages/tailwindcss-language-service/src/util/languages.ts

@@ -24,6 +24,7 @@ export const htmlLanguages = [
   'mustache',
   'njk',
   'nunjucks',
+  'phoenix-heex',
   'php',
   'razor',
   'slim',

packages/vscode-tailwindcss/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.6.15
+
+- Support config files in hidden (dot) folders (#389)
+- Disable extension in virtual workspaces (#398)
+- Support `exports` fields when resolving dependencies (#412)
+- Add `phoenix-heex` language (#407)
+- Improve color parsing (#415)
+
 ## 0.6.14
 
 - Fix false positive error when using `theme` helper with a function value (thanks @choplin, #365)

packages/vscode-tailwindcss/package.json

@@ -5,7 +5,7 @@
   "preview": true,
   "author": "Brad Cornes <hello@bradley.dev>",
   "license": "MIT",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "homepage": "https://github.com/tailwindlabs/tailwindcss-intellisense",
   "bugs": {
     "url": "https://github.com/tailwindlabs/tailwindcss-intellisense/issues",
@@ -39,6 +39,9 @@
     "onStartupFinished"
   ],
   "main": "dist/extension/index.js",
+  "capabilities": {
+    "virtualWorkspaces": false
+  },
   "contributes": {
     "commands": [
       {