diff --git a/packages/tailwindcss-intellisense/package.json b/packages/tailwindcss-intellisense/package.json index 033ea53b820989875059eb648fabea732e5d15ba..47f21ddd4a4377dd655eebfb53046456bb70355f 100755 --- a/packages/tailwindcss-intellisense/package.json +++ b/packages/tailwindcss-intellisense/package.json @@ -162,9 +162,6 @@ }, "tailwindCSS.experimental.classRegex": { "type": "array", "scope": "language-overridable" - }, - "tailwindCSS.experimental.showPixelValues": { - "type": "boolean" } } } diff --git a/packages/tailwindcss-intellisense/src/lsp/server.ts b/packages/tailwindcss-intellisense/src/lsp/server.ts index f99bbea7b6705ebb44e66e85c49e533970fff43d..043115dccd287f1cb2080fcb3b05e829692b17a3 100644 --- a/packages/tailwindcss-intellisense/src/lsp/server.ts +++ b/packages/tailwindcss-intellisense/src/lsp/server.ts @@ -48,7 +48,6 @@ emmetCompletions: false, includeLanguages: {}, experimental: { classRegex: [], - showPixelValues: false, }, validate: true, lint: { diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index 1a7165b95b5bd11fcff1ed4c28733673a3b18fbd..0cdff6335af81f60c4e76a8d6a187c71a1d6fa36 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -32,7 +32,6 @@ } from './util/lexers' import { validateApply } from './util/validateApply' import { flagEnabled } from './util/flagEnabled' import MultiRegexp from 'multi-regexp2' -import { remToPx } from './util/remToPx' export function completionsFromClassList( state: State, @@ -877,13 +876,10 @@ item.detail = state.classNames.context[ item.data[item.data.length - 1] ].join(', ') } else { - item.detail = await getCssDetail(state, className) + item.detail = getCssDetail(state, className) if (!item.documentation) { - const settings = await getDocumentSettings(state) - const css = stringifyCss(item.data.join(':'), className, { - tabSize: dlv(settings, 'tabSize'), - showPixelValues: dlv(settings, 'experimental.showPixelValues'), - }) + const { tabSize } = await getDocumentSettings(state) + const css = stringifyCss(item.data.join(':'), className, tabSize) if (css) { item.documentation = { kind: 'markdown' as typeof MarkupKind.Markdown, @@ -911,10 +907,7 @@ return isObject(item.__info) && !item.__info.__rule } -function stringifyDecls( - obj: any, - { showPixelValues = false }: Partial<{ showPixelValues: boolean }> = {} -): string { +function stringifyDecls(obj: any): string { let props = Object.keys(obj) let nonCustomProps = props.filter((prop) => !prop.startsWith('--')) @@ -925,24 +918,18 @@ return props .map((prop) => ensureArray(obj[prop]) - .map((value) => { - const px = showPixelValues ? remToPx(value) : undefined - return `${prop}: ${value}${px ? ` /*${px}*/` : ''};` - }) + .map((value) => `${prop}: ${value};`) .join(' ') ) .join(' ') } -async function getCssDetail(state: State, className: any): Promise { +function getCssDetail(state: State, className: any): string { if (Array.isArray(className)) { return `${className.length} rules` } if (className.__rule === true) { - const settings = await getDocumentSettings(state) - return stringifyDecls(removeMeta(className), { - showPixelValues: dlv(settings, 'experimental.showPixelValues', false), - }) + return stringifyDecls(removeMeta(className)) } return null } diff --git a/packages/tailwindcss-language-service/src/hoverProvider.ts b/packages/tailwindcss-language-service/src/hoverProvider.ts index 03f11504be4894e808ca7502235bcd8bfc925cd4..3171e02b21159854b1f3d3e3625861b945ed10cf 100644 --- a/packages/tailwindcss-language-service/src/hoverProvider.ts +++ b/packages/tailwindcss-language-service/src/hoverProvider.ts @@ -90,15 +90,12 @@ return null } } - const settings = await getDocumentSettings(state, document) + const { tabSize } = await getDocumentSettings(state, document) const css = stringifyCss( className.className, dlv(state.classNames.classNames, [...parts, '__info']), - { - tabSize: dlv(settings, 'tabSize'), - showPixelValues: dlv(settings, 'experimental.showPixelValues'), - } + tabSize ) if (!css) return null diff --git a/packages/tailwindcss-language-service/src/util/remToPx.ts b/packages/tailwindcss-language-service/src/util/remToPx.ts deleted file mode 100644 index b9f18982ff65b4b4622e76022fd9be8d017656de..0000000000000000000000000000000000000000 --- a/packages/tailwindcss-language-service/src/util/remToPx.ts +++ /dev/null @@ -1,8 +0,0 @@ -export function remToPx( - value: string, - rootSize: number = 16 -): string | undefined { - return /^-?[0-9.]+rem$/.test(value) - ? `${parseFloat(value.substr(0, value.length - 3)) * rootSize}px` - : undefined -} diff --git a/packages/tailwindcss-language-service/src/util/state.ts b/packages/tailwindcss-language-service/src/util/state.ts index 117a8edaf0400a8f26eb4aadaa5a5218b6f01f4a..c89cb306d40ab1d1ab47ea7d8b99020994ff6113 100644 --- a/packages/tailwindcss-language-service/src/util/state.ts +++ b/packages/tailwindcss-language-service/src/util/state.ts @@ -43,7 +43,6 @@ invalidTailwindDirective: DiagnosticSeveritySetting } experimental: { classRegex: string[] - showPixelValues: boolean } } diff --git a/packages/tailwindcss-language-service/src/util/stringify.ts b/packages/tailwindcss-language-service/src/util/stringify.ts index b7050f9ea224fdc8ce0c7d01afdc29829946834d..a72fa328197c6e114af0890cf7a74bb98e9d4cbd 100644 --- a/packages/tailwindcss-language-service/src/util/stringify.ts +++ b/packages/tailwindcss-language-service/src/util/stringify.ts @@ -2,7 +2,6 @@ import removeMeta from './removeMeta' const dlv = require('dlv') import escapeClassName from 'css.escape' import { ensureArray } from './array' -import { remToPx } from './remToPx' export function stringifyConfigValue(x: any): string { if (typeof x === 'string') return x @@ -19,17 +18,12 @@ export function stringifyCss( className: string, obj: any, - { - tabSize = 2, - showPixelValues = false, - }: Partial<{ tabSize: number; showPixelValues: boolean }> = {} + tabSize: number = 2 ): string { if (obj.__rule !== true && !Array.isArray(obj)) return null if (Array.isArray(obj)) { - const rules = obj - .map((x) => stringifyCss(className, x, { tabSize, showPixelValues })) - .filter(Boolean) + const rules = obj.map((x) => stringifyCss(className, x)).filter(Boolean) if (rules.length === 0) return null return rules.join('\n\n') } @@ -48,10 +42,7 @@ const indentStr = indent.repeat(context.length) const decls = props.reduce((acc, curr, i) => { const propStr = ensureArray(obj[curr]) - .map((val) => { - const px = showPixelValues ? remToPx(val) : undefined - return `${indentStr + indent}${curr}: ${val}${px ? ` /*${px}*/` : ''};` - }) + .map((val) => `${indentStr + indent}${curr}: ${val};`) .join('\n') return `${acc}${i === 0 ? '' : '\n'}${propStr}` }, '')