Skip to content

Commit

Permalink
Migrate from deprecated text document (#781)
Browse files Browse the repository at this point in the history
* Removed instances of deprecated TextDocument

* Replaced TextDocument type in diagnostics
  • Loading branch information
MaximilianLloyd committed May 15, 2023
1 parent 460d921 commit 35b9d11
Show file tree
Hide file tree
Showing 22 changed files with 36 additions and 22 deletions.
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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'
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('--')
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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'
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
3 changes: 2 additions & 1 deletion packages/tailwindcss-language-service/src/hoverProvider.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion packages/tailwindcss-language-service/src/util/css.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
3 changes: 2 additions & 1 deletion packages/tailwindcss-language-service/src/util/doc.ts
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
3 changes: 2 additions & 1 deletion packages/tailwindcss-language-service/src/util/find.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
3 changes: 2 additions & 1 deletion packages/tailwindcss-language-service/src/util/html.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
3 changes: 2 additions & 1 deletion packages/tailwindcss-language-service/src/util/js.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down

0 comments on commit 35b9d11

Please sign in to comment.