Skip to content

Commit

Permalink
Disable inline notebook diff if notebook chat is in progress (#241741)
Browse files Browse the repository at this point in the history
  • Loading branch information
DonJayamanne authored Feb 24, 2025
1 parent e25a69a commit a841f40
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { Codicon } from '../../../../../base/common/codicons.js';
import type { URI } from '../../../../../base/common/uri.js';
import { TextEditorSelectionRevealType, type ITextEditorOptions } from '../../../../../platform/editor/common/editor.js';
import product from '../../../../../platform/product/common/product.js';
import { ctxHasEditorModification, ctxHasRequestInProgress } from '../../../chat/browser/chatEditing/chatEditingEditorContextKeys.js';

// ActiveEditorContext.isEqualTo(SearchEditorConstants.SearchEditorID)

Expand Down Expand Up @@ -707,7 +708,8 @@ registerAction2(class extends Action2 {
group: '1_diff',
order: 10,
when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
ContextKeyExpr.equals('config.notebook.diff.experimental.toggleInline', true))
ContextKeyExpr.equals('config.notebook.diff.experimental.toggleInline', true),
ctxHasEditorModification.negate(), ctxHasRequestInProgress.negate())
}
}
);
Expand Down

0 comments on commit a841f40

Please sign in to comment.