Fix matching files when config is not in the workspace root (#1412)

In IntelliSense we have this special behavior where if we only detect a
single config in a workspace then that config will cover files opened in
the entire workspace. We broke this accidentally in v0.14.16 because we
made sure document selectors were re-calculated correctly for v4
projects files. With how things are structured/shared this setup is the
same for v3 and v4 and we accidentally wiped out the "root" selector
we'd add to the project if it was the only one in a given workspace
folder.

So this isn't *usually* a problem but definitely can be if:
- You have a v3 project where the config file isn't in the root
- You have a v4 project where automatic source detection was disabled or
failed to run

This should hopefully fix any project matching issues people have had
that broke from v0.14.17 and later.

Fixes #1404 (and maybe #1377)

- [x] tests

Author: thecrypticace

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

@@ -22,10 +22,17 @@ export interface ProjectConfig {
   folder: string
 
   /** The path to the config file (if it exists) */
-  configPath?: string
+  configPath: string
 
   /** The list of documents that are related to this project */
-  documentSelector?: DocumentSelector[]
+  documentSelector: DocumentSelector[]
+
+  /**
+   * Additional selectors that should be matched with this project
+   *
+   * These are *never* reset
+   */
+  additionalSelectors: DocumentSelector[]
 
   /** Whether or not this project was explicitly defined by the user */
   isUserConfigured: boolean
@@ -65,7 +72,7 @@ export class ProjectLocator {
     }
 
     if (projects.length === 1) {
-      projects[0].documentSelector.push({
+      projects[0].additionalSelectors.push({
         pattern: normalizePath(path.join(this.base, '**')),
         priority: DocumentSelectorPriority.ROOT_DIRECTORY,
       })
@@ -85,6 +92,10 @@ export class ProjectLocator {
       for (let selector of project.documentSelector) {
         selector.pattern = normalizeDriveLetter(selector.pattern)
       }
+
+      for (let selector of project.additionalSelectors) {
+        selector.pattern = normalizeDriveLetter(selector.pattern)
+      }
     }
 
     return projects
@@ -132,6 +143,7 @@ export class ProjectLocator {
         priority: DocumentSelectorPriority.USER_CONFIGURED,
         pattern: selector,
       })),
+      additionalSelectors: [],
       tailwind,
     }
   }
@@ -214,6 +226,7 @@ export class ProjectLocator {
       isUserConfigured: false,
       configPath: config.path,
       documentSelector: selectors,
+      additionalSelectors: [],
       tailwind,
     }
   }

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

@@ -1174,7 +1174,7 @@ export async function createProjectService(
 
     state,
     documentSelector() {
-      return documentSelector
+      return [...documentSelector, ...projectConfig.additionalSelectors]
     },
     tryInit,
     async dispose() {

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

@@ -32,6 +32,7 @@ export interface TestConfig<Extras extends {}, TestInput extends Record<string,
   name: string
   inputs?: TestInput[]
 
+  skipNPM?: boolean
   fs?: Storage
   debug?: boolean
   prepare?(utils: TestUtils<TestInput>): Promise<Extras>
@@ -70,7 +71,10 @@ async function setup<T, I>(config: TestConfig<T, I>, input: I): Promise<TestUtil
 
   if (config.fs) {
     await prepareFileSystem(baseDir, config.fs)
-    await installDependencies(baseDir, config.fs)
+
+    if (!config.skipNPM) {
+      await installDependencies(baseDir, config.fs)
+    }
   }
 
   onTestFinished(async (ctx) => {

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

@@ -351,7 +351,7 @@ export class TW {
       return {
         folder: workspace.folder,
         config: workspace.config.path,
-        selectors: workspace.documentSelector,
+        selectors: [...workspace.documentSelector, ...workspace.additionalSelectors],
         user: workspace.isUserConfigured,
         tailwind: workspace.tailwind,
       }

packages/tailwindcss-language-server/tests/env/v4.test.js

@@ -856,3 +856,42 @@ defineTest({
     })
   },
 })
+
+defineTest({
+  name: 'Matches files in a workspace when only one config exists and is nested in a package',
+  skipNPM: true,
+  fs: {
+    'some-dir/package.json': json`{"type": "commonjs"}`,
+    'some-dir/tailwind.config.js': js`
+      module.exports = { content: [] }
+    `,
+  },
+  prepare: async ({ root }) => ({ client: await createClient({ root }) }),
+  handle: async ({ client }) => {
+    let doc = await client.open({
+      name: 'files/index.html',
+      lang: 'html',
+      text: html`<div class="bg-[#000]"></div>`,
+    })
+
+    // <div class="bg-[#000]"></div>
+    //             ^
+    let hover = await doc.hover({ line: 0, character: 13 })
+
+    expect(hover).toEqual({
+      contents: {
+        language: 'css',
+        value: dedent`
+          .bg-\[\#000\] {
+            --tw-bg-opacity: 1;
+            background-color: rgb(0 0 0 / var(--tw-bg-opacity, 1)) /* #000000 */;
+          }
+        `,
+      },
+      range: {
+        start: { line: 0, character: 12 },
+        end: { line: 0, character: 21 },
+      },
+    })
+  },
+})

packages/vscode-tailwindcss/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Prerelease
 
-- Nothing yet!
+- Fix matching files when config is not in the workspace root ([#1412](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1412))
 
 ## 0.14.21