From 14172117ffc8ffe1bd428450876705f12cf4750f Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Thu, 13 Feb 2025 10:14:12 -0500
Subject: [PATCH] Ignore comments when matching class attributes (#1202)

Fixes #1200
---
 .../src/completionProvider.ts                    | 16 +++++++++++++---
 packages/vscode-tailwindcss/CHANGELOG.md         |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts
index b477eec4..c67eb0f5 100644
--- 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
index 6e8e0867..eeb0e532 100644
--- 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