Skip to content

Commit feb1937

Browse files
author
Brad Cornes
committed
vary @tailwind completions based on version
1 parent 2c1a520 commit feb1937

File tree

5 files changed

+28
-9
lines changed

5 files changed

+28
-9
lines changed

packages/tailwindcss-class-names/src/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ export default async function getClassNames(
9393
const resolvedConfig = resolveConfig({ cwd, config })
9494

9595
return {
96+
version,
9697
configPath,
9798
config: resolvedConfig,
9899
separator: typeof userSeperator === 'undefined' ? ':' : userSeperator,

packages/tailwindcss-language-server/package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/tailwindcss-language-server/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"emmet-helper": "0.0.1",
2323
"glob-exec": "^0.1.1",
2424
"line-column": "^1.0.2",
25+
"semver": "^7.3.2",
2526
"tailwindcss-class-names": "0.0.1",
2627
"typescript": "^3.8.3",
2728
"vscode-languageserver": "^5.2.1",

packages/tailwindcss-language-server/src/providers/completionProvider.ts

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { isValidLocationForEmmetAbbreviation } from '../util/isValidLocationForE
2121
import { getDocumentSettings } from '../util/getDocumentSettings'
2222
import { isJsContext } from '../util/js'
2323
import { naturalExpand } from '../util/naturalExpand'
24+
import semver from 'semver'
2425

2526
function completionsFromClassList(
2627
state: State,
@@ -306,7 +307,7 @@ function provideCssHelperCompletions(
306307
}
307308
}
308309

309-
// TODO: vary items based on Tailwind version
310+
// TODO: vary docs links based on Tailwind version
310311
function provideTailwindDirectiveCompletions(
311312
state: State,
312313
{ position, textDocument }: CompletionParams
@@ -329,14 +330,23 @@ function provideTailwindDirectiveCompletions(
329330
return {
330331
isIncomplete: false,
331332
items: [
332-
{
333-
label: 'base',
334-
documentation: {
335-
kind: MarkupKind.Markdown,
336-
value:
337-
'This injects Tailwind’s base styles and any base styles registered by plugins.\n\n[Tailwind CSS Documentation](https://tailwindcss.com/docs/functions-and-directives/#tailwind)',
338-
},
339-
},
333+
semver.gte(state.version, '1.0.0-beta.1')
334+
? {
335+
label: 'base',
336+
documentation: {
337+
kind: MarkupKind.Markdown,
338+
value:
339+
'This injects Tailwind’s base styles and any base styles registered by plugins.\n\n[Tailwind CSS Documentation](https://tailwindcss.com/docs/functions-and-directives/#tailwind)',
340+
},
341+
}
342+
: {
343+
label: 'preflight',
344+
documentation: {
345+
kind: MarkupKind.Markdown,
346+
value:
347+
'This injects Tailwind’s base styles, which is a combination of Normalize.css and some additional base styles.\n\n[Tailwind CSS Documentation](https://v0.tailwindcss.com/docs/functions-and-directives/#tailwind)',
348+
},
349+
},
340350
{
341351
label: 'components',
342352
documentation: {

packages/tailwindcss-language-server/src/util/state.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export type Settings = {
2929

3030
export type State = null | {
3131
enabled: boolean
32+
version?: string
3233
configPath?: string
3334
config?: any
3435
separator?: string

0 commit comments

Comments
 (0)