Fix matching behavior when config file isn’t in root

Author: thecrypticace

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

@@ -27,6 +27,13 @@ export interface ProjectConfig {
   /** The list of documents that are related to this project */
   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/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,
       }