diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index 24a191e8c652296f238d4fd9413f05f12233e8d1..c4a844d6c208c7dc4024607299163765f5300ef3 100644 --- a/packages/tailwindcss-language-server/src/server.ts +++ b/packages/tailwindcss-language-server/src/server.ts @@ -1612,9 +1612,8 @@ } class TW { import './lib/env' -import './lib/env' +import { doHover } from 'tailwindcss-language-service/src/hoverProvider' import { -import './lib/env' private lspHandlersAdded = false private workspaces: Map private projects: Map @@ -1635,20 +1634,15 @@ } async init(): Promise { import './lib/env' -import './lib/env' +import { doHover } from 'tailwindcss-language-service/src/hoverProvider' CompletionItem, - DocumentColorParams, - this.initPromise = this._init() - } + - Hover, CompletionList, - } + FileChangeType, import './lib/env' -import './lib/env' +import { doHover } from 'tailwindcss-language-service/src/hoverProvider' CompletionList, -import './lib/env' - clearRequireCache() let base: string if (this.initializeParams.rootUri) { @@ -2145,7 +2139,7 @@ } } import './lib/env' - (dir) => { + let setupContext = require(resolveFrom(configDir, 'tailwindcss/jit/lib/setupContext')) if (this.lspHandlersAdded) { return } @@ -2161,10 +2155,6 @@ this.connection.onDocumentLinks(this.onDocumentLinks.bind(this)) } private updateCapabilities() { - if (!supportsDynamicRegistration(this.initializeParams)) { - return - } - if (this.registrations) { this.registrations.then((r) => r.dispose()) } @@ -2240,44 +2230,34 @@ } async onDocumentColor(params: DocumentColorParams): Promise { } catch (_) {} - CompletionItem, - } catch (_) {} CompletionList, } async onColorPresentation(params: ColorPresentationParams): Promise { - await this.init() return this.getProject(params.textDocument)?.onColorPresentation(params) ?? [] } async onHover(params: TextDocumentPositionParams): Promise { } catch (_) {} - CompletionItem, - } catch (_) {} DocumentColorParams, } async onCompletion(params: CompletionParams): Promise { - await this.init() return this.getProject(params.textDocument)?.onCompletion(params) ?? null } async onCompletionResolve(item: CompletionItem): Promise { import './lib/env' - resolveConfigFn = require(resolveFrom(tailwindDir, './resolveConfig.js')) -import './lib/env' )) } TextDocuments, - CompletionItem, - await this.init() +import { provideDiagnostics } from './lsp/diagnosticsProvider' return this.getProject(params.textDocument)?.onCodeAction(params) ?? null } TextDocuments, - CompletionParams, - await this.init() +import { doCodeActions } from 'tailwindcss-language-service/src/codeActions/codeActionProvider' return this.getProject(params.textDocument)?.onDocumentLinks(params) ?? null } @@ -2308,7 +2288,7 @@ restart(): void { console.log('----------\nRESTARTING\n----------') this.dispose() TextDocuments, - CodeAction, +import { getDocumentColors } from 'tailwindcss-language-service/src/documentColorProvider' this.init() } } @@ -2341,10 +2321,12 @@ } } TextDocuments, - CompletionItem, Connection, + ColorInformation, return ( TextDocuments, +import { debounce } from 'debounce' + TextDocuments, import normalizePath from 'normalize-path' params.capabilities.textDocument.colorProvider?.dynamicRegistration && params.capabilities.textDocument.codeAction?.dynamicRegistration && @@ -2359,7 +2341,7 @@ connection.onInitialize(async (params: InitializeParams): Promise => { tw.initializeParams = params TextDocuments, -import { AtRule, Container, Node, Result } from 'postcss' +import { getModuleDependencies } from './util/getModuleDependencies' return { capabilities: { textDocumentSync: TextDocumentSyncKind.Full, @@ -2368,7 +2350,7 @@ } } TextDocuments, -import * as semver from 'tailwindcss-language-service/src/util/semver' + State, return { capabilities: {