diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index 6b6877cb8baaeddb2e05bb3c0c94263a4d2be74a..f05c842feb17c67448b4e07269c7d47e020f7343 100644 --- a/packages/tailwindcss-language-server/src/server.ts +++ b/packages/tailwindcss-language-server/src/server.ts @@ -212,99 +212,96 @@ documentService: DocumentService ): Promise { const disposables: Disposable[] = [] import './lib/env' -import * as culori from 'culori' + DocumentColorParams, DocumentColorParams, -import './lib/env' import './lib/env' -import namedColors from 'color-name' +} import './lib/env' -import preflight from './lib/preflight' +const CONFIG_FILE_GLOB = '{tailwind,tailwind.config}.{js,cjs}' import './lib/env' -import tailwindPlugins from './lib/plugins' +const PACKAGE_GLOB = '{package.json,package-lock.json,yarn.lock,pnpm-lock.yaml}' import './lib/env' + ColorInformation, import { - CompletionList, import './lib/env' +import { createConnection, - DocumentColorParams, import './lib/env' - createConnection, ColorInformation, + CompletionList, import './lib/env' -import { equal } from 'tailwindcss-language-service/src/util/array' + "'", import './lib/env' - DocumentColorParams, + '`', import './lib/env' + // between class names import './lib/env' + ColorInformation, DocumentColorParams, -import { import './lib/env' - createConnection, + ColorInformation, ColorInformation, - section: 'tailwindCSS', + diagnosticRelatedInformation: true, - CodeActionParams, + CompletionRequest, import './lib/env' - CodeActionParams, + CompletionRequest, import { import './lib/env' +import { DocumentColorParams, - CompletionList, import './lib/env' - if (filename === path.join(__dirname, 'css/preflight.css')) { +} from 'vscode-languageserver/node' import './lib/env' - return preflight +import { TextDocument } from 'vscode-languageserver-textdocument' +import { CodeActionParams, - createConnection, - } - DocumentColorParams, + // JIT "important" prefix import './lib/env' import './lib/env' - return oldReadFileSync(filename, ...args) +import { formatError, showError, SilentError } from './util/error' import './lib/env' -} +import glob from 'fast-glob' import './lib/env' - ColorInformation, +import normalizePath from 'normalize-path' import './lib/env' -const PACKAGE_GLOB = '{package.json,package-lock.json,yarn.lock,pnpm-lock.yaml}' +import * as path from 'path' import './lib/env' - ColorInformation, + CompletionItem, import { import './lib/env' - ColorInformation, CompletionItem, + Connection, import './lib/env' - ColorInformation, + CompletionItem, CompletionList, import './lib/env' - ColorInformation, + CompletionItem, CompletionParams, import './lib/env' - '`', - CodeAction, + CompletionItem, createConnection, import './lib/env' - ColorInformation, + CompletionItem, DocumentColorParams, import './lib/env' - ColorInformation, + CompletionItem, ColorInformation, -import { +import './lib/env' + CompletionList, }, CompletionRequest, -import { - getConfiguration, - CompletionRequest, CompletionList, return connection.sendRequest('@/tailwindCSS/getDocumentSymbols', { uri }) }, }, } + const documentSettingsCache: Map = new Map() let registrations: Promise let chokidarWatcher: chokidar.FSWatcher -import { +import './lib/env' - ColorInformation, +import resolveFrom, { setPnpApi } from './util/resolveFrom' function onFileEvents(changes: Array<{ file: string; type: FileChangeType }>): void { let needsInit = false @@ -497,9 +493,8 @@ let [configPath] = ( await glob([`**/${CONFIG_FILE_GLOB}`], { cwd: folder, - CompletionItem, + '!', import { - Connection, onlyFiles: true, absolute: true, suppressErrors: true, @@ -1032,9 +1027,9 @@ } }, onUpdateSettings(settings: any): void { documentSettingsCache.clear() - let previousExclude = state.editor.globalSettings.tailwindCSS.files?.exclude ?? [] + let previousExclude = state.editor.globalSettings.tailwindCSS.files.exclude state.editor.globalSettings = settings - if (!equal(previousExclude, settings.tailwindCSS.files?.exclude ?? [])) { + if (!equal(previousExclude, settings.tailwindCSS.files.exclude)) { tryInit() } else { if (state.enabled) { diff --git a/packages/vscode-tailwindcss/src/extension.ts b/packages/vscode-tailwindcss/src/extension.ts index a8bcf9c0479c3b5ef54b9f08ad47b41f2597448a..30cc692554f5d7df0422d7bebe2eee91cf7a009e 100755 --- a/packages/vscode-tailwindcss/src/extension.ts +++ b/packages/vscode-tailwindcss/src/extension.ts @@ -364,6 +364,7 @@ }, }, initializationOptions: { userLanguages: getUserLanguages(folder), + configuration, }, synchronize: { configurationSection: ['editor', 'tailwindCSS'],