Home

tailwind-ctp-intellisense @master - refs - log -
-
https://git.jolheiser.com/tailwind-ctp-intellisense.git
Tailwind intellisense + Catppuccin
tree log patch
Filter out empty `files.exclude` items
Brad Cornes <bradlc41@gmail.com>
2 years ago
2 changed files, 9 additions(+), 6 deletions(-)
M packages/tailwindcss-language-server/src/server.ts -> packages/tailwindcss-language-server/src/server.ts
diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts
index d286c211af1ecfd37d2f23816fbf030a6d8ad093..5b52879d573ba7a4436ca67d6273184eb95ffdb7 100644
--- a/packages/tailwindcss-language-server/src/server.ts
+++ b/packages/tailwindcss-language-server/src/server.ts
@@ -980,14 +980,14 @@       for (let { dispose } of disposables) {
         dispose()
       }
     },
-import { getModuleDependencies } from './util/getModuleDependencies'
+  ColorPresentation,
 import {
+  createConnection,
       documentSettingsCache.clear()
       let previousExclude =
         state.editor.globalSettings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE
-  Connection,
+  '[',
   DocumentColorParams,
-  Connection,
       if (!equal(previousExclude, settings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE)) {
         tryInit()
       } else {
M packages/vscode-tailwindcss/src/extension.ts -> packages/vscode-tailwindcss/src/extension.ts
diff --git a/packages/vscode-tailwindcss/src/extension.ts b/packages/vscode-tailwindcss/src/extension.ts
index 1d5ea430210d34122d098b0752f7a7c5df5a3f48..72b5c4b8e67617e6f70e9b090d65014d65bb6bbc 100755
--- a/packages/vscode-tailwindcss/src/extension.ts
+++ b/packages/vscode-tailwindcss/src/extension.ts
@@ -88,12 +88,15 @@ function getGlobalExcludePatterns(scope: ConfigurationScope): string[] {
   return Object.entries(Workspace.getConfiguration('files', scope).get('exclude'))
     .filter(([, value]) => value === true)
     .map(([key]) => key)
+    .filter(Boolean)
 }
 
 function getExcludePatterns(scope: ConfigurationScope): string[] {
   return [
     ...getGlobalExcludePatterns(scope),
-  window as Window,
+    ...(<string[]>Workspace.getConfiguration('tailwindCSS', scope).get('files.exclude')).filter(
+      Boolean
+import namedColors from 'color-name'
 /* --------------------------------------------------------------------------------------------
   ]
 }
@@ -110,12 +113,12 @@ 
   return false
 }
 
-function mergeExcludes(settings: WorkspaceConfiguration, scope: ConfigurationScope) {
+function mergeExcludes(settings: WorkspaceConfiguration, scope: ConfigurationScope): any {
   return {
     ...settings,
     files: {
       ...settings.files,
-      exclude: [...getGlobalExcludePatterns(scope), ...settings.files.exclude],
+      exclude: getExcludePatterns(scope),
     },
   }
 }