Merge branch 'main' into junepil/main

Author: thecrypticace

.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+name: Run Tests
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [18, 20, 22, 24]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+    name: Run Tests - Node v${{ matrix.node }} / ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          cache: 'pnpm'
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Run tests
+        run: |
+          cd packages/tailwindcss-language-server &&
+          pnpm run build &&
+          pnpm run test

.vscode/launch.json

@@ -7,7 +7,15 @@
       "request": "launch",
       "name": "Launch Client",
       "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-tailwindcss"],
+      "args": [
+        // enable this flag if you want to activate the extension only when you are debugging the extension
+        // "--disable-extensions",
+        "--disable-updates",
+        "--disable-workspace-trust",
+        "--skip-release-notes",
+        "--skip-welcome",
+        "--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-tailwindcss"
+      ],
       "stopOnEntry": false,
       "sourceMaps": true,
       "outFiles": ["${workspaceRoot}/packages/vscode-tailwindcss/dist/**/*.js"],

.vscode/tasks.json

@@ -23,6 +23,9 @@
         "panel": "dedicated",
         "reveal": "never"
       },
+      "options": {
+        "cwd": "${workspaceFolder}/packages/vscode-tailwindcss"
+      },
       "problemMatcher": ["$tsc-watch"]
     }
   ]

packages/tailwindcss-language-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/language-server",
-  "version": "0.14.9",
+  "version": "0.14.16",
   "description": "Tailwind CSS Language Server",
   "license": "MIT",
   "repository": {
@@ -34,14 +34,23 @@
     "access": "public"
   },
   "devDependencies": {
-    "@parcel/watcher": "2.0.3",
+    "@parcel/watcher": "2.5.1",
+    "@parcel/watcher-darwin-x64": "2.5.1",
+    "@parcel/watcher-darwin-arm64": "2.5.1",
+    "@parcel/watcher-win32-x64": "2.5.1",
+    "@parcel/watcher-win32-arm64": "2.5.1",
+    "@parcel/watcher-linux-x64-glibc": "2.5.1",
+    "@parcel/watcher-linux-x64-musl": "2.5.1",
+    "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+    "@parcel/watcher-linux-arm64-musl": "2.5.1",
     "@tailwindcss/aspect-ratio": "0.4.2",
     "@tailwindcss/container-queries": "0.1.0",
     "@tailwindcss/forms": "0.5.3",
     "@tailwindcss/language-service": "workspace:*",
     "@tailwindcss/line-clamp": "0.4.2",
-    "@tailwindcss/oxide": "^4.0.0-alpha.19",
+    "@tailwindcss/oxide": "^4.1.0",
     "@tailwindcss/typography": "0.5.7",
+    "@types/braces": "3.0.1",
     "@types/color-name": "^1.1.3",
     "@types/culori": "^2.1.0",
     "@types/debounce": "1.2.0",
@@ -66,7 +75,6 @@
     "dset": "3.1.4",
     "enhanced-resolve": "^5.16.1",
     "esbuild": "^0.25.0",
-    "fast-glob": "3.2.4",
     "find-up": "5.0.0",
     "jiti": "^2.3.3",
     "klona": "2.0.4",
@@ -83,18 +91,19 @@
     "rimraf": "3.0.2",
     "stack-trace": "0.0.10",
     "tailwindcss": "3.4.17",
-    "tailwindcss-v4": "npm:tailwindcss@4.0.6",
+    "tailwindcss-v4": "npm:tailwindcss@4.1.1",
+    "tinyglobby": "^0.2.12",
     "tsconfck": "^3.1.4",
     "tsconfig-paths": "^4.2.0",
     "typescript": "5.3.3",
     "vite-tsconfig-paths": "^4.3.1",
-    "vitest": "^1.6.1",
-    "vscode-css-languageservice": "6.2.9",
+    "vitest": "^3.0.9",
+    "vscode-css-languageservice": "6.3.3",
     "vscode-jsonrpc": "8.2.0",
     "vscode-languageclient": "8.1.0",
     "vscode-languageserver": "8.1.0",
     "vscode-languageserver-protocol": "^3.17.5",
-    "vscode-languageserver-textdocument": "1.0.11",
+    "vscode-languageserver-textdocument": "1.0.12",
     "vscode-uri": "3.0.2"
   },
   "engines": {

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

@@ -1,47 +1,16 @@
 import merge from 'deepmerge'
 import { isObject } from './utils'
-import type { Settings } from '@tailwindcss/language-service/src/util/state'
+import {
+  getDefaultTailwindSettings,
+  type Settings,
+} from '@tailwindcss/language-service/src/util/state'
 import type { Connection } from 'vscode-languageserver'
 
 export interface SettingsCache {
   get(uri?: string): Promise<Settings>
   clear(): void
 }
 
-function getDefaultSettings(): Settings {
-  return {
-    editor: { tabSize: 2 },
-    tailwindCSS: {
-      inspectPort: null,
-      emmetCompletions: false,
-      classAttributes: ['class', 'className', 'ngClass', 'class:list'],
-      codeActions: true,
-      hovers: true,
-      suggestions: true,
-      validate: true,
-      colorDecorators: true,
-      rootFontSize: 16,
-      lint: {
-        cssConflict: 'warning',
-        invalidApply: 'error',
-        invalidScreen: 'error',
-        invalidVariant: 'error',
-        invalidConfigPath: 'error',
-        invalidTailwindDirective: 'error',
-        invalidSourceDirective: 'error',
-        recommendedVariantOrder: 'warning',
-      },
-      showPixelEquivalents: true,
-      includeLanguages: {},
-      files: { exclude: ['**/.git/**', '**/node_modules/**', '**/.hg/**', '**/.svn/**'] },
-      experimental: {
-        classRegex: [],
-        configFile: null,
-      },
-    },
-  }
-}
-
 export function createSettingsCache(connection: Connection): SettingsCache {
   const cache: Map<string, Settings> = new Map()
 
@@ -73,7 +42,7 @@ export function createSettingsCache(connection: Connection): SettingsCache {
     tailwindCSS = isObject(tailwindCSS) ? tailwindCSS : {}
 
     return merge<Settings>(
-      getDefaultSettings(),
+      getDefaultTailwindSettings(),
       { editor, tailwindCSS },
       { arrayMerge: (_destinationArray, sourceArray, _options) => sourceArray },
     )

packages/tailwindcss-language-server/src/css/extract-source-directives.ts

@@ -1,12 +1,21 @@
 import type { Plugin } from 'postcss'
+import type { SourcePattern } from '../project-locator'
 
-export function extractSourceDirectives(sources: string[]): Plugin {
+export function extractSourceDirectives(sources: SourcePattern[]): Plugin {
   return {
     postcssPlugin: 'extract-at-rules',
     AtRule: {
       source: ({ params }) => {
+        let negated = /^not\s+/.test(params)
+
+        if (negated) params = params.slice(4).trimStart()
+
         if (params[0] !== '"' && params[0] !== "'") return
-        sources.push(params.slice(1, -1))
+
+        sources.push({
+          pattern: params.slice(1, -1),
+          negated,
+        })
       },
     },
   }

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

@@ -13,7 +13,7 @@ import {
   CompletionItemKind,
   Connection,
 } from 'vscode-languageserver/node'
-import { TextDocument } from 'vscode-languageserver-textdocument'
+import { Position, TextDocument } from 'vscode-languageserver-textdocument'
 import { Utils, URI } from 'vscode-uri'
 import { getLanguageModelCache } from './languageModelCache'
 import { Stylesheet } from 'vscode-css-languageservice'
@@ -121,6 +121,7 @@ export class CssServer {
     async function withDocumentAndSettings<T>(
       uri: string,
       callback: (result: {
+        original: TextDocument
         document: TextDocument
         settings: LanguageSettings | undefined
       }) => T | Promise<T>,
@@ -130,13 +131,64 @@ export class CssServer {
         return null
       }
       return await callback({
+        original: document,
         document: createVirtualCssDocument(document),
         settings: await getDocumentSettings(document),
       })
     }
 
+    function isInImportDirective(doc: TextDocument, pos: Position) {
+      let text = doc.getText({
+        start: { line: pos.line, character: 0 },
+        end: pos,
+      })
+
+      // Scan backwards to see if we're inside an `@import` directive
+      let foundImport = false
+      let foundDirective = false
+
+      for (let i = text.length - 1; i >= 0; i--) {
+        let char = text[i]
+        if (char === '\n') break
+
+        if (char === '(' && !foundDirective) {
+          if (text.startsWith(' source(', i - 7)) {
+            foundDirective = true
+          }
+
+          //
+          else if (text.startsWith(' theme(', i - 6)) {
+            foundDirective = true
+          }
+
+          //
+          else if (text.startsWith(' prefix(', i - 7)) {
+            foundDirective = true
+          }
+        }
+
+        //
+        else if (char === '@' && !foundImport) {
+          if (text.startsWith('@import ', i)) {
+            foundImport = true
+          }
+        }
+      }
+
+      return foundImport && foundDirective
+    }
+
     connection.onCompletion(async ({ textDocument, position }, _token) =>
-      withDocumentAndSettings(textDocument.uri, async ({ document, settings }) => {
+      withDocumentAndSettings(textDocument.uri, async ({ original, document, settings }) => {
+        // If we're inside source(…), prefix(…), or theme(…), don't show
+        // completions from the CSS language server
+        if (isInImportDirective(original, position)) {
+          return {
+            isIncomplete: false,
+            items: [],
+          }
+        }
+
         let result = await cssLanguageService.doComplete2(
           document,
           position,