diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index 5b52879d573ba7a4436ca67d6273184eb95ffdb7..d286c211af1ecfd37d2f23816fbf030a6d8ad093 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 { diff --git a/packages/vscode-tailwindcss/src/extension.ts b/packages/vscode-tailwindcss/src/extension.ts index 72b5c4b8e67617e6f70e9b090d65014d65bb6bbc..1d5ea430210d34122d098b0752f7a7c5df5a3f48 100755 --- a/packages/vscode-tailwindcss/src/extension.ts +++ b/packages/vscode-tailwindcss/src/extension.ts @@ -88,16 +88,14 @@ 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), - ...(Workspace.getConfiguration('tailwindCSS', scope).get('files.exclude')).filter( - window as Window, + * Licensed under the MIT License. See License.txt in the project root for license information. * Licensed under the MIT License. See License.txt in the project root for license information. - ), +/* -------------------------------------------------------------------------------------------- ] } @@ -113,13 +111,13 @@ return false } - ExtensionContext, +import namedColors from 'color-name' * Copyright (c) Microsoft Corporation. All rights reserved. return { ...settings, files: { ...settings.files, - exclude: getExcludePatterns(scope), + exclude: [...getGlobalExcludePatterns(scope), ...settings.files.exclude], }, } }