Compute correct document selectors when a project is initialized

Author: thecrypticace

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

@@ -799,10 +799,19 @@ export async function calculateDocumnetSelectors(
   entry: ConfigEntry,
   features: Feature[],
   resolver: Resolver,
+  existing?: DocumentSelector[],
   actualConfig?: any,
 ) {
   let selectors = []
 
+  for (let selector of existing ?? []) {
+    if (selector.priority === DocumentSelectorPriority.CONTENT_FILE) {
+      continue
+    }
+
+    selectors.push(selector)
+  }
+
   for await (let selector of contentSelectorsFromConfig(entry, features, resolver, actualConfig)) {
     selectors.push(selector)
   }

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

@@ -80,7 +80,7 @@ import {
   normalizeDriveLetter,
 } from './utils'
 import type { DocumentService } from './documents'
-import type { ProjectConfig } from './project-locator'
+import { calculateDocumnetSelectors, type ProjectConfig } from './project-locator'
 import { supportedFeatures } from '@tailwindcss/language-service/src/features'
 import { loadDesignSystem } from './util/v4'
 import { readCssFile } from './util/css'
@@ -286,7 +286,9 @@ export async function createProjectService(
     )
   }
 
-  function onFileEvents(changes: Array<{ file: string; type: FileChangeType }>): void {
+  async function onFileEvents(
+    changes: Array<{ file: string; type: FileChangeType }>,
+  ): Promise<void> {
     let needsInit = false
     let needsRebuild = false
 
@@ -307,16 +309,12 @@ export async function createProjectService(
           projectConfig.configPath &&
           (isConfigFile || isDependency)
         ) {
-          documentSelector = [
-            ...documentSelector.filter(
-              ({ priority }) => priority !== DocumentSelectorPriority.CONTENT_FILE,
-            ),
-            ...getContentDocumentSelectorFromConfigFile(
-              projectConfig.configPath,
-              initialTailwindVersion,
-              projectConfig.folder,
-            ),
-          ]
+          documentSelector = await calculateDocumnetSelectors(
+            projectConfig.config,
+            state.features,
+            resolver,
+            documentSelector,
+          )
 
           checkOpenDocuments()
         }
@@ -963,17 +961,13 @@ export async function createProjectService(
 
     /////////////////////
     if (!projectConfig.isUserConfigured) {
-      documentSelector = [
-        ...documentSelector.filter(
-          ({ priority }) => priority !== DocumentSelectorPriority.CONTENT_FILE,
-        ),
-        ...getContentDocumentSelectorFromConfigFile(
-          state.configPath,
-          tailwindcss.version,
-          projectConfig.folder,
-          originalConfig,
-        ),
-      ]
+      documentSelector = await calculateDocumnetSelectors(
+        projectConfig.config,
+        state.features,
+        resolver,
+        documentSelector,
+        originalConfig,
+      )
     }
     //////////////////////