From 5d91e107df8e584ab7184b5cb4e91891fea8c0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20=C3=98yst=C3=A5=20Lloyd?= Date: Fri, 12 May 2023 15:09:50 +0200 Subject: [PATCH 1/2] Removed instances of deprecated TextDocument --- .../tailwindcss-language-server/src/lsp/diagnosticsProvider.ts | 2 +- packages/tailwindcss-language-server/src/util/isExcluded.ts | 2 +- .../src/codeActions/codeActionProvider.ts | 2 +- .../tailwindcss-language-service/src/completionProvider.ts | 2 +- .../src/diagnostics/diagnosticsProvider.ts | 2 +- .../src/diagnostics/getCssConflictDiagnostics.ts | 2 +- .../src/diagnostics/getInvalidConfigPathDiagnostics.ts | 2 +- .../src/diagnostics/getRecommendedVariantOrderDiagnostics.ts | 2 +- .../tailwindcss-language-service/src/documentColorProvider.ts | 3 ++- .../tailwindcss-language-service/src/documentLinksProvider.ts | 3 ++- packages/tailwindcss-language-service/src/hoverProvider.ts | 3 ++- packages/tailwindcss-language-service/src/util/css.ts | 3 ++- packages/tailwindcss-language-service/src/util/doc.ts | 3 ++- packages/tailwindcss-language-service/src/util/find.ts | 3 ++- .../src/util/getLanguageBoundaries.ts | 3 ++- packages/tailwindcss-language-service/src/util/html.ts | 3 ++- .../src/util/isValidLocationForEmmetAbbreviation.ts | 3 ++- packages/tailwindcss-language-service/src/util/js.ts | 3 ++- 18 files changed, 28 insertions(+), 18 deletions(-) diff --git a/packages/tailwindcss-language-server/src/lsp/diagnosticsProvider.ts b/packages/tailwindcss-language-server/src/lsp/diagnosticsProvider.ts index fe08b247..164a3c9e 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 80ce605c..7ae954df 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 2a87d2fd..e59e21de 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 86bb582a..a6dce524 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 a8d7f7dc..c8f993ec 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 7ee3f843..a531af0e 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/getInvalidConfigPathDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts index 0af36831..27fc4ca1 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/getRecommendedVariantOrderDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts index f1088e53..82385d97 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 071580eb..4af8e42a 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 987acbf6..b2dedd59 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 f506bb27..ffa75673 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 a515ce11..c4e76cb3 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 7c291ff9..1036a653 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 7d67cb85..cf8cbcee 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 a542e8f8..b0eb838d 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 5bc10645..a992f08d 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 23b9ced4..11f17a7c 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 a74881b9..bee7693b 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' From 4b5e5632b8122aaab0bc4f57a0b2d364d7135f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20=C3=98yst=C3=A5=20Lloyd?= Date: Fri, 12 May 2023 15:19:01 +0200 Subject: [PATCH 2/2] Replaced TextDocument type in diagnostics --- .../src/diagnostics/getInvalidApplyDiagnostics.ts | 3 ++- .../src/diagnostics/getInvalidScreenDiagnostics.ts | 3 ++- .../src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts | 3 ++- .../src/diagnostics/getInvalidVariantDiagnostics.ts | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts index 9af198ba..75821cd5 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/getInvalidScreenDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts index c9a9a75b..cb9717ce 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 307c1f47..635d451a 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 1f2a46ef..f4be5183 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'