summaryrefslogtreecommitdiff
path: root/packages/cli/src/ui/components/messages/DiffRenderer.tsx
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/components/messages/DiffRenderer.tsx
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/components/messages/DiffRenderer.tsx')
-rw-r--r--packages/cli/src/ui/components/messages/DiffRenderer.tsx33
1 files changed, 23 insertions, 10 deletions
diff --git a/packages/cli/src/ui/components/messages/DiffRenderer.tsx b/packages/cli/src/ui/components/messages/DiffRenderer.tsx
index a9afeca3..4baed3e8 100644
--- a/packages/cli/src/ui/components/messages/DiffRenderer.tsx
+++ b/packages/cli/src/ui/components/messages/DiffRenderer.tsx
@@ -105,6 +105,14 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
const parsedLines = parseDiffWithLineNumbers(diffContent);
+ if (parsedLines.length === 0) {
+ return (
+ <Box borderStyle="round" borderColor={Colors.SubtleComment} padding={1}>
+ <Text dimColor>No changes detected.</Text>
+ </Box>
+ );
+ }
+
// Check if the diff represents a new file (only additions and header lines)
const isNewFile = parsedLines.every(
(line) =>
@@ -233,16 +241,21 @@ const renderDiffContent = (
const getLanguageFromExtension = (extension: string): string | null => {
const languageMap: { [key: string]: string } = {
- '.js': 'javascript',
- '.ts': 'typescript',
- '.py': 'python',
- '.json': 'json',
- '.css': 'css',
- '.html': 'html',
- '.sh': 'bash',
- '.md': 'markdown',
- '.yaml': 'yaml',
- '.yml': 'yaml',
+ js: 'javascript',
+ ts: 'typescript',
+ py: 'python',
+ json: 'json',
+ css: 'css',
+ html: 'html',
+ sh: 'bash',
+ md: 'markdown',
+ yaml: 'yaml',
+ yml: 'yaml',
+ txt: 'plaintext',
+ java: 'java',
+ c: 'c',
+ cpp: 'cpp',
+ rb: 'ruby',
};
return languageMap[extension] || null; // Return null if extension not found
};