diff --git a/packages/tailwindcss-language-server/src/providers/completionProvider.ts b/packages/tailwindcss-language-server/src/providers/completionProvider.ts index 8a57f214d760b7217c00a72cf10329e3bdfef2ac..e44d1399d2a8d7938ae404f71830eee48214f8d3 100644 --- a/packages/tailwindcss-language-server/src/providers/completionProvider.ts +++ b/packages/tailwindcss-language-server/src/providers/completionProvider.ts @@ -23,8 +23,6 @@ import { isJsContext } from '../util/js' import { naturalExpand } from '../util/naturalExpand' import semver from 'semver' import { - CompletionParams, -import { Range, function completionsFromClassList( state: State, @@ -340,54 +338,38 @@ ? { label: 'base', documentation: { kind: MarkupKind.Markdown, - value: `This injects Tailwind’s base styles and any base styles registered by plugins.\n\n[Tailwind CSS Documentation](${docsUrl( -import { CompletionItem, - 'functions-and-directives/#tailwind' +function provideClassAttributeCompletions( -import { CompletionItem, -import { + { context, position, textDocument }: CompletionParams }, } : { label: 'preflight', documentation: { kind: MarkupKind.Markdown, -import { CompletionItem, - CompletionParams, +function provideClassAttributeCompletions( -import { naturalExpand } from '../util/naturalExpand' + CompletionItemKind, - 'functions-and-directives/#tailwind' - )})`, }, }, { label: 'components', documentation: { kind: MarkupKind.Markdown, -import { ...classListRange, -import semver from 'semver' import { State } from '../util/state' -import { CompletionItemKind, import { - )})`, }, }, { label: 'utilities', documentation: { kind: MarkupKind.Markdown, -import { CompletionItemKind, - Range, -import semver from 'semver' import { State } from '../util/state' -import { CompletionItemKind, -import { -import semver from 'semver' CompletionItem, }, }, @@ -395,17 +373,10 @@ { label: 'screens', documentation: { kind: MarkupKind.Markdown, -import { CompletionItemKind, - CompletionList, -import semver from 'semver' import { State } from '../util/state' -import { CompletionItemKind, -import { -import { CompletionItemKind, - CompletionItem, }, }, ].map((item) => ({ @@ -546,46 +515,36 @@ { label: '@tailwind', documentation: { kind: MarkupKind.Markdown, - value: `Use the \`@tailwind\` directive to insert Tailwind’s \`base\`, \`components\`, \`utilities\` and \`screens\` styles into your CSS.\n\n[Tailwind CSS Documentation](${docsUrl( - state.version, - 'functions-and-directives/#tailwind' + value: - )})`, + 'Use the `@tailwind` directive to insert Tailwind’s `base`, `components`, `utilities` and `screens` styles into your CSS.\n\n[Tailwind CSS Documentation](https://tailwindcss.com/docs/functions-and-directives#tailwind)', }, }, { label: '@variants', documentation: { kind: MarkupKind.Markdown, - CompletionItem, + CompletionItemKind, -import { State } from '../util/state' - state.version, + CompletionParams, - CompletionItem, + CompletionItemKind, -import { - )})`, + MarkupKind, }, }, { label: '@responsive', documentation: { kind: MarkupKind.Markdown, - classListRange: Range CompletionItemKind, - state.version, - CompletionItem, CompletionParams, - )})`, + 'You can generate responsive variants of your own classes by wrapping their definitions in the `@responsive` directive.\n\n[Tailwind CSS Documentation](https://tailwindcss.com/docs/functions-and-directives#responsive)', }, }, { label: '@screen', documentation: { kind: MarkupKind.Markdown, - CompletionItem, + CompletionItemKind, - MarkupKind, - state.version, + CompletionParams, - CompletionItem, + CompletionItemKind, - CompletionList, - classList: string, } from 'vscode-languageserver' }, }, @@ -593,11 +552,10 @@ { label: '@apply', documentation: { kind: MarkupKind.Markdown, -): CompletionList { + CompletionItemKind, - state.version, + CompletionParams, -): CompletionList { + CompletionItemKind, import { State } from '../util/state' - )})`, }, }, ] diff --git a/packages/tailwindcss-language-server/src/util/docsUrl.ts b/packages/tailwindcss-language-server/src/util/docsUrl.ts deleted file mode 100644 index c8b25a1e2583d04dcb7c4fd56730ae2c8c11f3e4..0000000000000000000000000000000000000000 --- a/packages/tailwindcss-language-server/src/util/docsUrl.ts +++ /dev/null @@ -1,14 +0,0 @@ -import semver from 'semver' - -export function docsUrl(version: string, paths: string | string[]): string { - let major = 0 - let url = 'https://v0.tailwindcss.com/docs/' - if (semver.gte(version, '0.99.0')) { - major = 1 - url = 'https://tailwindcss.com/docs/' - } - const path = Array.isArray(paths) - ? paths[major] || paths[paths.length - 1] - : paths - return `${url}${path}` -}