Home

tailwind-ctp-intellisense @master - refs - log -
-
https://git.jolheiser.com/tailwind-ctp-intellisense.git
Tailwind intellisense + Catppuccin
tree log patch
Improve conflict diagnostics (#503)
Signature
-----BEGIN PGP SIGNATURE----- wsBcBAABCAAQBQJiIjM4CRBK7hj4Ov3rIwAAZkcIAKSqXRVsqhDX4wr46GCYokRC jd0B7VhSDLdzqLf9AQyZuv8fapwNuD/XD448iOtIApUEHCuWezlsBkyHQdqbH0DE +mH7LCIsHkzpY9j2UwsLqu/hi34jtunf5Rzm564iHHe7BU3fUXUSrAg1zSvx0MWF TIG8Fb0Wn/QowzskqFhmVK9qZwD8Awbz+FbP0og5fC3mnJzc2W0JvfYZhf0qTVth nfXZ1xqjPApsyf6WzVii6JIz3B67zYgHHUf1gBlpfA7Kgp4cZiPlJifoLu72PDCg 1b9tlwI8HPgM9mY+v9WBbjaNuPt7Unz07V4a5k+gDb+R+m/v4AhRih5fYt13bDk= =QQDj -----END PGP SIGNATURE-----
Brad Cornes <hello@bradley.dev>
3 years ago
4 changed files, 105 additions(+), 51 deletions(-)
packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.tspackages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.tspackages/tailwindcss-language-service/src/documentColorProvider.tspackages/tailwindcss-language-service/src/util/find.ts
M packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.tspackages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
diff --git a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
index 4459d249bed274dee0a18fe58c3db84f9574acf2..e73aab6ccf35957193efb9b05ab017f26202dad9 100644
--- a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
+++ b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
@@ -20,7 +20,9 @@   let diagnostics: CssConflictDiagnostic[] = []
   const classLists = await findClassListsInDocument(state, document)
 
   classLists.forEach((classList) => {
-    const classNames = getClassNamesInClassList(classList)
+    const classNames = Array.isArray(classList)
+      ? classList.flatMap(getClassNamesInClassList)
+      : getClassNamesInClassList(classList)
 
     classNames.forEach((className, index) => {
       if (state.jit) {
M packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.tspackages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
diff --git a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts
index 236195719ef87e1f693a7ccb1e2f23ad0ccd5652..51e8e82121e37d54f42458b702341285e167b3fd 100644
--- a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts
+++ b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts
@@ -22,7 +22,7 @@
   let diagnostics: RecommendedVariantOrderDiagnostic[] = []
   const classLists = await findClassListsInDocument(state, document)
 
-  classLists.forEach((classList) => {
+  classLists.flat().forEach((classList) => {
     const classNames = getClassNamesInClassList(classList)
     classNames.forEach((className) => {
       let { rules } = jit.generateRules(state, [className.className])
M packages/tailwindcss-language-service/src/documentColorProvider.tspackages/tailwindcss-language-service/src/documentColorProvider.ts
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
diff --git a/packages/tailwindcss-language-service/src/documentColorProvider.ts b/packages/tailwindcss-language-service/src/documentColorProvider.ts
index 081d1c0c8086a553d36727711fb0aae744d38ca9..f40b93a64449d0f47a95584c7e7e791a894c1e19 100644
--- a/packages/tailwindcss-language-service/src/documentColorProvider.ts
+++ b/packages/tailwindcss-language-service/src/documentColorProvider.ts
@@ -20,7 +20,7 @@   let settings = await state.editor.getConfiguration(document.uri)
   if (settings.tailwindCSS.colorDecorators === false) return colors
 
   let classLists = await findClassListsInDocument(state, document)
-  classLists.forEach((classList) => {
+  classLists.flat().forEach((classList) => {
     let classNames = getClassNamesInClassList(classList)
     classNames.forEach((className) => {
       let color = getColor(state, className.className)
M packages/tailwindcss-language-service/src/util/find.tspackages/tailwindcss-language-service/src/util/find.ts
  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
diff --git a/packages/tailwindcss-language-service/src/util/find.ts b/packages/tailwindcss-language-service/src/util/find.ts
index b52d6855d9601da03d4f73c625daf512b482e902..847191039fac5c6cf04b1a2d99792709ffc395e3 100644
--- a/packages/tailwindcss-language-service/src/util/find.ts
+++ b/packages/tailwindcss-language-service/src/util/find.ts
@@ -77,7 +77,15 @@   mode?: 'html' | 'css',
   includeCustom: boolean = true
 ): Promise<DocumentClassName[]> {
   const classLists = await findClassListsInRange(state, doc, range, mode, includeCustom)
-  return flatten(classLists.map(getClassNamesInClassList))
+  return flatten(
+    classLists.flatMap((classList) => {
+      if (Array.isArray(classList)) {
+        return classList.map(getClassNamesInClassList)
+      } else {
+        return [getClassNamesInClassList(classList)]
+      }
+    })
+  )
 }
 
 export async function findClassNamesInDocument(
@@ -85,7 +93,15 @@   state: State,
   doc: TextDocument
 ): Promise<DocumentClassName[]> {
   const classLists = await findClassListsInDocument(state, doc)
-  return flatten(classLists.map(getClassNamesInClassList))
+  return flatten(
+    classLists.flatMap((classList) => {
+      if (Array.isArray(classList)) {
+        return classList.map(getClassNamesInClassList)
+      } else {
+        return [getClassNamesInClassList(classList)]
+      }
+    })
+  )
 }
 
 export function findClassListsInCssRange(doc: TextDocument, range?: Range): DocumentClassList[] {
@@ -182,7 +198,7 @@ export async function findClassListsInHtmlRange(
   state: State,
   doc: TextDocument,
   range?: Range
-): Promise<DocumentClassList[]> {
+): Promise<Array<DocumentClassList | DocumentClassList[]>> {
   const text = doc.getText(range)
 
   const matches = matchClassAttributes(
@@ -190,7 +206,7 @@     text,
     (await state.editor.getConfiguration(doc.uri)).tailwindCSS.classAttributes
   )
 
-  const result: DocumentClassList[] = []
+  const result: Array<DocumentClassList | DocumentClassList[]> = []
 
   matches.forEach((match) => {
     const subtext = text.substr(match.index + match[0].length - 1)
@@ -201,9 +217,11 @@         ? getComputedClassAttributeLexer()
         : getClassAttributeLexer()
     lexer.reset(subtext)
 
-    let classLists: { value: string; offset: number }[] = []
-    let token: moo.Token
+    let classLists: Array<{ value: string; offset: number } | { value: string; offset: number }[]> =
+      []
+    let rootClassList: { value: string; offset: number }[] = []
     let currentClassList: { value: string; offset: number }
+    let depth = 0
 
     try {
       for (let token of lexer) {
@@ -218,56 +236,53 @@             }
           }
         } else {
           if (currentClassList) {
-            classLists.push({
-              value: currentClassList.value,
-              offset: currentClassList.offset,
-            })
+            if (depth === 0) {
+              rootClassList.push({
+                value: currentClassList.value,
+                offset: currentClassList.offset,
+              })
+            } else {
+              classLists.push({
+                value: currentClassList.value,
+                offset: currentClassList.offset,
+              })
+            }
           }
           currentClassList = undefined
         }
+        if (token.type === 'lbrace') {
+          depth += 1
+        } else if (token.type === 'rbrace') {
+          depth -= 1
+        }
       }
     } catch (_) {}
 
     if (currentClassList) {
-      classLists.push({
-        value: currentClassList.value,
-        offset: currentClassList.offset,
-      })
+      if (depth === 0) {
+        rootClassList.push({
+          value: currentClassList.value,
+          offset: currentClassList.offset,
+        })
+      } else {
+        classLists.push({
+          value: currentClassList.value,
+          offset: currentClassList.offset,
+        })
+      }
     }
 
+    classLists.push(rootClassList)
+
     result.push(
       ...classLists
-        .map(({ value, offset }) => {
-          if (value.trim() === '') {
-            return null
-          }
-
-          const before = value.match(/^\s*/)
-          const beforeOffset = before === null ? 0 : before[0].length
-          const after = value.match(/\s*$/)
-          const afterOffset = after === null ? 0 : -after[0].length
-
-          const start = indexToPosition(
-            text,
-            match.index + match[0].length - 1 + offset + beforeOffset
-          )
-          const end = indexToPosition(
-            text,
-            match.index + match[0].length - 1 + offset + value.length + afterOffset
-          )
-
-          return {
-            classList: value.substr(beforeOffset, value.length + afterOffset),
-            range: {
-              start: {
-                line: (range?.start.line || 0) + start.line,
-                character: (end.line === 0 ? range?.start.character || 0 : 0) + start.character,
-              },
-              end: {
-                line: (range?.start.line || 0) + end.line,
-                character: (end.line === 0 ? range?.start.character || 0 : 0) + end.character,
-              },
-            },
+        .map((classList) => {
+          if (Array.isArray(classList)) {
+            return classList
+              .map((classList) => resolveClassList(classList, text, match, range))
+              .filter((x) => x !== null)
+          } else {
+            return resolveClassList(classList, text, match, range)
           }
         })
         .filter((x) => x !== null)
@@ -277,14 +292,51 @@
   return result
 }
 
+function resolveClassList(
+  classList: { value: string; offset: number },
+  text: string,
+  match: RegExpMatchArray,
+  range?: Range
+): DocumentClassList {
+  let { value, offset } = classList
+  if (value.trim() === '') {
+    return null
+  }
+
+  const before = value.match(/^\s*/)
+  const beforeOffset = before === null ? 0 : before[0].length
+  const after = value.match(/\s*$/)
+  const afterOffset = after === null ? 0 : -after[0].length
+
+  const start = indexToPosition(text, match.index + match[0].length - 1 + offset + beforeOffset)
+  const end = indexToPosition(
+    text,
+    match.index + match[0].length - 1 + offset + value.length + afterOffset
+  )
+
+  return {
+    classList: value.substr(beforeOffset, value.length + afterOffset),
+    range: {
+      start: {
+        line: (range?.start.line || 0) + start.line,
+        character: (end.line === 0 ? range?.start.character || 0 : 0) + start.character,
+      },
+      end: {
+        line: (range?.start.line || 0) + end.line,
+        character: (end.line === 0 ? range?.start.character || 0 : 0) + end.character,
+      },
+    },
+  }
+}
+
 export async function findClassListsInRange(
   state: State,
   doc: TextDocument,
   range?: Range,
   mode?: 'html' | 'css',
   includeCustom: boolean = true
-): Promise<DocumentClassList[]> {
-  let classLists: DocumentClassList[]
+): Promise<Array<DocumentClassList | DocumentClassList[]>> {
+  let classLists: Array<DocumentClassList | DocumentClassList[]>
   if (mode === 'css') {
     classLists = findClassListsInCssRange(doc, range)
   } else {
@@ -296,7 +348,7 @@
 export async function findClassListsInDocument(
   state: State,
   doc: TextDocument
-): Promise<DocumentClassList[]> {
+): Promise<Array<DocumentClassList | DocumentClassList[]>> {
   if (isCssDoc(state, doc)) {
     return findClassListsInCssRange(doc)
   }