Skip to content

Commit 80c7d9d

Browse files
committed
Refactor
1 parent 3aed45c commit 80c7d9d

File tree

3 files changed

+25
-35
lines changed

3 files changed

+25
-35
lines changed

packages/tailwindcss-language-service/src/util/colorEquivalents.ts

+2-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
11
import type { Plugin } from 'postcss'
22
import parseValue from 'postcss-value-parser'
3-
import postcss from 'postcss'
43
import { formatColor, getColorFromValue } from './color'
54
import type { Comment } from './comments'
6-
import { applyComments } from './comments'
75

8-
export function addColorEquivalentsToCss(css: string): string {
9-
let comments: Comment[] = []
10-
11-
try {
12-
postcss([postcssPlugin({ comments })]).process(css, { from: undefined }).css
13-
} catch {
14-
return css
15-
}
16-
17-
return applyComments(css, comments)
18-
}
19-
20-
function postcssPlugin({ comments }: { comments: Comment[] }): Plugin {
6+
export function equivalentColorValues({ comments }: { comments: Comment[] }): Plugin {
217
return {
228
postcssPlugin: 'plugin',
239
Declaration(decl) {
@@ -62,4 +48,4 @@ function postcssPlugin({ comments }: { comments: Comment[] }): Plugin {
6248
},
6349
}
6450
}
65-
postcssPlugin.postcss = true
51+
equivalentColorValues.postcss = true
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,29 @@
11
import type { TailwindCssSettings } from './state'
2-
import { addPixelEquivalentsToCss } from './pixelEquivalents'
3-
import { addColorEquivalentsToCss } from './colorEquivalents'
2+
import { equivalentPixelValues } from './pixelEquivalents'
3+
import { equivalentColorValues } from './colorEquivalents'
4+
import postcss, { AcceptedPlugin } from 'postcss'
5+
import { applyComments, type Comment } from './comments'
46

57
export function addEquivalents(css: string, settings: TailwindCssSettings): string {
8+
let comments: Comment[] = []
9+
10+
let plugins: AcceptedPlugin[] = []
11+
612
if (settings.showPixelEquivalents) {
7-
css = addPixelEquivalentsToCss(css, settings.rootFontSize)
13+
plugins.push(equivalentPixelValues({
14+
comments,
15+
rootFontSize: settings.rootFontSize,
16+
}))
817
}
918

10-
css = addColorEquivalentsToCss(css)
19+
plugins.push(equivalentColorValues({ comments }))
20+
21+
try {
22+
postcss(plugins).process(css, { from: undefined })
23+
.css
24+
} catch {
25+
return css
26+
}
1127

12-
return css
28+
return applyComments(css, comments)
1329
}

packages/tailwindcss-language-service/src/util/pixelEquivalents.ts

+2-14
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,6 @@ export function addPixelEquivalentsToValue(value: string, rootFontSize: number):
3030
return value
3131
}
3232

33-
export function addPixelEquivalentsToCss(css: string, rootFontSize: number): string {
34-
let comments: Comment[] = []
35-
36-
try {
37-
postcss([postcssPlugin({ comments, rootFontSize })]).process(css, { from: undefined }).css
38-
} catch {
39-
return css
40-
}
41-
42-
return applyComments(css, comments)
43-
}
44-
4533
function getPixelEquivalentsForMediaQuery(params: string, rootFontSize: number): Comment[] {
4634
let comments: Comment[] = []
4735

@@ -74,7 +62,7 @@ export function addPixelEquivalentsToMediaQuery(query: string, rootFontSize: num
7462
})
7563
}
7664

77-
function postcssPlugin({
65+
export function equivalentPixelValues({
7866
comments,
7967
rootFontSize,
8068
}: {
@@ -127,4 +115,4 @@ function postcssPlugin({
127115
},
128116
}
129117
}
130-
postcssPlugin.postcss = true
118+
equivalentPixelValues.postcss = true

0 commit comments

Comments
 (0)