@unocss/autocomplete 0.59.0-beta.1 → 0.59.0

package/dist/index.d.mts

@@ -24,7 +24,7 @@ interface ParsedAutocompleteTemplate {
 }
 interface UnocssAutocomplete {
     suggest: (input: string, allowsEmptyInput?: boolean) => Promise<string[]>;
-    suggestInFile: (content: string, cursor: number) => Promise<SuggestResult>;
+    suggestInFile: (content: string, cursor: number) => Promise<SuggestResult | undefined>;
     templates: (string | AutoCompleteFunction)[];
     cache: LRUCache<string, string[]>;
     reset: () => void;
@@ -37,11 +37,11 @@ declare const shorthands: Record<string, string>;
 declare const ignoredThemeKeys: string[];
 declare function parseAutocomplete(template: string, theme?: any, extraShorthands?: Record<string, string>): ParsedAutocompleteTemplate;
 
-declare function searchUsageBoundary(line: string, index: number): {
+declare function searchUsageBoundary(line: string, index: number, attributify?: boolean): {
     content: string;
     start: number;
     end: number;
-};
+} | undefined;
 declare function searchAttrKey(content: string, cursor: number): string | undefined;
 declare function cartesian<T>(arr: T[][]): T[][];
 

package/dist/index.d.ts

@@ -24,7 +24,7 @@ interface ParsedAutocompleteTemplate {
 }
 interface UnocssAutocomplete {
     suggest: (input: string, allowsEmptyInput?: boolean) => Promise<string[]>;
-    suggestInFile: (content: string, cursor: number) => Promise<SuggestResult>;
+    suggestInFile: (content: string, cursor: number) => Promise<SuggestResult | undefined>;
     templates: (string | AutoCompleteFunction)[];
     cache: LRUCache<string, string[]>;
     reset: () => void;
@@ -37,11 +37,11 @@ declare const shorthands: Record<string, string>;
 declare const ignoredThemeKeys: string[];
 declare function parseAutocomplete(template: string, theme?: any, extraShorthands?: Record<string, string>): ParsedAutocompleteTemplate;
 
-declare function searchUsageBoundary(line: string, index: number): {
+declare function searchUsageBoundary(line: string, index: number, attributify?: boolean): {
     content: string;
     start: number;
     end: number;
-};
+} | undefined;
 declare function searchAttrKey(content: string, cursor: number): string | undefined;
 declare function cartesian<T>(arr: T[][]): T[][];
 

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { uniq, escapeRegExp, toArray } from '@unocss/core';
 import { LRUCache } from 'lru-cache';
 import { Fzf, byStartAsc, byLengthAsc } from 'fzf';
 
-function searchUsageBoundary(line, index) {
+function searchUsageBoundary(line, index, attributify = true) {
   let start = index;
   let end = index;
   const regex = /[^\s>"'`;]/;
@@ -10,11 +10,40 @@ function searchUsageBoundary(line, index) {
     --start;
   while (end < line.length && regex.test(line.charAt(end)))
     ++end;
-  return {
-    content: line.slice(start, end),
-    start,
-    end
-  };
+  if (attributify) {
+    return {
+      content: line.slice(start, end),
+      start,
+      end
+    };
+  }
+  let temp = start - 1;
+  const matchClassText = "class";
+  const matchClassNameText = "className";
+  while (temp > matchClassText.length && !/[="{}><]/.test(line[temp--])) {
+  }
+  if (line[temp] !== "=")
+    return;
+  if (temp > matchClassNameText.length) {
+    const data = line.slice(temp - matchClassNameText.length, temp);
+    if (data === matchClassNameText) {
+      return {
+        content: line.slice(start, end),
+        start,
+        end
+      };
+    }
+  }
+  if (temp > matchClassText.length) {
+    const data = line.slice(temp - matchClassText.length, temp);
+    if (data === matchClassText) {
+      return {
+        content: line.slice(start, end),
+        start,
+        end
+      };
+    }
+  }
 }
 function searchAttrKey(content, cursor) {
   const text = content.substring(0, cursor);
@@ -291,7 +320,13 @@ function createAutocomplete(uno, options = {}) {
         resolveReplacement: byExtractor.resolveReplacement
       };
     }
-    const regular = searchUsageBoundary(content, cursor);
+    const regular = searchUsageBoundary(
+      content,
+      cursor,
+      (uno.config.presets || []).some((i) => i.name === "@unocss/preset-attributify")
+    );
+    if (!regular)
+      return;
     const suggestions = await suggest(regular.content, isInsideAttrValue);
     return {
       suggestions: suggestions.map((v) => [v, v]),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/autocomplete",
   "type": "module",
-  "version": "0.59.0-beta.1",
+  "version": "0.59.0",
   "description": "Autocomplete utils for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "lru-cache": "^10.2.0"
   },
   "devDependencies": {
-    "@unocss/core": "0.59.0-beta.1"
+    "@unocss/core": "0.59.0"
   },
   "scripts": {
     "build": "unbuild",