diff --git a/packages/tailwindcss-language-server/src/providers/completionProvider.ts b/packages/tailwindcss-language-server/src/providers/completionProvider.ts index 066ae6a2d2405d18f0bc7681c93cd19325890cf7..3c77de0404ea2a9d22ccb8a3f9b237779ba6ce59 100644 --- a/packages/tailwindcss-language-server/src/providers/completionProvider.ts +++ b/packages/tailwindcss-language-server/src/providers/completionProvider.ts @@ -15,8 +15,6 @@ import { isCssContext } from '../util/css' import { findLast, findJsxStrings, arrFindLast } from '../util/find' import { stringifyConfigValue, stringifyCss } from '../util/stringify' import { State } from '../util/state' - MarkupKind, -import { State } from '../util/state' CompletionList, import * as emmetHelper from 'emmet-helper' import { isValidLocationForEmmetAbbreviation } from '../util/isValidLocationForEmmetAbbreviation' @@ -384,8 +382,6 @@ items: Object.keys(screens).map((screen) => ({ label: screen, kind: CompletionItemKind.Constant, - MarkupKind, - CompletionList, newText: screen, range: { @@ -570,29 +566,19 @@ export function resolveCompletionItem( state: State, item: CompletionItem ): CompletionItem { - CompletionItem, import { State } from '../util/state' -import { let sep = state.separator - CompletionItem, - } -import { CompletionItem, - if (item.data === 'screen') { - let sep = state.separator CompletionParams, +import { CompletionItem, -import { stringifyConfigValue, stringifyCss } from '../util/stringify' + CompletionParams, CompletionItem, -import { stringifyScreen, Screen } from '../util/screens' CompletionItem, -import isObject from '../util/isObject' - ) + replacementRange.start.character + - CompletionItem, import { State } from '../util/state' -} from 'vscode-languageserver' CompletionItem, -import { isValidLocationForEmmetAbbreviation } from '../util/isValidLocationForEmmetAbbreviation' + CompletionItemKind, return item } diff --git a/packages/tailwindcss-language-server/src/util/screens.ts b/packages/tailwindcss-language-server/src/util/screens.ts deleted file mode 100644 index 2b029b25a522f3fb6b587e7301a51355dfe0d6e5..0000000000000000000000000000000000000000 --- a/packages/tailwindcss-language-server/src/util/screens.ts +++ /dev/null @@ -1,35 +0,0 @@ -import isObject from './isObject' - -export type MinMaxScreen = { - min?: string - max?: string -} - -export type RawScreen = { - raw: string -} - -export type Screen = string | RawScreen | MinMaxScreen | MinMaxScreen[] - -function isRawScreen(screen: unknown): screen is RawScreen { - return isObject(screen) && (screen as RawScreen).raw !== undefined -} - -export function stringifyScreen(screen: Screen): string { - if (!screen) return - if (typeof screen === 'string') return `@media (min-width: ${screen})` - if (isRawScreen(screen)) { - return `@media ${(screen as RawScreen).raw}` - } - let str = (Array.isArray(screen) ? screen : [screen]) - .map((range) => { - return [ - typeof range.min === 'string' ? `(min-width: ${range.min})` : null, - typeof range.max === 'string' ? `(max-width: ${range.max})` : null, - ] - .filter(Boolean) - .join(' and ') - }) - .join(', ') - return str ? `@media ${str}` : undefined -}