Moved classFunctions option out of experimental

Author: Laurynas Grigutis

packages/tailwindcss-language-service/src/completionProvider.ts

@@ -747,8 +747,8 @@ async function provideClassAttributeCompletions(
 
   let matches = matchClassAttributes(str, settings.classAttributes)
 
-  if (settings.experimental.classFunctions?.length) {
-    matches.push(...matchClassFunctions(str, settings.experimental.classFunctions))
+  if (settings.classFunctions?.length) {
+    matches.push(...matchClassFunctions(str, settings.classFunctions))
   }
 
   if (matches.length === 0) {

packages/tailwindcss-language-service/src/util/find.test.ts

@@ -284,10 +284,7 @@ function getTailwindSettingsForClassFunctions(): Parameters<typeof findClassList
         ...defaultSettings,
         tailwindCSS: {
           ...defaultSettings.tailwindCSS,
-          experimental: {
-            ...defaultSettings.tailwindCSS.experimental,
-            classFunctions: ['cva', 'cn'],
-          },
+          classFunctions: ['cva', 'cn'],
         },
       }),
     },

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

@@ -183,8 +183,8 @@ export async function findClassListsInHtmlRange(
   const settings = (await state.editor.getConfiguration(doc.uri)).tailwindCSS
   const matches = matchClassAttributes(text, settings.classAttributes)
 
-  if (settings.experimental.classFunctions?.length) {
-    matches.push(...matchClassFunctions(text, settings.experimental.classFunctions))
+  if (settings.classFunctions?.length) {
+    matches.push(...matchClassFunctions(text, settings.classFunctions))
   }
 
   const result: DocumentClassList[] = []

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

@@ -46,6 +46,7 @@ export type TailwindCssSettings = {
   emmetCompletions: boolean
   includeLanguages: Record<string, string>
   classAttributes: string[]
+  classFunctions: string[]
   suggestions: boolean
   hovers: boolean
   codeActions: boolean
@@ -66,7 +67,6 @@ export type TailwindCssSettings = {
   experimental: {
     classRegex: string[] | [string, string][]
     configFile: string | Record<string, string | string[]> | null
-    classFunctions: string[]
   }
   files: {
     exclude: string[]
@@ -180,6 +180,7 @@ export function getDefaultTailwindSettings() {
       inspectPort: null,
       emmetCompletions: false,
       classAttributes: ['class', 'className', 'ngClass', 'class:list'],
+      classFunctions: [],
       codeActions: true,
       hovers: true,
       suggestions: true,
@@ -202,7 +203,6 @@ export function getDefaultTailwindSettings() {
       experimental: {
         classRegex: [],
         configFile: null,
-        classFunctions: [],
       },
     },
     // Return this as const object that satisfies Settings to be able to see the exact default values we specify

packages/vscode-tailwindcss/package.json

@@ -184,6 +184,14 @@
           ],
           "markdownDescription": "The HTML attributes for which to provide class completions, hover previews, linting etc."
         },
+        "tailwindCSS.classFunctions": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [],
+          "markdownDescription": "The function names for which to provide class completions, hover previews, linting etc."
+        },
         "tailwindCSS.suggestions": {
           "type": "boolean",
           "default": true,
@@ -304,14 +312,6 @@
           "default": null,
           "markdownDescription": "Manually specify the Tailwind config file or files that should be read to provide IntelliSense features. Can either be a single string value, or an object where each key is a config file path and each value is a glob or array of globs representing the set of files that the config file applies to."
         },
-        "tailwindCSS.experimental.classFunctions": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "default": [],
-          "markdownDescription": "The function names for which to provide class completions, hover previews, linting etc."
-        },
         "tailwindCSS.showPixelEquivalents": {
           "type": "boolean",
           "default": true,