summaryrefslogtreecommitdiff
path: root/packages/cli/src/ui/hooks/useCompletion.ts
diff options
context:
space:
mode:
authorTaylor Mullen <[email protected]>2025-05-15 23:51:53 -0700
committerN. Taylor Mullen <[email protected]>2025-05-16 10:13:13 -0700
commit968e09f0b50d17f7c591baa977666b991a1e59b7 (patch)
treee7d7e6ea7211003074a6b967b3736457972fc927 /packages/cli/src/ui/hooks/useCompletion.ts
parentdce7d2c4f799d537b2be00fe28e2b872550fc77d (diff)
fix: Ensure filename is available for diff rendering in write-file
This commit resolves a bug where the `write-file` operation could fail to render content due to a missing filename. The fix involves: - Ensuring `fileName` is consistently passed to `DiffRenderer.tsx` through `ToolConfirmationMessage.tsx`, `ToolMessage.tsx`, and `useGeminiStream.ts`. - Modifying `edit.ts` and `write-file.ts` to include `fileName` in the `FileDiff` object. - Expanding the `FileDiff` interface in `tools.ts` to include `fileName`. Additionally, this commit enhances the diff rendering by: - Adding syntax highlighting based on file extension in `DiffRenderer.tsx`. - Adding more language mappings to `getLanguageFromExtension` in `DiffRenderer.tsx`. - Added lots of tests for all the above. Fixes https://b.corp.google.com/issues/418125982
Diffstat (limited to 'packages/cli/src/ui/hooks/useCompletion.ts')
-rw-r--r--packages/cli/src/ui/hooks/useCompletion.ts12
1 files changed, 8 insertions, 4 deletions
diff --git a/packages/cli/src/ui/hooks/useCompletion.ts b/packages/cli/src/ui/hooks/useCompletion.ts
index 622dc4c4..9c0c2db1 100644
--- a/packages/cli/src/ui/hooks/useCompletion.ts
+++ b/packages/cli/src/ui/hooks/useCompletion.ts
@@ -7,7 +7,12 @@
import { useState, useEffect, useCallback } from 'react';
import * as fs from 'fs/promises';
import * as path from 'path';
-import { isNodeError, escapePath, unescapePath } from '@gemini-code/server';
+import {
+ isNodeError,
+ escapePath,
+ unescapePath,
+ getErrorMessage,
+} from '@gemini-code/server';
import {
MAX_SUGGESTIONS_TO_SHOW,
Suggestion,
@@ -202,7 +207,7 @@ export function useCompletion(
setActiveSuggestionIndex(filteredSuggestions.length > 0 ? 0 : -1);
setVisibleStartIndex(0);
}
- } catch (error) {
+ } catch (error: unknown) {
if (isNodeError(error) && error.code === 'ENOENT') {
// Directory doesn't exist, likely mid-typing, clear suggestions
if (isMounted) {
@@ -211,8 +216,7 @@ export function useCompletion(
}
} else {
console.error(
- `Error fetching completion suggestions for ${baseDirAbsolute}:`,
- error,
+ `Error fetching completion suggestions for ${baseDirAbsolute}: ${getErrorMessage(error)}`,
);
if (isMounted) {
resetCompletionState();