Refactor

Author: thecrypticace

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

@@ -0,0 +1,13 @@
+import type { TailwindCssSettings } from './state'
+import { addPixelEquivalentsToCss } from './pixelEquivalents'
+import { addColorEquivalentsToCss } from './colorEquivalents'
+
+export function addEquivalents(css: string, settings: TailwindCssSettings): string {
+  if (settings.showPixelEquivalents) {
+    css = addPixelEquivalentsToCss(css, settings.rootFontSize)
+  }
+
+  css = addColorEquivalentsToCss(css)
+
+  return css
+}

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

@@ -1,7 +1,7 @@
 import { State } from './state'
 import type { Container, Document, Root, Rule, Node, AtRule } from 'postcss'
-import { addPixelEquivalentsToCss, addPixelEquivalentsToValue } from './pixelEquivalents'
-import { addColorEquivalentsToCss } from './colorEquivalents'
+import { addPixelEquivalentsToValue } from './pixelEquivalents'
+import { addEquivalents } from './equivalents'
 
 export function bigSign(bigIntValue) {
   // @ts-ignore
@@ -44,11 +44,7 @@ export async function stringifyRoot(state: State, root: Root, uri?: string): Pro
 
   let css = clone.toString()
 
-  if (settings.tailwindCSS.showPixelEquivalents) {
-    css = addPixelEquivalentsToCss(css, settings.tailwindCSS.rootFontSize)
-  }
-
-  css = addColorEquivalentsToCss(css)
+  css = addEquivalents(css, settings.tailwindCSS)
 
   return css
     .replace(/([^;{}\s])(\n\s*})/g, (_match, before, after) => `${before};${after}`)

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

@@ -5,8 +5,7 @@ import { ensureArray } from './array'
 import stringifyObject from 'stringify-object'
 import isObject from './isObject'
 import { Settings } from './state'
-import { addPixelEquivalentsToCss } from './pixelEquivalents'
-import { addColorEquivalentsToCss } from './colorEquivalents'
+import { addEquivalents } from './equivalents'
 
 export function stringifyConfigValue(x: any): string {
   if (isObject(x)) return `${Object.keys(x).length} values`
@@ -56,11 +55,7 @@ export function stringifyCss(className: string, obj: any, settings: Settings): s
     css += `${indent.repeat(i)}\n}`
   }
 
-  if (settings.tailwindCSS.showPixelEquivalents) {
-    css = addPixelEquivalentsToCss(css, settings.tailwindCSS.rootFontSize)
-  }
-
-  css = addColorEquivalentsToCss(css)
+  css = addEquivalents(css, settings.tailwindCSS)
 
   return css
 }