Fix(diff): Hide whitespace changes in diffs with content changes

- Updated the diff generation in `edit.ts` and `write-file.ts` to include the `ignoreWhitespace: true` option.
- This ensures that whitespace-only changes are not highlighted in the diff output when there are other content modifications, making the diffs cleaner and easier to review.
- Extract default diffing options into single source of truth.

Fixes https://github.com/google-gemini/gemini-cli/issues/548

1 files changed, 3 insertions, 2 deletions

diff --git a/packages/server/src/tools/write-file.ts b/packages/server/src/tools/write-file.ts
index 6c0b7d72..60646cc2 100644
--- a/packages/server/src/tools/write-file.ts
+++ b/packages/server/src/tools/write-file.ts
@@ -24,6 +24,7 @@ import {
   ensureCorrectFileContent,
 } from '../utils/editCorrector.js';
 import { GeminiClient } from '../core/client.js';
+import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
 
 /**
  * Parameters for the WriteFile tool
@@ -173,7 +174,7 @@ export class WriteFileTool extends BaseTool<WriteFileToolParams, ToolResult> {
       correctedContent, // Content after potential correction
       'Current',
       'Proposed',
-      { context: 3 },
+      DEFAULT_DIFF_OPTIONS,
     );
 
     const confirmationDetails: ToolEditConfirmationDetails = {
@@ -251,7 +252,7 @@ export class WriteFileTool extends BaseTool<WriteFileToolParams, ToolResult> {
         fileContent,
         'Original',
         'Written',
-        { context: 3 },
+        DEFAULT_DIFF_OPTIONS,
       );
 
       const llmSuccessMessage = isNewFile