[ide-mode] Hide diff options when active diff is not focused #5808

chrstnb · 2025-08-07T22:19:50Z

TLDR

When the active diff is not focussed, we should not show the options in the toolbar nor be using cmd+s to accept changes.

Dive Deeper

Reviewer Test Plan

Screen.Recording.2025-08-07.at.6.16.11.PM.mov

Testing Matrix

	🍏	🪟	🐧
npm run	❓	❓	❓
npx	❓	❓	❓
Docker	❓	❓	❓
Podman	❓	-	-
Seatbelt	❓	-	-

Linked issues / bugs

gemini-code-assist

Summary of Changes

Hello @chrstnb, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

I've made changes to the IDE's diff mode to improve the user experience by ensuring that diff-specific options and behaviors are only active when a diff view is actually in focus. This prevents cluttering the UI or enabling unintended shortcuts when the user is working in other parts of the editor. My goal is to make the interface more intuitive and less distracting by dynamically adapting to the user's current context.

Highlights

Contextual UI Visibility: I've implemented logic to dynamically control the visibility of diff-related UI elements and command availability based on whether an active diff editor is currently focused. This prevents showing irrelevant options when the user is not interacting with a diff.
New Context Management Method: I introduced a new updateDiffContext method that checks the active text editor. If it's a diff document managed by the system, a VS Code context variable gemini.diff.isVisible is set to true; otherwise, it's set to false.
Real-time Context Updates: The updateDiffContext method is now called immediately upon DiffManager initialization and whenever the active text editor changes, ensuring the context is always up-to-date.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in issue comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments or fill out our survey to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request aims to hide diff-related UI options when a diff view is not in focus. The implementation correctly uses VS Code's context mechanism to control UI visibility based on the active text editor. However, the change introduces a memory leak by not properly managing the lifecycle of an event listener. I've provided a high-severity comment detailing the issue and a recommended approach to fix it.

packages/vscode-ide-companion/src/diff-manager.ts

github-actions · 2025-08-07T22:23:30Z

Code Coverage Summary

Package	Lines	Statements	Functions	Branches
CLI	74.07%	74.07%	81.48%	80.47%
Core	74%	74%	74.05%	82.69%

CLI Package - Full Text Report

-------------------|---------|----------|---------|---------|-------------------
File               | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s 
-------------------|---------|----------|---------|---------|-------------------
All files          |   74.07 |    80.47 |   81.48 |   74.07 |                   
 src               |    55.9 |       74 |   66.66 |    55.9 |                   
  gemini.tsx       |   32.17 |    58.82 |      50 |   32.17 | ...87-300,310-327 
  ...ractiveCli.ts |   93.27 |    71.42 |     100 |   93.27 | ...,71-73,119,122 
  ...ActiveAuth.ts |     100 |      100 |     100 |     100 |                   
 src/acp           |    1.71 |        0 |       0 |    1.71 |                   
  acp.ts           |    2.79 |        0 |       0 |    2.79 | ...98-225,228-271 
  acpPeer.ts       |    1.38 |        0 |       0 |    1.38 | 33-48,51-677      
 src/commands      |   94.11 |      100 |      50 |   94.11 |                   
  mcp.ts           |   94.11 |      100 |      50 |   94.11 | 26                
 src/commands/mcp  |   95.49 |    80.43 |    90.9 |   95.49 |                   
  add.ts           |   97.26 |    85.71 |     100 |   97.26 | 109-112,119       
  list.ts          |   90.56 |    80.76 |      80 |   90.56 | ...10-112,137-138 
  remove.ts        |     100 |    66.66 |     100 |     100 | 19-23             
 src/config        |   87.69 |    80.17 |   85.29 |   87.69 |                   
  auth.ts          |     100 |      100 |     100 |     100 |                   
  config.ts        |   97.35 |     86.9 |      70 |   97.35 | ...87,338,531-535 
  extension.ts     |   82.53 |    84.37 |     100 |   82.53 | ...99-103,112-113 
  sandboxConfig.ts |   51.35 |    16.66 |   66.66 |   51.35 | ...43,53-69,74-91 
  settings.ts      |   83.57 |    77.52 |   93.33 |   83.57 | ...73-474,534-535 
 src/generated     |     100 |      100 |     100 |     100 |                   
  git-commit.ts    |     100 |      100 |     100 |     100 |                   
 src/patches       |       0 |        0 |       0 |       0 |                   
  is-in-ci.ts      |       0 |        0 |       0 |       0 | 1-17              
 src/services      |   61.08 |    88.13 |   72.22 |   61.08 |                   
  ...mandLoader.ts |     100 |      100 |     100 |     100 |                   
  ...andService.ts |     100 |      100 |     100 |     100 |                   
  ...mandLoader.ts |   92.09 |    91.89 |     100 |   92.09 | 176-181,250-257   
  ...omptLoader.ts |    9.39 |    57.14 |   33.33 |    9.39 | ...44-167,173-230 
  types.ts         |       0 |        0 |       0 |       0 | 1                 
 ...mpt-processors |   95.18 |    94.73 |     100 |   95.18 |                   
  ...tProcessor.ts |     100 |      100 |     100 |     100 |                   
  ...lProcessor.ts |   93.54 |    92.85 |     100 |   93.54 | 67-70             
  types.ts         |     100 |      100 |     100 |     100 |                   
 src/test-utils    |   90.38 |    81.81 |      75 |   90.38 |                   
  ...omMatchers.ts |   69.69 |       50 |      50 |   69.69 | 30-33,35-37,43-45 
  ...andContext.ts |     100 |      100 |     100 |     100 |                   
 src/ui            |   57.77 |    67.54 |   67.74 |   57.77 |                   
  App.tsx          |   56.54 |    60.63 |      50 |   56.54 | ...1053,1078-1107 
  ...tionNudge.tsx |    8.16 |      100 |       0 |    8.16 | 22-70             
  colors.ts        |   87.75 |      100 |      80 |   87.75 | 12-13,18-19,48-49 
  constants.ts     |     100 |      100 |     100 |     100 |                   
  ...tic-colors.ts |   89.47 |      100 |      80 |   89.47 | 15-16             
  types.ts         |     100 |      100 |     100 |     100 |                   
 src/ui/commands   |   87.38 |    84.54 |   90.38 |   87.38 |                   
  aboutCommand.ts  |     100 |    55.55 |     100 |     100 | 23-30             
  authCommand.ts   |     100 |      100 |     100 |     100 |                   
  bugCommand.ts    |   78.46 |    42.85 |     100 |   78.46 | 32-35,72-81       
  chatCommand.ts   |    93.6 |    84.44 |     100 |    93.6 | ...83-184,186-187 
  clearCommand.ts  |     100 |      100 |     100 |     100 |                   
  ...essCommand.ts |     100 |    88.88 |     100 |     100 | 69                
  copyCommand.ts   |     100 |      100 |     100 |     100 |                   
  corgiCommand.ts  |     100 |      100 |     100 |     100 |                   
  ...ryCommand.tsx |   70.48 |       72 |     100 |   70.48 | ...22-123,160-168 
  docsCommand.ts   |     100 |      100 |     100 |     100 |                   
  editorCommand.ts |     100 |      100 |     100 |     100 |                   
  ...onsCommand.ts |     100 |      100 |     100 |     100 |                   
  helpCommand.ts   |     100 |      100 |     100 |     100 |                   
  ideCommand.ts    |   70.44 |       90 |   57.14 |   70.44 | ...42-152,160-170 
  initCommand.ts   |     100 |      100 |     100 |     100 |                   
  mcpCommand.ts    |   82.21 |    82.95 |   83.33 |   82.21 | ...83-384,434-441 
  memoryCommand.ts |   99.09 |    92.85 |     100 |   99.09 | 93                
  ...acyCommand.ts |     100 |      100 |     100 |     100 |                   
  quitCommand.ts   |     100 |      100 |     100 |     100 |                   
  ...oreCommand.ts |   93.79 |    91.42 |     100 |   93.79 | 54-55,84-89       
  ...hubCommand.ts |   89.53 |    55.55 |     100 |   89.53 | 52-55,62-66       
  statsCommand.ts  |   84.48 |       75 |     100 |   84.48 | 24-32             
  themeCommand.ts  |     100 |      100 |     100 |     100 |                   
  toolsCommand.ts  |     100 |      100 |     100 |     100 |                   
  types.ts         |     100 |      100 |     100 |     100 |                   
  vimCommand.ts    |   44.44 |      100 |       0 |   44.44 | 14-24             
 src/ui/components |   67.35 |     82.7 |   69.76 |   67.35 |                   
  AboutBox.tsx     |     100 |       50 |     100 |     100 | 102               
  AsciiArt.ts      |     100 |      100 |     100 |     100 |                   
  AuthDialog.tsx   |   89.78 |    96.42 |   66.66 |   89.78 | 68-73,102-109     
  ...nProgress.tsx |   15.78 |      100 |       0 |   15.78 | 17-58             
  ...Indicator.tsx |   15.15 |      100 |       0 |   15.15 | 17-47             
  ...ryDisplay.tsx |   89.47 |    33.33 |     100 |   89.47 | 20-21             
  ...ryDisplay.tsx |   92.04 |    94.44 |     100 |   92.04 | 79-84,89          
  ...geDisplay.tsx |     100 |      100 |     100 |     100 |                   
  ...gProfiler.tsx |    23.8 |      100 |       0 |    23.8 | 12-32             
  ...esDisplay.tsx |   10.52 |      100 |       0 |   10.52 | 24-82             
  ...ngsDialog.tsx |    6.76 |      100 |       0 |    6.76 | 26-168            
  Footer.tsx       |   75.92 |       70 |     100 |   75.92 | ...07-112,131-138 
  ...ngSpinner.tsx |      80 |    33.33 |     100 |      80 | 29,31-32          
  Header.tsx       |   78.72 |    57.14 |     100 |   78.72 | 36-39,51-53,60-62 
  Help.tsx         |    3.27 |      100 |       0 |    3.27 | 17-173            
  ...emDisplay.tsx |      70 |    56.25 |     100 |      70 | ...59-64,84-91,94 
  ...ilDisplay.tsx |     100 |    85.71 |     100 |     100 | 41,49             
  InputPrompt.tsx  |   86.05 |    80.68 |     100 |   86.05 | ...28-430,526-530 
  ...Indicator.tsx |     100 |      100 |     100 |     100 |                   
  ...geDisplay.tsx |   25.92 |      100 |       0 |   25.92 | 14-36             
  ...tsDisplay.tsx |     100 |      100 |     100 |     100 |                   
  PrepareLabel.tsx |      60 |       80 |     100 |      60 | 35-48             
  ...ryDisplay.tsx |     100 |      100 |     100 |     100 |                   
  ...ionDialog.tsx |   85.93 |      100 |      50 |   85.93 | 34-36,40-47       
  ...Indicator.tsx |   44.44 |      100 |       0 |   44.44 | 12-17             
  ...MoreLines.tsx |      60 |       25 |     100 |      60 | 24-27,33-40       
  StatsDisplay.tsx |   98.39 |    86.66 |     100 |   98.39 | 173-175           
  ...nsDisplay.tsx |   88.05 |    71.42 |     100 |   88.05 | 36-41,96-98       
  ThemeDialog.tsx  |    4.29 |      100 |       0 |    4.29 | 29-316            
  Tips.tsx         |      16 |      100 |       0 |      16 | 17-45             
  ...tsDisplay.tsx |     100 |     87.5 |     100 |     100 | 30-31             
  ...ification.tsx |   36.36 |      100 |       0 |   36.36 | 15-22             
 ...nents/messages |   63.09 |     81.3 |      60 |   63.09 |                   
  ...onMessage.tsx |   18.51 |      100 |       0 |   18.51 | 22-49             
  DiffRenderer.tsx |   96.18 |    81.92 |     100 |   96.18 | ...16-217,221,283 
  ErrorMessage.tsx |     100 |      100 |     100 |     100 |                   
  ...niMessage.tsx |   18.51 |      100 |       0 |   18.51 | 20-43             
  ...geContent.tsx |   19.04 |      100 |       0 |   19.04 | 25-43             
  InfoMessage.tsx  |     100 |      100 |     100 |     100 |                   
  ...onMessage.tsx |   35.15 |     62.5 |      25 |   35.15 | ...60-195,234-262 
  ...upMessage.tsx |   10.11 |      100 |       0 |   10.11 | 27-126            
  ToolMessage.tsx  |   87.76 |       80 |     100 |   87.76 | ...,91-95,169-171 
  UserMessage.tsx  |     100 |      100 |     100 |     100 |                   
  ...llMessage.tsx |   36.36 |      100 |       0 |   36.36 | 17-25             
 ...ponents/shared |    79.2 |    74.01 |   94.59 |    79.2 |                   
  MaxSizedBox.tsx  |   80.66 |    81.19 |   88.88 |   80.66 | ...08-509,614-615 
  ...tonSelect.tsx |   66.66 |    65.51 |     100 |   66.66 | ...15,119-155,224 
  text-buffer.ts   |   76.36 |       75 |   95.83 |   76.36 | ...1611,1651,1701 
  ...er-actions.ts |   86.39 |    65.76 |     100 |   86.39 | ...75-578,883-885 
 src/ui/contexts   |   86.95 |    78.57 |     100 |   86.95 |                   
  ...owContext.tsx |   91.07 |    81.81 |     100 |   91.07 | 46-47,59-61       
  ...onContext.tsx |   94.11 |      100 |     100 |   94.11 | 101-104           
  ...ngContext.tsx |   71.42 |       50 |     100 |   71.42 | 17-20             
  ...deContext.tsx |   76.08 |       50 |     100 |   76.08 | 46-47,51-58,76-77 
 src/ui/editors    |   93.18 |    85.71 |   66.66 |   93.18 |                   
  ...ngsManager.ts |   93.18 |    85.71 |   66.66 |   93.18 | 48,62-63          
 src/ui/hooks      |    80.6 |    82.45 |   84.37 |    80.6 |                   
  ...dProcessor.ts |    78.4 |       79 |     100 |    78.4 | ...55-458,469-487 
  ...dProcessor.ts |   95.52 |    69.23 |     100 |   95.52 | ...17-218,223-224 
  ...dProcessor.ts |   86.44 |       72 |     100 |   86.44 | ...52-353,355-359 
  ...Completion.ts |   92.73 |    89.47 |     100 |   92.73 | ...85-186,219-222 
  ...uthCommand.ts |    7.46 |      100 |       0 |    7.46 | 18-92             
  ...tIndicator.ts |     100 |      100 |     100 |     100 |                   
  ...ketedPaste.ts |     100 |      100 |     100 |     100 |                   
  ...ompletion.tsx |   94.73 |    81.81 |     100 |   94.73 | ...98-199,201-202 
  useCompletion.ts |    92.4 |     87.5 |     100 |    92.4 | ...,95-96,100-101 
  ...leMessages.ts |   98.68 |       95 |     100 |   98.68 | 55                
  ...orSettings.ts |     100 |      100 |     100 |     100 |                   
  useFocus.ts      |     100 |      100 |     100 |     100 |                   
  ...miniStream.ts |   73.27 |    72.02 |     100 |   73.27 | ...25-826,856-946 
  ...BranchName.ts |   91.66 |    84.61 |     100 |   91.66 | 57-63             
  ...oryManager.ts |   98.41 |    93.33 |     100 |   98.41 | 43                
  ...putHistory.ts |    92.5 |    85.71 |     100 |    92.5 | 62-63,71,93-95    
  useKeypress.ts   |     100 |      100 |     100 |     100 |                   
  ...gIndicator.ts |     100 |      100 |     100 |     100 |                   
  useLogger.ts     |      25 |      100 |       0 |      25 | 14-32             
  ...raseCycler.ts |   95.42 |       75 |     100 |   95.42 | ...63-164,182-184 
  ...cySettings.ts |     3.6 |      100 |       0 |     3.6 | 18-139            
  ...lScheduler.ts |   78.92 |    94.44 |     100 |   78.92 | ...01-204,290-300 
  ...oryCommand.ts |       0 |        0 |       0 |       0 | 1-7               
  ...ompletion.tsx |     100 |     92.3 |     100 |     100 | 78                
  ...ellHistory.ts |   91.26 |    79.41 |     100 |   91.26 | ...67,112-113,123 
  ...oryCommand.ts |       0 |        0 |       0 |       0 | 1-75              
  ...Completion.ts |      94 |    92.53 |     100 |      94 | 58-61,69-72,93    
  ...tateAndRef.ts |   59.09 |      100 |     100 |   59.09 | 23-31             
  ...rminalSize.ts |   18.18 |      100 |       0 |   18.18 | 12-32             
  ...emeCommand.ts |   46.98 |       75 |     100 |   46.98 | ...4,70-71,77-100 
  useTimer.ts      |   88.09 |    85.71 |     100 |   88.09 | 44-45,51-53       
  vim.ts           |   83.57 |     79.5 |     100 |   83.57 | ...38,742-750,759 
 src/ui/privacy    |   13.77 |      100 |       0 |   13.77 |                   
  ...acyNotice.tsx |    9.58 |      100 |       0 |    9.58 | 20-113            
  ...acyNotice.tsx |    12.9 |      100 |       0 |    12.9 | 15-55             
  ...acyNotice.tsx |   10.81 |      100 |       0 |   10.81 | 15-58             
  ...acyNotice.tsx |   30.76 |      100 |       0 |   30.76 | 19-36,39-41       
 src/ui/themes     |   99.48 |    65.38 |     100 |   99.48 |                   
  ansi-light.ts    |     100 |      100 |     100 |     100 |                   
  ansi.ts          |     100 |      100 |     100 |     100 |                   
  atom-one-dark.ts |     100 |      100 |     100 |     100 |                   
  ayu-light.ts     |     100 |      100 |     100 |     100 |                   
  ayu.ts           |     100 |      100 |     100 |     100 |                   
  color-utils.ts   |     100 |      100 |     100 |     100 |                   
  default-light.ts |     100 |      100 |     100 |     100 |                   
  default.ts       |     100 |      100 |     100 |     100 |                   
  dracula.ts       |     100 |      100 |     100 |     100 |                   
  github-dark.ts   |     100 |      100 |     100 |     100 |                   
  github-light.ts  |     100 |      100 |     100 |     100 |                   
  googlecode.ts    |     100 |      100 |     100 |     100 |                   
  no-color.ts      |     100 |      100 |     100 |     100 |                   
  ...tic-tokens.ts |     100 |      100 |     100 |     100 |                   
  ...-of-purple.ts |     100 |      100 |     100 |     100 |                   
  theme-manager.ts |   91.08 |    78.04 |     100 |   91.08 | ...91,195,220-221 
  theme.ts         |     100 |     41.3 |     100 |     100 | 225-240           
  xcode.ts         |     100 |      100 |     100 |     100 |                   
 src/ui/utils      |   78.35 |    86.19 |     100 |   78.35 |                   
  ...Colorizer.tsx |    77.3 |    77.77 |     100 |    77.3 | ...48-151,185-209 
  ...olePatcher.ts |      96 |       75 |     100 |      96 | 59-60             
  ...nRenderer.tsx |   26.51 |       75 |     100 |   26.51 | 32-137            
  ...wnDisplay.tsx |   86.19 |    87.69 |     100 |   86.19 | ...71-279,311-332 
  ...eRenderer.tsx |   78.09 |    76.19 |     100 |   78.09 | 55-83             
  ...boardUtils.ts |   32.25 |     37.5 |     100 |   32.25 | ...55-114,129-145 
  commandUtils.ts  |   97.36 |     92.3 |     100 |   97.36 | 68,72             
  computeStats.ts  |     100 |      100 |     100 |     100 |                   
  displayUtils.ts  |     100 |      100 |     100 |     100 |                   
  errorParsing.ts  |     100 |     92.5 |     100 |     100 | 74,78,84          
  formatters.ts    |   90.47 |    95.83 |     100 |   90.47 | 57-60             
  isNarrowWidth.ts |     100 |      100 |     100 |     100 |                   
  ...nUtilities.ts |   69.84 |    85.71 |     100 |   69.84 | 75-91,100-101     
  textUtils.ts     |   88.88 |    83.33 |     100 |   88.88 | 14-15             
  updateCheck.ts   |     100 |    80.95 |     100 |     100 | 26-38             
 src/utils         |   34.63 |    89.81 |   73.91 |   34.63 |                   
  cleanup.ts       |      64 |    66.66 |   66.66 |      64 | 18-26,35          
  events.ts        |     100 |      100 |     100 |     100 |                   
  gitUtils.ts      |    92.2 |    82.35 |     100 |    92.2 | 61-62,77-80       
  ...AutoUpdate.ts |   81.14 |    95.23 |   66.66 |   81.14 | 85-99,125-132     
  ...lationInfo.ts |     100 |      100 |     100 |     100 |                   
  package.ts       |   88.88 |       80 |     100 |   88.88 | 33-34             
  readStdin.ts     |    3.44 |      100 |       0 |    3.44 | 7-39              
  resolvePath.ts   |   66.66 |       25 |     100 |   66.66 | 12-13,16,18-19    
  sandbox.ts       |       0 |        0 |       0 |       0 | 1-934             
  spawnWrapper.ts  |     100 |      100 |     100 |     100 |                   
  ...upWarnings.ts |   23.07 |      100 |       0 |   23.07 | 14-40             
  ...entEmitter.ts |     100 |      100 |     100 |     100 |                   
  ...upWarnings.ts |     100 |      100 |     100 |     100 |                   
  version.ts       |     100 |       50 |     100 |     100 | 11                
-------------------|---------|----------|---------|---------|-------------------

Core Package - Full Text Report

-------------------|---------|----------|---------|---------|-------------------
File               | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s 
-------------------|---------|----------|---------|---------|-------------------
All files          |      74 |    82.69 |   74.05 |      74 |                   
 src               |     100 |      100 |     100 |     100 |                   
  index.ts         |     100 |      100 |     100 |     100 |                   
 src/__mocks__/fs  |     100 |      100 |     100 |     100 |                   
  promises.ts      |     100 |      100 |     100 |     100 |                   
 src/code_assist   |   70.47 |    73.52 |   71.05 |   70.47 |                   
  codeAssist.ts    |   18.51 |      100 |       0 |   18.51 | 13-35             
  converter.ts     |   89.23 |    96.15 |   81.81 |   89.23 | 179-183,202-212   
  oauth2.ts        |   75.23 |     61.7 |      80 |   75.23 | ...03-409,416-417 
  server.ts        |    50.6 |       80 |   53.84 |    50.6 | ...73-214,217-219 
  setup.ts         |   73.77 |     62.5 |     100 |   73.77 | 57-58,69-71,83-93 
  types.ts         |     100 |      100 |     100 |     100 |                   
 src/config        |   74.66 |    83.72 |    48.1 |   74.66 |                   
  config.ts        |   74.41 |    83.72 |    48.1 |   74.41 | ...26-733,739-740 
  models.ts        |     100 |      100 |     100 |     100 |                   
 src/core          |   74.71 |    77.92 |   74.16 |   74.71 |                   
  client.ts        |   78.02 |    79.46 |   73.07 |   78.02 | ...07,709-710,713 
  ...tGenerator.ts |    92.3 |    78.26 |     100 |    92.3 | 82-83,138,147-150 
  ...lScheduler.ts |   66.66 |    68.96 |   83.33 |   66.66 | ...99-806,809-819 
  geminiChat.ts    |   57.78 |    71.23 |   51.61 |   57.78 | ...90-691,694-695 
  geminiRequest.ts |     100 |      100 |     100 |     100 |                   
  logger.ts        |   84.79 |    82.05 |     100 |   84.79 | ...60-261,277-281 
  ...tGenerator.ts |   44.18 |      100 |   33.33 |   44.18 | ...49,52-57,60-61 
  modelCheck.ts    |   23.52 |       50 |     100 |   23.52 | 31-75             
  ...olExecutor.ts |   90.07 |       50 |     100 |   90.07 | 84-85,87-96,127   
  prompts.ts       |   95.76 |    96.96 |      50 |   95.76 | 37-38,304-361     
  subagent.ts      |   92.18 |    83.75 |     100 |   92.18 | ...05-613,656-657 
  tokenLimits.ts   |   14.28 |      100 |       0 |   14.28 | 15-32             
  turn.ts          |   83.57 |    83.33 |     100 |   83.57 | ...55-258,271-272 
 src/ide           |   39.61 |    75.75 |   46.87 |   39.61 |                   
  detect-ide.ts    |    42.1 |    66.66 |      50 |    42.1 | 12-21,25-26       
  ide-client.ts    |   18.08 |    83.33 |   15.78 |   18.08 | ...65-316,319-346 
  ide-installer.ts |   49.58 |     62.5 |     100 |   49.58 | ...,83-84,106-146 
  ideContext.ts    |   83.65 |      100 |     100 |   83.65 | 74-90             
 src/mcp           |   73.81 |    78.94 |   76.31 |   73.81 |                   
  ...h-provider.ts |   83.01 |      100 |   33.33 |   83.01 | ...69,73,77,81-82 
  ...h-provider.ts |   77.05 |    65.62 |      90 |   77.05 | ...62-664,669-671 
  ...en-storage.ts |     100 |      100 |     100 |     100 |                   
  oauth-utils.ts   |   42.85 |     87.5 |      80 |   42.85 | ...32-192,216-252 
 src/prompts       |   26.41 |      100 |      25 |   26.41 |                   
  mcp-prompts.ts   |   18.18 |      100 |       0 |   18.18 | 11-19             
  ...t-registry.ts |   28.57 |      100 |   28.57 |   28.57 | ...42,48-55,68-73 
 src/services      |   94.37 |    94.32 |   86.84 |   94.37 |                   
  ...eryService.ts |   93.33 |    88.46 |   85.71 |   93.33 | 31,39,84,109-110  
  gitService.ts    |   77.52 |      100 |      60 |   77.52 | ...08-112,115-119 
  ...ionService.ts |   99.23 |    97.01 |     100 |   99.23 | 288-289           
  ...ionService.ts |   96.47 |    91.17 |     100 |   96.47 | 132-134,207-208   
 src/telemetry     |    64.1 |    82.97 |   69.69 |    64.1 |                   
  constants.ts     |     100 |      100 |     100 |     100 |                   
  ...-exporters.ts |   26.47 |      100 |       0 |   26.47 | ...80,83-84,87-88 
  index.ts         |     100 |      100 |     100 |     100 |                   
  ...t.circular.ts |       0 |        0 |       0 |       0 | 1-62              
  ...t.circular.ts |       0 |        0 |       0 |       0 | 1-125             
  loggers.ts       |   67.85 |       75 |   69.23 |   67.85 | ...41-359,362-380 
  metrics.ts       |   61.98 |       96 |    62.5 |   61.98 | ...37-159,162-185 
  sdk.ts           |   76.72 |    28.57 |     100 |   76.72 | ...33,141-142,148 
  ...l-decision.ts |     100 |      100 |     100 |     100 |                   
  types.ts         |   71.78 |    90.47 |   76.19 |   71.78 | ...00-309,317-326 
  uiTelemetry.ts   |   99.24 |    95.83 |     100 |   99.24 | 118               
 ...learcut-logger |   76.71 |    70.66 |   71.42 |   76.71 |                   
  ...cut-logger.ts |    75.7 |    70.27 |   74.07 |    75.7 | ...88-789,792-795 
  ...tadata-key.ts |   87.09 |      100 |       0 |   87.09 | 215-225           
 src/test-utils    |   98.41 |     90.9 |     100 |   98.41 |                   
  ...aceContext.ts |     100 |      100 |     100 |     100 |                   
  tools.ts         |   97.77 |     87.5 |     100 |   97.77 | 61                
 src/tools         |   68.09 |    81.53 |   75.27 |   68.09 |                   
  diffOptions.ts   |     100 |      100 |     100 |     100 |                   
  edit.ts          |    81.4 |    83.11 |   85.71 |    81.4 | ...79-480,502-541 
  glob.ts          |   85.71 |    78.72 |    87.5 |   85.71 | ...30-237,311-312 
  grep.ts          |   58.68 |    78.75 |   78.57 |   58.68 | ...89-593,603-604 
  ls.ts            |   96.66 |    90.16 |     100 |   96.66 | 126-127,205-209   
  mcp-client.ts    |   31.67 |    81.25 |      35 |   31.67 | ...1150,1154-1157 
  mcp-tool.ts      |   93.59 |    91.22 |   92.85 |   93.59 | 84-94,206-207     
  memoryTool.ts    |   84.19 |    82.97 |   86.66 |   84.19 | ...23-338,376-394 
  ...iable-tool.ts |     100 |    84.61 |     100 |     100 | 94,101            
  read-file.ts     |    95.8 |     92.3 |    87.5 |    95.8 | ...10-112,204-205 
  ...many-files.ts |   80.62 |    70.49 |      80 |   80.62 | ...86-587,594-595 
  shell.ts         |   84.07 |    76.31 |   85.71 |   84.07 | ...55-357,359-360 
  tool-error.ts    |     100 |      100 |     100 |     100 |                   
  tool-registry.ts |   56.06 |    78.12 |   77.77 |   56.06 | ...74-382,466-467 
  tools.ts         |   79.32 |    88.88 |   59.09 |   79.32 | ...27-428,444-450 
  web-fetch.ts     |   31.06 |    68.42 |   66.66 |   31.06 | ...92-193,221-359 
  web-search.ts    |   26.72 |      100 |      40 |   26.72 | ...04-105,108-197 
  write-file.ts    |   83.55 |    77.61 |   88.88 |   83.55 | ...85-386,458-492 
 src/utils         |   84.31 |    85.77 |   87.73 |   84.31 |                   
  LruCache.ts      |   70.96 |     62.5 |     100 |   70.96 | 20-22,28,30-34    
  bfsFileSearch.ts |   89.02 |    90.47 |     100 |   89.02 | 86-94             
  browser.ts       |    8.69 |      100 |       0 |    8.69 | 17-53             
  editCorrector.ts |   77.35 |    61.11 |   91.66 |   77.35 | ...70-682,716,730 
  editor.ts        |   97.63 |    94.54 |     100 |   97.63 | 154,224,227-228   
  ...entContext.ts |     100 |      100 |     100 |     100 |                   
  ...rReporting.ts |   83.72 |    84.61 |     100 |   83.72 | 82-86,107-115     
  errors.ts        |   39.02 |       60 |      75 |   39.02 | 21-25,41-57,61-67 
  fetch.ts         |   34.04 |      100 |       0 |   34.04 | 22-27,31-57       
  fileUtils.ts     |   95.25 |       90 |     100 |   95.25 | ...05-110,357-363 
  formatters.ts    |   54.54 |       50 |     100 |   54.54 | 12-16             
  ...eUtilities.ts |   96.03 |    95.83 |     100 |   96.03 | 28-29,57-58       
  ...rStructure.ts |   95.96 |    94.93 |     100 |   95.96 | ...14-117,345-347 
  ...noreParser.ts |     100 |    89.47 |     100 |     100 | 27,47             
  gitUtils.ts      |   51.21 |     90.9 |      50 |   51.21 | 40-41,50-73       
  ...yDiscovery.ts |   87.31 |    76.92 |   77.77 |   87.31 | ...33-334,337-338 
  ...tProcessor.ts |   93.68 |    88.75 |   84.61 |   93.68 | ...80-281,384-385 
  ...Inspectors.ts |     100 |      100 |     100 |     100 |                   
  ...kerChecker.ts |   83.51 |    83.33 |     100 |   83.51 | 64-65,75-80,88-94 
  partUtils.ts     |     100 |      100 |     100 |     100 |                   
  paths.ts         |   82.69 |     86.2 |   77.77 |   82.69 | ...92-193,201-202 
  ...rDetection.ts |   37.28 |    36.36 |      80 |   37.28 | ...7,91-92,98-103 
  retry.ts         |   62.55 |    73.21 |     100 |   62.55 | ...58-278,323-338 
  ...nStringify.ts |     100 |      100 |     100 |     100 |                   
  ...aValidator.ts |   86.95 |    68.75 |     100 |   86.95 | 24-25,27-28,45-46 
  ...r-launcher.ts |   78.57 |     87.5 |   66.66 |   78.57 | ...33,135,153-188 
  session.ts       |     100 |      100 |     100 |     100 |                   
  shell-utils.ts   |   95.21 |    93.57 |     100 |   95.21 | ...,94-95,142-144 
  summarizer.ts    |     100 |    88.88 |     100 |     100 | 91                
  ...emEncoding.ts |      98 |    94.11 |     100 |      98 | 106-107           
  testUtils.ts     |   84.44 |    72.72 |   83.33 |   84.44 | 27-28,34-35,70-72 
  textUtils.ts     |    12.5 |      100 |       0 |    12.5 | 15-34             
  user_account.ts  |   97.72 |    97.05 |     100 |   97.72 | 102-103           
  user_id.ts       |    75.6 |       60 |      75 |    75.6 | 19-20,28-33,46-48 
  ...aceContext.ts |   80.37 |    74.19 |      80 |   80.37 | ...17-121,149-150 
 ...ils/filesearch |   97.26 |     93.2 |     100 |   97.26 |                   
  crawlCache.ts    |     100 |      100 |     100 |     100 |                   
  fileSearch.ts    |   95.58 |     90.9 |     100 |   95.58 | ...89-190,221-222 
  ignore.ts        |     100 |      100 |     100 |     100 |                   
  result-cache.ts  |     100 |     92.3 |     100 |     100 | 49                
-------------------|---------|----------|---------|---------|-------------------

For detailed HTML reports, please see the 'coverage-reports-22.x-ubuntu-latest' artifact from the main CI run.

jacob314

Can you also follow up with a test?

packages/vscode-ide-companion/src/diff-manager.ts

…o cb/hideoptions

Co-authored-by: Jacob Richman <[email protected]>

… is not focused (google-gemini#5808)

…gemini#5808) Co-authored-by: Jacob Richman <[email protected]>

Hide diff options when active diff is not focused

ae63031

chrstnb requested a review from a team as a code owner August 7, 2025 22:19

gemini-code-assist bot reviewed Aug 7, 2025

View reviewed changes

packages/vscode-ide-companion/src/diff-manager.ts Outdated Show resolved Hide resolved

Merge branch 'main' into cb/hideoptions

a89fda3

jacob314 approved these changes Aug 7, 2025

View reviewed changes

packages/vscode-ide-companion/src/diff-manager.ts Outdated Show resolved Hide resolved

NTaylorMullen approved these changes Aug 8, 2025

View reviewed changes

packages/vscode-ide-companion/src/diff-manager.ts Outdated Show resolved Hide resolved

chrstnb added 3 commits August 8, 2025 10:56

Merge branch 'main' into cb/hideoptions

48ecdc8

Merge remote-tracking branch 'refs/remotes/origin/cb/hideoptions' int…

444e524

…o cb/hideoptions

Address comments

db92c1e

chrstnb enabled auto-merge August 8, 2025 14:59

fix tests

1451e6d

chrstnb added this pull request to the merge queue Aug 8, 2025

Merged via the queue into main with commit 407393b Aug 8, 2025
14 checks passed

chrstnb deleted the cb/hideoptions branch August 8, 2025 15:28

skeshive pushed a commit that referenced this pull request Aug 8, 2025

[ide-mode] Hide diff options when active diff is not focused (#5808)

74fd0c6

Co-authored-by: Jacob Richman <[email protected]>

skeshive pushed a commit that referenced this pull request Aug 8, 2025

[ide-mode] Hide diff options when active diff is not focused (#5808)

036fcd8

Co-authored-by: Jacob Richman <[email protected]>

skeshive pushed a commit that referenced this pull request Aug 8, 2025

[ide-mode] Hide diff options when active diff is not focused (#5808)

ce49e3d

Co-authored-by: Jacob Richman <[email protected]>

skeshive pushed a commit that referenced this pull request Aug 8, 2025

[ide-mode] Hide diff options when active diff is not focused (#5808)

dbf2ade

Co-authored-by: Jacob Richman <[email protected]>

thacio added a commit to thacio/auditaria that referenced this pull request Aug 8, 2025

Merge Commit '407393b': [ide-mode] Hide diff options when active diff…

ded476a

… is not focused (google-gemini#5808)

ali-aljufairi pushed a commit to ali-aljufairi/gemini-cli that referenced this pull request Aug 9, 2025

[ide-mode] Hide diff options when active diff is not focused (google-…

5558982

…gemini#5808) Co-authored-by: Jacob Richman <[email protected]>

acoliver pushed a commit to acoliver/llxprt-code that referenced this pull request Aug 9, 2025

[ide-mode] Hide diff options when active diff is not focused (google-…

467924b

…gemini#5808) Co-authored-by: Jacob Richman <[email protected]>

frikyfriky11 mentioned this pull request Aug 13, 2025

Inconsistent Release Changelog Generation: 'Full Changelog' always starts from v0.1.12 #5663

Closed

JeongJaeSoon pushed a commit to JeongJaeSoon/gemini-cli that referenced this pull request Aug 21, 2025

[ide-mode] Hide diff options when active diff is not focused (google-…

5830045

…gemini#5808) Co-authored-by: Jacob Richman <[email protected]>

Gosling-dude pushed a commit to Gosling-dude/gemini-cli that referenced this pull request Aug 23, 2025

[ide-mode] Hide diff options when active diff is not focused (google-…

9569d67

…gemini#5808) Co-authored-by: Jacob Richman <[email protected]>

involvex pushed a commit to involvex/gemini-cli that referenced this pull request Sep 11, 2025

[ide-mode] Hide diff options when active diff is not focused (google-…

1da77be

…gemini#5808) Co-authored-by: Jacob Richman <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[ide-mode] Hide diff options when active diff is not focused #5808

[ide-mode] Hide diff options when active diff is not focused #5808

Uh oh!

chrstnb commented Aug 7, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

github-actions bot commented Aug 7, 2025 •

edited

Loading

Uh oh!

jacob314 left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

[ide-mode] Hide diff options when active diff is not focused #5808

[ide-mode] Hide diff options when active diff is not focused #5808

Uh oh!

Conversation

chrstnb commented Aug 7, 2025

TLDR

Dive Deeper

Reviewer Test Plan

Testing Matrix

Linked issues / bugs

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

github-actions bot commented Aug 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage Summary

Uh oh!

jacob314 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Aug 7, 2025 •

edited

Loading