update settings schema

Author: bradlc

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

@@ -313,7 +313,7 @@ async function provideCustomClassNameCompletions(
   position: Position
 ): Promise<CompletionList> {
   const settings = await state.editor.getConfiguration(document.uri)
-  const regexes = dlv(settings, 'experimental.classRegex', [])
+  const regexes = dlv(settings, 'tailwindCSS.experimental.classRegex', [])
   if (regexes.length === 0) return null
 
   const positionOffset = document.offsetAt(position)
@@ -853,7 +853,7 @@ async function provideEmmetCompletions(
   position: Position
 ): Promise<CompletionList> {
   let settings = await state.editor.getConfiguration(document.uri)
-  if (settings.emmetCompletions !== true) return null
+  if (settings.tailwindCSS.emmetCompletions !== true) return null
 
   const isHtml = isHtmlContext(state, document, position)
   const isJs = !isHtml && isJsContext(state, document, position)
@@ -980,9 +980,9 @@ export async function resolveCompletionItem(
     if (!item.documentation) {
       const settings = await state.editor.getConfiguration()
       const css = stringifyCss(item.data.join(':'), className, {
-        tabSize: dlv(settings, 'tabSize', 2),
-        showPixelEquivalents: dlv(settings, 'showPixelEquivalents', true),
-        rootFontSize: dlv(settings, 'rootFontSize', 16),
+        tabSize: dlv(settings, 'editor.tabSize', 2),
+        showPixelEquivalents: dlv(settings, 'tailwindCSS.showPixelEquivalents', true),
+        rootFontSize: dlv(settings, 'tailwindCSS.rootFontSize', 16),
       })
       if (css) {
         item.documentation = {
@@ -1044,8 +1044,8 @@ async function getCssDetail(state: State, className: any): Promise<string> {
   if (className.__rule === true) {
     const settings = await state.editor.getConfiguration()
     return stringifyDecls(removeMeta(className), {
-      showPixelEquivalents: dlv(settings, 'showPixelEquivalents', true),
-      rootFontSize: dlv(settings, 'rootFontSize', 16),
+      showPixelEquivalents: dlv(settings, 'tailwindCSS.showPixelEquivalents', true),
+      rootFontSize: dlv(settings, 'tailwindCSS.rootFontSize', 16),
     })
   }
   return null

packages/tailwindcss-language-service/src/diagnostics/diagnosticsProvider.ts

@@ -24,7 +24,7 @@ export async function doValidate(
 ): Promise<AugmentedDiagnostic[]> {
   const settings = await state.editor.getConfiguration(document.uri)
 
-  return settings.validate
+  return settings.tailwindCSS.validate
     ? [
         ...(only.includes(DiagnosticKind.CssConflict)
           ? await getCssConflictDiagnostics(state, document, settings)

packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts

@@ -13,7 +13,7 @@ export async function getCssConflictDiagnostics(
   document: TextDocument,
   settings: Settings
 ): Promise<CssConflictDiagnostic[]> {
-  let severity = settings.lint.cssConflict
+  let severity = settings.tailwindCSS.lint.cssConflict
   if (severity === 'ignore') return []
 
   let diagnostics: CssConflictDiagnostic[] = []

packages/tailwindcss-language-service/src/diagnostics/getIncorrectVariantOrderDiagnostics.ts

@@ -13,7 +13,7 @@ export async function getIncorrectVariantOrderDiagnostics(
 ): Promise<IncorrectVariantOrderDiagnostic[]> {
   if (!state.jit) return []
 
-  let severity = settings.lint.incorrectVariantOrder
+  let severity = settings.tailwindCSS.lint.incorrectVariantOrder
   if (severity === 'ignore') return []
 
   let diagnostics: IncorrectVariantOrderDiagnostic[] = []

packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts

@@ -9,16 +9,10 @@ export async function getInvalidApplyDiagnostics(
   document: TextDocument,
   settings: Settings
 ): Promise<InvalidApplyDiagnostic[]> {
-  let severity = settings.lint.invalidApply
+  let severity = settings.tailwindCSS.lint.invalidApply
   if (severity === 'ignore') return []
 
-  const classNames = await findClassNamesInRange(
-    state,
-    document,
-    undefined,
-    'css',
-    false
-  )
+  const classNames = await findClassNamesInRange(state, document, undefined, 'css', false)
 
   let diagnostics: InvalidApplyDiagnostic[] = classNames.map((className) => {
     let result = validateApply(state, className.className)

packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts

@@ -24,9 +24,7 @@ function validateConfigPath(
   state: State,
   path: string | string[],
   base: string[] = []
-):
-  | { isValid: true; value: any }
-  | { isValid: false; reason: string; suggestions: string[] } {
+): { isValid: true; value: any } | { isValid: false; reason: string; suggestions: string[] } {
   let keys = Array.isArray(path) ? path : stringToPath(path)
   let value = dlv(state.config, [...base, ...keys])
   let suggestions: string[] = []
@@ -49,9 +47,7 @@ function validateConfigPath(
       })
       .slice(1) // skip original path
 
-    return possibilities.find(
-      (possibility) => validateConfigPath(state, possibility, base).isValid
-    )
+    return possibilities.find((possibility) => validateConfigPath(state, possibility, base).isValid)
   }
 
   if (typeof value === 'undefined') {
@@ -67,9 +63,7 @@ function validateConfigPath(
         )
       )
       if (closestValidKey) {
-        suggestions.push(
-          pathToString([...keys.slice(0, keys.length - 1), closestValidKey])
-        )
+        suggestions.push(pathToString([...keys.slice(0, keys.length - 1), closestValidKey]))
         reason += ` Did you mean '${suggestions[0]}'?`
       }
     } else {
@@ -99,18 +93,14 @@ function validateConfigPath(
       Array.isArray(value)
     )
   ) {
-    let reason = `'${pathToString(
-      path
-    )}' was found but does not resolve to a string.`
+    let reason = `'${pathToString(path)}' was found but does not resolve to a string.`
 
     if (isObject(value)) {
       let validKeys = Object.keys(value).filter(
         (key) => validateConfigPath(state, [...keys, key], base).isValid
       )
       if (validKeys.length) {
-        suggestions.push(
-          ...validKeys.map((validKey) => pathToString([...keys, validKey]))
-        )
+        suggestions.push(...validKeys.map((validKey) => pathToString([...keys, validKey])))
         reason += ` Did you mean something like '${suggestions[0]}'?`
       }
     }
@@ -171,7 +161,7 @@ export function getInvalidConfigPathDiagnostics(
   document: TextDocument,
   settings: Settings
 ): InvalidConfigPathDiagnostic[] {
-  let severity = settings.lint.invalidConfigPath
+  let severity = settings.tailwindCSS.lint.invalidConfigPath
   if (severity === 'ignore') return []
 
   let diagnostics: InvalidConfigPathDiagnostic[] = []

packages/tailwindcss-language-service/src/diagnostics/getInvalidScreenDiagnostics.ts

@@ -13,7 +13,7 @@ export function getInvalidScreenDiagnostics(
   document: TextDocument,
   settings: Settings
 ): InvalidScreenDiagnostic[] {
-  let severity = settings.lint.invalidScreen
+  let severity = settings.tailwindCSS.lint.invalidScreen
   if (severity === 'ignore') return []
 
   let diagnostics: InvalidScreenDiagnostic[] = []
@@ -31,9 +31,7 @@ export function getInvalidScreenDiagnostics(
     let text = document.getText(range)
     let matches = findAll(/(?:\s|^)@screen\s+(?<screen>[^\s{]+)/g, text)
 
-    let screens = Object.keys(
-      dlv(state.config, 'theme.screens', dlv(state.config, 'screens', {}))
-    )
+    let screens = Object.keys(dlv(state.config, 'theme.screens', dlv(state.config, 'screens', {})))
 
     matches.forEach((match) => {
       if (screens.includes(match.groups.screen)) {

packages/tailwindcss-language-service/src/diagnostics/getInvalidTailwindDirectiveDiagnostics.ts

@@ -13,7 +13,7 @@ export function getInvalidTailwindDirectiveDiagnostics(
   document: TextDocument,
   settings: Settings
 ): InvalidTailwindDirectiveDiagnostic[] {
-  let severity = settings.lint.invalidTailwindDirective
+  let severity = settings.tailwindCSS.lint.invalidTailwindDirective
   if (severity === 'ignore') return []
 
   let diagnostics: InvalidTailwindDirectiveDiagnostic[] = []

packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts

@@ -12,7 +12,7 @@ export function getInvalidVariantDiagnostics(
   document: TextDocument,
   settings: Settings
 ): InvalidVariantDiagnostic[] {
-  let severity = settings.lint.invalidVariant
+  let severity = settings.tailwindCSS.lint.invalidVariant
   if (severity === 'ignore') return []
 
   let diagnostics: InvalidVariantDiagnostic[] = []
@@ -32,8 +32,7 @@ export function getInvalidVariantDiagnostics(
 
     matches.forEach((match) => {
       let variants = match.groups.variants.split(/(\s*,\s*)/)
-      let listStartIndex =
-        match.index + match[0].length - match.groups.variants.length
+      let listStartIndex = match.index + match[0].length - match.groups.variants.length
 
       for (let i = 0; i < variants.length; i += 2) {
         let variant = variants[i].trim()
@@ -50,8 +49,7 @@ export function getInvalidVariantDiagnostics(
           message += ` Did you mean '${suggestion}'?`
         }
 
-        let variantStartIndex =
-          listStartIndex + variants.slice(0, i).join('').length
+        let variantStartIndex = listStartIndex + variants.slice(0, i).join('').length
 
         diagnostics.push({
           code: DiagnosticKind.InvalidVariant,

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

@@ -18,7 +18,7 @@ export async function getDocumentColors(
   if (!state.enabled) return colors
 
   let settings = await state.editor.getConfiguration(document.uri)
-  if (settings.colorDecorators === false) return colors
+  if (settings.tailwindCSS.colorDecorators === false) return colors
 
   let classLists = await findClassListsInDocument(state, document)
   classLists.forEach((classList) => {