Skip to content

Commit 6fa918c

Browse files
mrubensmrubens
authored
Improve the display of codebase search results (#5571)
1 parent ab55854 commit 6fa918c

File tree

21 files changed

+47
-30
lines changed

21 files changed

+47
-30
lines changed

‎webview-ui/src/components/chat/ChatRow.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,9 +1166,9 @@ export const ChatRowContent = ({
11661166
return <div>Error displaying search results.</div>
11671167
}
11681168

1169-
const { query = "", results = [] } = parsed?.content || {}
1169+
const { results = [] } = parsed?.content || {}
11701170

1171-
return <CodebaseSearchResultsDisplay query={query} results={results} />
1171+
return <CodebaseSearchResultsDisplay results={results} />
11721172
case "user_edit_todos":
11731173
return <UpdateTodoListToolBlock userEdited onChange={() => {}} />
11741174
default:

‎webview-ui/src/components/chat/CodebaseSearchResult.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ const CodebaseSearchResult: React.FC<CodebaseSearchResultProps> = ({ filePath, s
3030
<StandardTooltip content={t("codebaseSearch.resultTooltip", { score: score.toFixed(3) })}>
3131
<div
3232
onClick={handleClick}
33-
className="mb-1 p-2 border border-primary rounded cursor-pointer hover:bg-secondary hover:text-white">
33+
className="p-2 border border-[var(--vscode-editorGroup-border)] cursor-pointer hover:bg-secondary hover:text-white">
3434
<div className="flex gap-2 items-center overflow-hidden">
3535
<span className="text-primary-300 whitespace-nowrap flex-shrink-0">
36-
{filePath.split("/").at(-1)}:{startLine}-{endLine}
36+
{filePath.split("/").at(-1)}:{startLine === endLine ? startLine : `${startLine}-${endLine}`}
3737
</span>
3838
<span className="text-gray-500 truncate min-w-0 flex-1">
3939
{filePath.split("/").slice(0, -1).join("/")}
4040
</span>
41-
<span className="text-xs text-vscode-descriptionForeground bg-vscode-badge-background px-2 py-1 rounded whitespace-nowrap ml-auto">
41+
<span className="text-xs text-vscode-descriptionForeground whitespace-nowrap ml-auto opacity-60">
4242
{score.toFixed(3)}
4343
</span>
4444
</div>

‎webview-ui/src/components/chat/CodebaseSearchResultsDisplay.tsx‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import CodebaseSearchResult from "./CodebaseSearchResult"
33
import { Trans } from "react-i18next"
44

55
interface CodebaseSearchResultsDisplayProps {
6-
query: string
76
results: Array<{
87
filePath: string
98
score: number
@@ -13,26 +12,26 @@ interface CodebaseSearchResultsDisplayProps {
1312
}>
1413
}
1514

16-
const CodebaseSearchResultsDisplay: React.FC<CodebaseSearchResultsDisplayProps> = ({ query, results }) => {
15+
const CodebaseSearchResultsDisplay: React.FC<CodebaseSearchResultsDisplayProps> = ({ results }) => {
1716
const [codebaseSearchResultsExpanded, setCodebaseSearchResultsExpanded] = useState(false)
1817

1918
return (
20-
<div className="flex flex-col gap-2">
19+
<div className="flex flex-col -mt-4 gap-1">
2120
<div
2221
onClick={() => setCodebaseSearchResultsExpanded(!codebaseSearchResultsExpanded)}
23-
className="font-bold cursor-pointer flex items-center justify-between px-2 py-2 rounded border bg-[var(--vscode-editor-background)] border-[var(--vscode-editorGroup-border)]">
22+
className="cursor-pointer flex items-center justify-between px-2 py-2 border bg-[var(--vscode-editor-background)] border-[var(--vscode-editorGroup-border)]">
2423
<span>
2524
<Trans
2625
i18nKey="chat:codebaseSearch.didSearch"
27-
components={{ code: <code></code> }}
28-
values={{ query, count: results.length }}
26+
count={results.length}
27+
values={{ count: results.length }}
2928
/>
3029
</span>
3130
<span className={`codicon codicon-chevron-${codebaseSearchResultsExpanded ? "up" : "down"}`}></span>
3231
</div>
3332

3433
{codebaseSearchResultsExpanded && (
35-
<div className="flex flex-col gap-2">
34+
<div className="flex flex-col gap-1">
3635
{results.map((result, idx) => (
3736
<CodebaseSearchResult
3837
key={idx}

‎webview-ui/src/i18n/locales/ca/chat.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@
297297
"codebaseSearch": {
298298
"wantsToSearch": "Roo vol cercar a la base de codi <code>{{query}}</code>:",
299299
"wantsToSearchWithPath": "Roo vol cercar a la base de codi <code>{{query}}</code> a <code>{{path}}</code>:",
300-
"didSearch": "S'han trobat {{count}} resultat(s) per a <code>{{query}}</code>:",
300+
"didSearch_one": "S'ha trobat 1 resultat",
301+
"didSearch_other": "S'han trobat {{count}} resultats",
301302
"resultTooltip": "Puntuació de similitud: {{score}} (fes clic per obrir el fitxer)"
302303
},
303304
"read-batch": {

‎webview-ui/src/i18n/locales/de/chat.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@
297297
"codebaseSearch": {
298298
"wantsToSearch": "Roo möchte den Codebase nach <code>{{query}}</code> durchsuchen:",
299299
"wantsToSearchWithPath": "Roo möchte den Codebase nach <code>{{query}}</code> in <code>{{path}}</code> durchsuchen:",
300-
"didSearch": "{{count}} Ergebnis(se) für <code>{{query}}</code> gefunden:",
300+
"didSearch_one": "1 Ergebnis gefunden",
301+
"didSearch_other": "{{count}} Ergebnisse gefunden",
301302
"resultTooltip": "Ähnlichkeitswert: {{score}} (klicken zum Öffnen der Datei)"
302303
},
303304
"read-batch": {

‎webview-ui/src/i18n/locales/en/chat.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@
202202
"codebaseSearch": {
203203
"wantsToSearch": "Roo wants to search the codebase for <code>{{query}}</code>:",
204204
"wantsToSearchWithPath": "Roo wants to search the codebase for <code>{{query}}</code> in <code>{{path}}</code>:",
205-
"didSearch": "Found {{count}} result(s) for <code>{{query}}</code>:",
205+
"didSearch_one": "Found 1 result",
206+
"didSearch_other": "Found {{count}} results",
206207
"resultTooltip": "Similarity score: {{score}} (click to open file)"
207208
},
208209
"commandOutput": "Command Output",

‎webview-ui/src/i18n/locales/es/chat.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@
297297
"codebaseSearch": {
298298
"wantsToSearch": "Roo quiere buscar en la base de código <code>{{query}}</code>:",
299299
"wantsToSearchWithPath": "Roo quiere buscar en la base de código <code>{{query}}</code> en <code>{{path}}</code>:",
300-
"didSearch": "Se encontraron {{count}} resultado(s) para <code>{{query}}</code>:",
300+
"didSearch_one": "Se encontró 1 resultado",
301+
"didSearch_other": "Se encontraron {{count}} resultados",
301302
"resultTooltip": "Puntuación de similitud: {{score}} (haz clic para abrir el archivo)"
302303
},
303304
"read-batch": {

‎webview-ui/src/i18n/locales/fr/chat.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@
297297
"codebaseSearch": {
298298
"wantsToSearch": "Roo veut rechercher dans la base de code <code>{{query}}</code> :",
299299
"wantsToSearchWithPath": "Roo veut rechercher dans la base de code <code>{{query}}</code> dans <code>{{path}}</code> :",
300-
"didSearch": "{{count}} résultat(s) trouvé(s) pour <code>{{query}}</code> :",
300+
"didSearch_one": "1 résultat trouvé",
301+
"didSearch_other": "{{count}} résultats trouvés",
301302
"resultTooltip": "Score de similarité : {{score}} (cliquer pour ouvrir le fichier)"
302303
},
303304
"read-batch": {

‎webview-ui/src/i18n/locales/hi/chat.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@
297297
"codebaseSearch": {
298298
"wantsToSearch": "Roo कोडबेस में <code>{{query}}</code> खोजना चाहता है:",
299299
"wantsToSearchWithPath": "Roo <code>{{path}}</code> में कोडबेस में <code>{{query}}</code> खोजना चाहता है:",
300-
"didSearch": "<code>{{query}}</code> के लिए {{count}} परिणाम मिले:",
300+
"didSearch_one": "1 परिणाम मिला",
301+
"didSearch_other": "{{count}} परिणाम मिले",
301302
"resultTooltip": "समानता स्कोर: {{score}} (फ़ाइल खोलने के लिए क्लिक करें)"
302303
},
303304
"read-batch": {

‎webview-ui/src/i18n/locales/id/chat.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@
208208
"codebaseSearch": {
209209
"wantsToSearch": "Roo ingin mencari codebase untuk <code>{{query}}</code>:",
210210
"wantsToSearchWithPath": "Roo ingin mencari codebase untuk <code>{{query}}</code> di <code>{{path}}</code>:",
211-
"didSearch": "Ditemukan {{count}} hasil untuk <code>{{query}}</code>:",
211+
"didSearch_one": "Ditemukan 1 hasil",
212+
"didSearch_other": "Ditemukan {{count}} hasil",
212213
"resultTooltip": "Skor kemiripan: {{score}} (klik untuk membuka file)"
213214
},
214215
"commandOutput": "Output Perintah",

0 commit comments

Comments
 (0)