diff --git a/packages/tailwindcss-language-server/src/lsp/diagnosticsProvider.ts b/packages/tailwindcss-language-server/src/lsp/diagnosticsProvider.ts index fe08b24..164a3c9 100644 --- a/packages/tailwindcss-language-server/src/lsp/diagnosticsProvider.ts +++ b/packages/tailwindcss-language-server/src/lsp/diagnosticsProvider.ts @@ -1,4 +1,4 @@ -import { TextDocument } from 'vscode-languageserver/node' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { State } from 'tailwindcss-language-service/src/util/state' import { doValidate } from 'tailwindcss-language-service/src/diagnostics/diagnosticsProvider' import isExcluded from '../util/isExcluded' diff --git a/packages/tailwindcss-language-server/src/util/isExcluded.ts b/packages/tailwindcss-language-server/src/util/isExcluded.ts index 80ce605..7ae954d 100644 --- a/packages/tailwindcss-language-server/src/util/isExcluded.ts +++ b/packages/tailwindcss-language-server/src/util/isExcluded.ts @@ -1,7 +1,7 @@ import minimatch from 'minimatch' import * as path from 'path' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { State } from 'tailwindcss-language-service/src/util/state' -import { TextDocument } from 'vscode-languageserver-textdocument' import { getFileFsPath } from './uri' export default async function isExcluded( diff --git a/packages/tailwindcss-language-service/src/codeActions/codeActionProvider.ts b/packages/tailwindcss-language-service/src/codeActions/codeActionProvider.ts index 2a87d2f..e59e21d 100644 --- a/packages/tailwindcss-language-service/src/codeActions/codeActionProvider.ts +++ b/packages/tailwindcss-language-service/src/codeActions/codeActionProvider.ts @@ -1,4 +1,5 @@ import type { CodeAction, CodeActionParams } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { State } from '../util/state' import { doValidate } from '../diagnostics/diagnosticsProvider' import { rangesEqual } from '../util/rangesEqual' @@ -17,7 +18,6 @@ import { flatten, dedupeBy } from '../util/array' import { provideCssConflictCodeActions } from './provideCssConflictCodeActions' import { provideInvalidApplyCodeActions } from './provideInvalidApplyCodeActions' import { provideSuggestionCodeActions } from './provideSuggestionCodeActions' -import { TextDocument } from 'vscode-languageserver-textdocument' async function getDiagnosticsFromCodeActionParams( state: State, diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index 86bb582..a6dce52 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -5,10 +5,10 @@ import type { Range, MarkupKind, CompletionList, - TextDocument, Position, CompletionContext, } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import dlv from 'dlv' import removeMeta from './util/removeMeta' import { getColor, getColorFromValue } from './util/color' diff --git a/packages/tailwindcss-language-service/src/diagnostics/diagnosticsProvider.ts b/packages/tailwindcss-language-service/src/diagnostics/diagnosticsProvider.ts index a8d7f7d..c8f993e 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/diagnosticsProvider.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/diagnosticsProvider.ts @@ -1,4 +1,4 @@ -import type { TextDocument } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { State } from '../util/state' import { DiagnosticKind, AugmentedDiagnostic } from './types' import { getCssConflictDiagnostics } from './getCssConflictDiagnostics' diff --git a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts index 7ee3f84..a531af0 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts @@ -1,6 +1,5 @@ import { joinWithAnd } from '../util/joinWithAnd' import { State, Settings } from '../util/state' -import type { TextDocument } from 'vscode-languageserver' import { CssConflictDiagnostic, DiagnosticKind } from './types' import { findClassListsInDocument, getClassNamesInClassList } from '../util/find' import { getClassNameDecls } from '../util/getClassNameDecls' @@ -8,6 +7,7 @@ import { getClassNameMeta } from '../util/getClassNameMeta' import { equal } from '../util/array' import * as jit from '../util/jit' import type { AtRule, Node, Rule } from 'postcss' +import type { TextDocument } from 'vscode-languageserver-textdocument' function isCustomProperty(property: string): boolean { return property.startsWith('--') diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts index 9af198b..75821cd 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts @@ -1,7 +1,8 @@ +import type { TextDocument } from 'vscode-languageserver-textdocument' import { findClassNamesInRange } from '../util/find' import { InvalidApplyDiagnostic, DiagnosticKind } from './types' import { Settings, State } from '../util/state' -import type { TextDocument, DiagnosticSeverity } from 'vscode-languageserver' +import type { DiagnosticSeverity } from 'vscode-languageserver' import { validateApply } from '../util/validateApply' export async function getInvalidApplyDiagnostics( diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts index 0af3683..27fc4ca 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts @@ -1,5 +1,4 @@ import { State, Settings } from '../util/state' -import type { TextDocument } from 'vscode-languageserver' import { InvalidConfigPathDiagnostic, DiagnosticKind } from './types' import { findHelperFunctionsInDocument } from '../util/find' import { stringToPath } from '../util/stringToPath' @@ -7,6 +6,7 @@ import isObject from '../util/isObject' import { closest } from '../util/closest' import { combinations } from '../util/combinations' import dlv from 'dlv' +import type { TextDocument } from 'vscode-languageserver-textdocument' function pathToString(path: string | string[]): string { if (typeof path === 'string') return path diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts index c9a9a75..cb9717c 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts @@ -1,5 +1,6 @@ import { State, Settings } from '../util/state' -import type { TextDocument, Range, DiagnosticSeverity } from 'vscode-languageserver' +import type { Range, DiagnosticSeverity } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { InvalidScreenDiagnostic, DiagnosticKind } from './types' import { isCssDoc } from '../util/css' import { getLanguageBoundaries } from '../util/getLanguageBoundaries' diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts index 307c1f4..635d451 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts @@ -1,5 +1,6 @@ import { State, Settings } from '../util/state' -import type { TextDocument, Range, DiagnosticSeverity } from 'vscode-languageserver' +import type { Range, DiagnosticSeverity } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { InvalidTailwindDirectiveDiagnostic, DiagnosticKind } from './types' import { isCssDoc } from '../util/css' import { getLanguageBoundaries } from '../util/getLanguageBoundaries' diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts index 1f2a46e..f4be518 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts @@ -1,5 +1,6 @@ import { State, Settings } from '../util/state' -import type { TextDocument, Range, DiagnosticSeverity } from 'vscode-languageserver' +import type { Range, DiagnosticSeverity } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { InvalidVariantDiagnostic, DiagnosticKind } from './types' import { isCssDoc } from '../util/css' import { getLanguageBoundaries } from '../util/getLanguageBoundaries' diff --git a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts index f1088e5..82385d9 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts @@ -1,5 +1,5 @@ +import type { TextDocument } from 'vscode-languageserver-textdocument' import { State, Settings } from '../util/state' -import type { TextDocument } from 'vscode-languageserver' import { RecommendedVariantOrderDiagnostic, DiagnosticKind } from './types' import { findClassListsInDocument, getClassNamesInClassList } from '../util/find' import * as jit from '../util/jit' diff --git a/packages/tailwindcss-language-service/src/documentColorProvider.ts b/packages/tailwindcss-language-service/src/documentColorProvider.ts index 071580e..4af8e42 100644 --- a/packages/tailwindcss-language-service/src/documentColorProvider.ts +++ b/packages/tailwindcss-language-service/src/documentColorProvider.ts @@ -6,7 +6,8 @@ import { } from './util/find' import { getColor, getColorFromValue, culoriColorToVscodeColor } from './util/color' import { stringToPath } from './util/stringToPath' -import type { TextDocument, ColorInformation } from 'vscode-languageserver' +import type { ColorInformation } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import dlv from 'dlv' import { dedupeByRange } from './util/array' diff --git a/packages/tailwindcss-language-service/src/documentLinksProvider.ts b/packages/tailwindcss-language-service/src/documentLinksProvider.ts index 987acbf..b2dedd5 100644 --- a/packages/tailwindcss-language-service/src/documentLinksProvider.ts +++ b/packages/tailwindcss-language-service/src/documentLinksProvider.ts @@ -1,5 +1,6 @@ +import type { TextDocument } from 'vscode-languageserver-textdocument' import { State } from './util/state' -import type { DocumentLink, Range, TextDocument } from 'vscode-languageserver' +import type { DocumentLink, Range } from 'vscode-languageserver' import { isCssDoc } from './util/css' import { getLanguageBoundaries } from './util/getLanguageBoundaries' import { findAll, indexToPosition } from './util/find' diff --git a/packages/tailwindcss-language-service/src/hoverProvider.ts b/packages/tailwindcss-language-service/src/hoverProvider.ts index f506bb2..ffa7567 100644 --- a/packages/tailwindcss-language-service/src/hoverProvider.ts +++ b/packages/tailwindcss-language-service/src/hoverProvider.ts @@ -1,5 +1,5 @@ import { State } from './util/state' -import type { Hover, TextDocument, Position } from 'vscode-languageserver' +import type { Hover, Position } from 'vscode-languageserver' import { stringifyCss, stringifyConfigValue } from './util/stringify' import dlv from 'dlv' import { isCssContext } from './util/css' @@ -9,6 +9,7 @@ import { getClassNameParts } from './util/getClassNameAtPosition' import * as jit from './util/jit' import { validateConfigPath } from './diagnostics/getInvalidConfigPathDiagnostics' import { isWithinRange } from './util/isWithinRange' +import type { TextDocument } from 'vscode-languageserver-textdocument' export async function doHover( state: State, diff --git a/packages/tailwindcss-language-service/src/util/css.ts b/packages/tailwindcss-language-service/src/util/css.ts index a515ce1..c4e76cb 100644 --- a/packages/tailwindcss-language-service/src/util/css.ts +++ b/packages/tailwindcss-language-service/src/util/css.ts @@ -1,4 +1,5 @@ -import type { TextDocument, Position } from 'vscode-languageserver' +import type { Position } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { isVueDoc, isSvelteDoc, isHtmlDoc } from './html' import { isJsDoc } from './js' import { State } from './state' diff --git a/packages/tailwindcss-language-service/src/util/doc.ts b/packages/tailwindcss-language-service/src/util/doc.ts index 7c291ff..1036a65 100644 --- a/packages/tailwindcss-language-service/src/util/doc.ts +++ b/packages/tailwindcss-language-service/src/util/doc.ts @@ -1,4 +1,5 @@ -import type { TextDocument, Range } from 'vscode-languageserver' +import type { Range } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import moo from 'moo' export function getTextWithoutComments( diff --git a/packages/tailwindcss-language-service/src/util/find.ts b/packages/tailwindcss-language-service/src/util/find.ts index 7d67cb8..cf8cbce 100644 --- a/packages/tailwindcss-language-service/src/util/find.ts +++ b/packages/tailwindcss-language-service/src/util/find.ts @@ -1,4 +1,5 @@ -import type { TextDocument, Range, Position } from 'vscode-languageserver' +import type { Range, Position } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { DocumentClassName, DocumentClassList, State, DocumentHelperFunction } from './state' import lineColumn from 'line-column' import { isCssContext, isCssDoc } from './css' diff --git a/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts b/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts index a542e8f..b0eb838 100644 --- a/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts +++ b/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts @@ -1,4 +1,5 @@ -import type { TextDocument, Range } from 'vscode-languageserver' +import type { Range } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { isVueDoc, isHtmlDoc, isSvelteDoc } from './html' import { State } from './state' import { indexToPosition } from './find' diff --git a/packages/tailwindcss-language-service/src/util/html.ts b/packages/tailwindcss-language-service/src/util/html.ts index 5bc1064..a992f08 100644 --- a/packages/tailwindcss-language-service/src/util/html.ts +++ b/packages/tailwindcss-language-service/src/util/html.ts @@ -1,4 +1,5 @@ -import type { TextDocument, Position } from 'vscode-languageserver' +import type { Position } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { State } from './state' import { htmlLanguages } from './languages' import { getLanguageBoundaries } from './getLanguageBoundaries' diff --git a/packages/tailwindcss-language-service/src/util/isValidLocationForEmmetAbbreviation.ts b/packages/tailwindcss-language-service/src/util/isValidLocationForEmmetAbbreviation.ts index 23b9ced..11f17a7 100644 --- a/packages/tailwindcss-language-service/src/util/isValidLocationForEmmetAbbreviation.ts +++ b/packages/tailwindcss-language-service/src/util/isValidLocationForEmmetAbbreviation.ts @@ -1,4 +1,5 @@ -import type { TextDocument, Range, Position } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' +import type { Range, Position } from 'vscode-languageserver' export function isValidLocationForEmmetAbbreviation( document: TextDocument, diff --git a/packages/tailwindcss-language-service/src/util/js.ts b/packages/tailwindcss-language-service/src/util/js.ts index a74881b..bee7693 100644 --- a/packages/tailwindcss-language-service/src/util/js.ts +++ b/packages/tailwindcss-language-service/src/util/js.ts @@ -1,4 +1,5 @@ -import type { TextDocument, Position } from 'vscode-languageserver' +import type { Position } from 'vscode-languageserver' +import type { TextDocument } from 'vscode-languageserver-textdocument' import { State } from './state' import { jsLanguages } from './languages' import { getLanguageBoundaries } from './getLanguageBoundaries'