Ignore comments when matching class attributes (#1202)

Fixes #1200
tailwindlabs · Feb 13, 2025 · 1417211 · smhmd · Feb 13, 2025 · 1417211
1 parent 0aa935b
commit 1417211
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts
@@ -13,7 +13,7 @@ import type { TextDocument } from 'vscode-languageserver-textdocument'
 import dlv from 'dlv'
 import removeMeta from './util/removeMeta'
 import { formatColor, getColor, getColorFromValue } from './util/color'
-import { isHtmlContext } from './util/html'
+import { isHtmlContext, isHtmlDoc, isVueDoc } from './util/html'
 import { isCssContext } from './util/css'
 import { findLast, matchClassAttributes } from './util/find'
 import { stringifyConfigValue, stringifyCss } from './util/stringify'
@@ -728,10 +728,20 @@ async function provideClassAttributeCompletions(
   position: Position,
   context?: CompletionContext,
 ): Promise<CompletionList> {
-  let str = document.getText({
+  let range: Range = {
     start: document.positionAt(Math.max(0, document.offsetAt(position) - SEARCH_RANGE)),
     end: position,
-  })
+  }
+
+  let str: string
+
+  if (isJsDoc(state, document)) {
+    str = getTextWithoutComments(document, 'js', range)
+  } else if (isHtmlDoc(state, document)) {
+    str = getTextWithoutComments(document, 'html', range)
+  } else {
+    str = document.getText(range)
+  }
 
   let settings = (await state.editor.getConfiguration(document.uri)).tailwindCSS
 

diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Prerelease
 
 - Show light color swatch from light-dark() functions ([#1199](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1199))
+- Ignore comments when matching class attributes ([#1202](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1202))
 
 ## 0.14.4