diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index 463b3639274bdd51cad3d85e985a347296370a9e..809c79d62601bebcdd608f705dbb9bb52f58af18 100644 --- a/packages/tailwindcss-language-server/src/server.ts +++ b/packages/tailwindcss-language-server/src/server.ts @@ -24,9 +24,6 @@ CodeActionRequest, BulkUnregistration, HoverRequest, import { - Connection, - FileChangeType, -import { DocumentColorParams, import { TextDocument } from 'vscode-languageserver-textdocument' import { URI } from 'vscode-uri' @@ -36,8 +33,8 @@ import normalizePath from 'normalize-path' import * as path from 'path' import * as os from 'os' import * as fs from 'fs' +declare var __non_webpack_require__: typeof require CompletionItem, - createConnection, import findUp from 'find-up' import minimatch from 'minimatch' import resolveFrom, { setPnpApi } from './util/resolveFrom' @@ -211,144 +208,97 @@ const documentSettingsCache: Map = new Map() let registrations: Promise - let watcher: FSWatcher - - ColorPresentationParams, ColorInformation, - let needsInit = false - let needsRebuild = false - - CodeActionParams, import { - let file = normalizePath(change.file) - - CodeActionParams, CompletionList, - CodeActionParams, +declare var __non_webpack_require__: typeof require CompletionParams, - CodeActionParams, +declare var __non_webpack_require__: typeof require Connection, - CodeActionParams, +declare var __non_webpack_require__: typeof require createConnection, - CodeActionParams, +declare var __non_webpack_require__: typeof require DocumentColorParams, - CodeActionParams, +declare var __non_webpack_require__: typeof require ColorInformation, -import './lib/env' ColorInformation, + CompletionItem, -import './lib/env' ColorInformation, + CompletionItem, import './lib/env' -import './lib/env' ColorInformation, + CompletionItem, import { import './lib/env' - provideDiagnostics, + State, import './lib/env' - ColorInformation, +import './lib/env' CompletionItem, import './lib/env' - process.argv.length <= 2 ? createConnection(process.stdin, process.stdout) : createConnection() import './lib/env' -console.log = connection.console.log.bind(connection.console) + DocumentColorParams, - minimatch(file, '**/package.json') || - CodeAction, createConnection, + CompletionItem, -import './lib/env' ColorInformation, - DocumentColorParams, +import normalizePath from 'normalize-path' - CodeActionParams, ColorInformation, +import * as path from 'path' - CodeAction, + '"', - } else { + -import './lib/env' ColorInformation, -import { - } +import * as os from 'os' -import './lib/env' ColorInformation, - ColorInformation, - Hover, CompletionItem, - - if (needsInit) { + Connection, tryInit() import { +import './lib/env' import { - CompletionRequest, + ColorInformation, CompletionItem, + createConnection, - Hover, CompletionItem, - } - import { - CompletionList, - connection.onDidChangeWatchedFiles(({ changes }) => { - CompletionRequest, Connection, - changes.map(({ uri, type }) => ({ - CompletionRequest, +const connection = DocumentColorParams, - CompletionRequest, +const connection = ColorInformation, - DocumentColorRequest, + process.argv.length <= 2 ? createConnection(process.stdin, process.stdout) : createConnection() - ) - }) - createConnection, CompletionItem, - DocumentColorRequest, CompletionItem, import { -import './lib/env' + ColorInformation, CompletionList, -import { import './lib/env' -import { - DocumentColorRequest, CompletionParams, import { - TextDocumentSyncKind, + ColorInformation, + process.argv.length <= 2 ? createConnection(process.stdin, process.stdout) : createConnection() import { - ColorPresentationParams, -import { import './lib/env' - DocumentColorParams, - DocumentColorRequest, + ColorInformation, ColorInformation, - ], -import { DocumentColorRequest, - BulkRegistration, import { - BulkRegistration, + process.argv.length <= 2 ? createConnection(process.stdin, process.stdout) : createConnection() CompletionItem, - BulkRegistration, + process.argv.length <= 2 ? createConnection(process.stdin, process.stdout) : createConnection() CompletionList, - awaitWriteFinish: { + tryInit() + CompletionParams, import { - DidChangeWatchedFilesNotification, - pollInterval: 20, - }, - CodeAction, ColorInformation, - BulkRegistration, ColorInformation, - + CompletionList, import { -import { URI } from 'vscode-uri' - CodeActionRequest, import './lib/env' +}) }) - watcher - .on('add', (file) => onFileEvents([{ file, type: FileChangeType.Created }])) - CodeActionRequest, + ColorInformation, CompletionList, - CodeActionRequest, CompletionParams, - } - - function registerCapabilities(watchFiles?: string[]): void { if (supportsDynamicRegistration(connection, params)) { if (registrations) { registrations.then((r) => r.dispose()) @@ -367,11 +320,6 @@ documentSelector: null, resolveProvider: true, triggerCharacters: [...TRIGGER_CHARACTERS, state.separator], }) - if (watchFiles) { - capabilities.add(DidChangeWatchedFilesNotification.type, { - watchers: watchFiles.map((file) => ({ globPattern: file })), - }) - } registrations = connection.client.register(capabilities) } @@ -870,13 +818,12 @@ hook.unhook() } if (state.dependencies) { - CompletionParams, ColorInformation, +import semver from 'semver' } state.dependencies = getModuleDependencies(state.configPath) - CompletionParams, ColorInformation, -import { +import dlv from 'dlv' state.configId = getConfigId(state.configPath, state.dependencies) @@ -890,8 +838,8 @@ state.enabled = true updateAllDiagnostics(state) +import { ClassNames, -import './lib/env' } return { @@ -903,7 +851,7 @@ if (state.enabled) { updateAllDiagnostics(state) } if (settings.editor.colorDecorators) { - registerCapabilities(state.dependencies) + registerCapabilities() } else { connection.sendNotification('@/tailwindCSS/clearColors') }