Git - resolve the active notebook for Open Changes / Open File

extensions/git/src/commands.ts

@@ -5,7 +5,7 @@
 
 import * as os from 'os';
 import * as path from 'path';
-import { Command, commands, Disposable, MessageOptions, Position, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon, SourceControlHistoryItem, SourceControl, InputBoxValidationMessage, Tab, TabInputNotebook, QuickInputButtonLocation, languages, SourceControlArtifact, ProgressLocation } from 'vscode';
+import { Command, commands, Disposable, MessageOptions, Position, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon, SourceControlHistoryItem, SourceControl, InputBoxValidationMessage, Tab, TabInputNotebook, TabInputNotebookDiff, QuickInputButtonLocation, languages, SourceControlArtifact, ProgressLocation } from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import type { CommitOptions, RemoteSourcePublisher, Remote, Branch, Ref } from './api/git';
 import { ForcePushMode, GitErrorCodes, RefType, Status } from './api/git.constants';
@@ -5700,7 +5700,13 @@ export class CommandCenter {
 	}
 
 	private getSCMResource(uri?: Uri): Resource | undefined {
-		uri = uri ? uri : (window.activeTextEditor && window.activeTextEditor.document.uri);
+		uri = uri ?? window.activeNotebookEditor?.notebook.uri ?? window.activeTextEditor?.document.uri;
+
+		// A notebook diff editor is neither the active text nor notebook editor, so
+		// fall back to its modified resource.
+		if (!uri && window.tabGroups.activeTabGroup.activeTab?.input instanceof TabInputNotebookDiff) {
+			uri = window.tabGroups.activeTabGroup.activeTab.input.modified;
+		}
 
 		this.logger.debug(`[CommandCenter][getSCMResource] git.getSCMResource.uri: ${uri && uri.toString()}`);
 

extensions/git/src/test/smoke.test.ts

@@ -5,7 +5,7 @@
 
 import 'mocha';
 import assert from 'assert';
-import { workspace, commands, window, Uri, WorkspaceEdit, Range, TextDocument, extensions, TabInputTextDiff } from 'vscode';
+import { workspace, commands, window, Uri, WorkspaceEdit, Range, TextDocument, extensions, TabInputTextDiff, TabInputNotebook, TabInputNotebookDiff } from 'vscode';
 import * as cp from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -147,6 +147,33 @@ suite('git smoke test', function () {
 		assert.strictEqual(repository.state.indexChanges.length, 0);
 	});
 
+	test('opens notebook diff and file from active notebook editor', async function () {
+		const committed = JSON.stringify({ cells: [{ cell_type: 'code', source: ['x = 1'], metadata: {}, outputs: [], execution_count: null }], metadata: {}, nbformat: 4, nbformat_minor: 5 });
+		fs.writeFileSync(file('notebook.ipynb'), committed);
+		await repository.add([file('notebook.ipynb')]);
+		await repository.commit('add notebook');
+
+		fs.writeFileSync(file('notebook.ipynb'), committed.replace('x = 1', 'x = 2'));
+		await repository.status();
+
+		try {
+			const notebook = await workspace.openNotebookDocument(uri('notebook.ipynb'));
+			await window.showNotebookDocument(notebook);
+
+			// git.openChange without an argument resolves the resource from the active notebook editor
+			await commands.executeCommand('git.openChange');
+			assert(window.tabGroups.activeTabGroup.activeTab?.input instanceof TabInputNotebookDiff);
+
+			// git.openFile toggles back to the notebook from the active notebook diff editor
+			await commands.executeCommand('git.openFile');
+			assert(window.tabGroups.activeTabGroup.activeTab?.input instanceof TabInputNotebook);
+		} finally {
+			// Restore the committed content so the following tests start from a clean tree
+			fs.writeFileSync(file('notebook.ipynb'), committed);
+			await repository.status();
+		}
+	});
+
 	test('rename/delete conflict', async function () {
 		await commands.executeCommand('workbench.view.scm');