Remove all other usages of fuse.js

webview-ui/src/components/settings/OpenAiModelPicker.tsx

@@ -1,11 +1,10 @@
 import { VSCodeLink, VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
-import Fuse from "fuse.js"
+import { Fzf } from "fzf"
 import React, { KeyboardEvent, memo, useEffect, useMemo, useRef, useState } from "react"
 import { useRemark } from "react-remark"
 import styled from "styled-components"
 import { useExtensionState } from "../../context/ExtensionStateContext"
 import { vscode } from "../../utils/vscode"
-import { highlight } from "../history/HistoryView"
 
 const OpenAiModelPicker: React.FC = () => {
 	const { apiConfiguration, setApiConfiguration, openAiModels, onUpdateApiConfig } = useExtensionState()
@@ -71,25 +70,66 @@ const OpenAiModelPicker: React.FC = () => {
 		}))
 	}, [modelIds])
 
-	const fuse = useMemo(() => {
-		return new Fuse(searchableItems, {
-			keys: ["html"], // highlight function will update this
-			threshold: 0.6,
-			shouldSort: true,
-			isCaseSensitive: false,
-			ignoreLocation: false,
-			includeMatches: true,
-			minMatchCharLength: 1,
+	const highlightFzfMatch = (text: string, positions: number[]) => {
+		if (!positions.length) return text
+
+		const parts: { text: string; highlight: boolean }[] = []
+		let lastIndex = 0
+
+		// Sort positions to ensure we process them in order
+		positions.sort((a, b) => a - b)
+
+		positions.forEach((pos) => {
+			// Add non-highlighted text before this position
+			if (pos > lastIndex) {
+				parts.push({
+					text: text.substring(lastIndex, pos),
+					highlight: false
+				})
+			}
+
+			// Add highlighted character
+			parts.push({
+				text: text[pos],
+				highlight: true
+			})
+
+			lastIndex = pos + 1
+		})
+
+		// Add any remaining text
+		if (lastIndex < text.length) {
+			parts.push({
+				text: text.substring(lastIndex),
+				highlight: false
+			})
+		}
+
+		// Build final string
+		return parts
+			.map(part =>
+				part.highlight
+					? `<span class="model-item-highlight">${part.text}</span>`
+					: part.text
+			)
+			.join('')
+	}
+
+	const fzf = useMemo(() => {
+		return new Fzf(searchableItems, {
+			selector: item => item.html
 		})
 	}, [searchableItems])
 
 	const modelSearchResults = useMemo(() => {
-		let results: { id: string; html: string }[] = searchTerm
-			? highlight(fuse.search(searchTerm), "model-item-highlight")
-			: searchableItems
-		// results.sort((a, b) => a.id.localeCompare(b.id)) NOTE: sorting like this causes ids in objects to be reordered and mismatched
-		return results
-	}, [searchableItems, searchTerm, fuse])
+		if (!searchTerm) return searchableItems
+
+		const searchResults = fzf.find(searchTerm)
+		return searchResults.map(result => ({
+			...result.item,
+			html: highlightFzfMatch(result.item.html, Array.from(result.positions))
+		}))
+	}, [searchableItems, searchTerm, fzf])
 
 	const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
 		if (!isDropdownVisible) return