Update settings

package.json

@@ -71,19 +71,20 @@
           "default": {},
           "markdownDescription": "Enable features in languages that are not supported by default. Add a mapping here between the new language and an already supported language.\n E.g.: `{\"plaintext\": \"html\"}`"
         },
-        "tailwindCSS.colorDecorators.enabled": {
-          "type": "boolean",
-          "default": true,
-          "scope": "language-overridable"
-        },
-        "tailwindCSS.colorDecorators.classes": {
-          "type": "boolean",
-          "default": true,
-          "scope": "language-overridable"
-        },
-        "tailwindCSS.colorDecorators.cssHelpers": {
-          "type": "boolean",
-          "default": true,
+        "tailwindCSS.colorDecorators": {
+          "type": "string",
+          "enum": [
+            "inherit",
+            "on",
+            "off"
+          ],
+          "markdownEnumDescriptions": [
+            "Color decorators are rendered if `editor.colorDecorators` is `true`.",
+            "Color decorators are rendered.",
+            "Color decorators are not rendered."
+          ],
+          "default": "inherit",
+          "markdownDescription": "Controls whether the editor should render inline color decorators for Tailwind CSS classes and helper functions.",
           "scope": "language-overridable"
         },
         "tailwindCSS.validate": {

src/lib/registerColorDecorator.ts

@@ -47,20 +47,22 @@ export function registerColorDecorator(
       return
     }
 
-    let settings = workspace.getConfiguration(
-      'tailwindCSS.colorDecorators',
-      editor.document
-    )
+    let preference =
+      workspace.getConfiguration('tailwindCSS', editor.document)
+        .colorDecorators || 'inherit'
 
-    if (settings.enabled !== true) {
+    let enabled =
+      preference === 'inherit'
+        ? workspace.getConfiguration('editor').colorDecorators
+        : preference === 'on'
+
+    if (enabled !== true) {
       editor.setDecorations(colorDecorationType, [])
       return
     }
 
     let { colors } = await emitter.emit('getDocumentColors', {
       document: editor.document.uri.toString(),
-      classes: settings.classes,
-      cssHelpers: settings.cssHelpers,
     })
 
     editor.setDecorations(

src/lsp/providers/documentColorProvider.ts

@@ -7,7 +7,6 @@ import {
 } from '../util/find'
 import { getClassNameParts } from '../util/getClassNameAtPosition'
 import { getColor, getColorFromValue } from '../util/color'
-import { logFull } from '../util/logFull'
 import { stringToPath } from '../util/stringToPath'
 const dlv = require('dlv')
 
@@ -15,12 +14,11 @@ export function registerDocumentColorProvider(state: State) {
   onMessage(
     state.editor.connection,
     'getDocumentColors',
-    async ({ document, classes, cssHelpers }) => {
+    async ({ document }) => {
       let colors = []
       let doc = state.editor.documents.get(document)
       if (!doc) return { colors }
 
-      if (classes) {
       let classLists = findClassListsInDocument(state, doc)
       classLists.forEach((classList) => {
         let classNames = getClassNamesInClassList(classList)
@@ -32,9 +30,7 @@ export function registerDocumentColorProvider(state: State) {
           colors.push({ range: className.range, color: color.documentation })
         })
       })
-      }
 
-      if (cssHelpers) {
       let helperFns = findHelperFunctionsInDocument(state, doc)
       helperFns.forEach((fn) => {
         let keys = stringToPath(fn.value)
@@ -55,7 +51,6 @@ export function registerDocumentColorProvider(state: State) {
           colors.push({ range: fn.valueRange, color })
         }
       })
-      }
 
       return { colors }
     }