Merge branch 'main' into tyriar/185393_2__ptyhost_marks

Author: Tyriar

build/lib/i18n.resources.json

@@ -382,6 +382,10 @@
 			"name": "vs/workbench/services/files",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/filesConfiguration",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/history",
 			"project": "vscode-workbench"

extensions/ipynb/package.json

@@ -14,7 +14,8 @@
 		"dropMetadata"
 	],
 	"activationEvents": [
-		"onNotebook:jupyter-notebook"
+		"onNotebook:jupyter-notebook",
+		"onNotebookSerializer:interactive"
 	],
 	"extensionKind": [
 		"workspace",

extensions/ipynb/src/ipynbMain.ts

@@ -43,6 +43,18 @@ export function activate(context: vscode.ExtensionContext) {
 		}
 	} as vscode.NotebookDocumentContentOptions));
 
+	context.subscriptions.push(vscode.workspace.registerNotebookSerializer('interactive', serializer, {
+		transientOutputs: false,
+		transientCellMetadata: {
+			breakpointMargin: true,
+			custom: false,
+			attachments: false
+		},
+		cellContentMetadata: {
+			attachments: true
+		}
+	} as vscode.NotebookDocumentContentOptions));
+
 	vscode.languages.registerCodeLensProvider({ pattern: '**/*.ipynb' }, {
 		provideCodeLenses: (document) => {
 			if (

src/vs/base/common/network.ts

@@ -62,7 +62,6 @@ export namespace Schemas {
 	export const vscodeNotebookCell = 'vscode-notebook-cell';
 	export const vscodeNotebookCellMetadata = 'vscode-notebook-cell-metadata';
 	export const vscodeNotebookCellOutput = 'vscode-notebook-cell-output';
-	export const vscodeInteractive = 'vscode-interactive';
 	export const vscodeInteractiveInput = 'vscode-interactive-input';
 
 	export const vscodeSettings = 'vscode-settings';

src/vs/editor/browser/editorBrowser.ts

@@ -1260,6 +1260,10 @@ export interface IDiffEditor extends editorCommon.IEditor {
 	 * @internal
 	 */
 	revealFirstDiff(): unknown;
+
+	diffReviewNext(): void;
+
+	diffReviewPrev(): void;
 }
 
 /**

src/vs/editor/browser/widget/codeEditorContributions.ts

@@ -10,6 +10,7 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorContributionInstantiation, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import './diffEditor.contribution';
 
 export class CodeEditorContributions extends Disposable {
 

src/vs/editor/browser/widget/diffEditor.contribution.ts

@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
+import { EditorAction, ServicesAccessor, registerEditorAction } from 'vs/editor/browser/editorExtensions';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { localize } from 'vs/nls';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+
+class DiffReviewNext extends EditorAction {
+	constructor() {
+		super({
+			id: 'editor.action.diffReview.next',
+			label: localize('editor.action.diffReview.next', "Go to Next Difference"),
+			alias: 'Go to Next Difference',
+			precondition: ContextKeyExpr.has('isInDiffEditor'),
+			kbOpts: {
+				kbExpr: null,
+				primary: KeyCode.F7,
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		const diffEditor = findFocusedDiffEditor(accessor);
+		diffEditor?.diffReviewNext();
+	}
+}
+
+class DiffReviewPrev extends EditorAction {
+	constructor() {
+		super({
+			id: 'editor.action.diffReview.prev',
+			label: localize('editor.action.diffReview.prev', "Go to Previous Difference"),
+			alias: 'Go to Previous Difference',
+			precondition: ContextKeyExpr.has('isInDiffEditor'),
+			kbOpts: {
+				kbExpr: null,
+				primary: KeyMod.Shift | KeyCode.F7,
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		const diffEditor = findFocusedDiffEditor(accessor);
+		diffEditor?.diffReviewPrev();
+	}
+}
+
+function findFocusedDiffEditor(accessor: ServicesAccessor): IDiffEditor | null {
+	const codeEditorService = accessor.get(ICodeEditorService);
+	const diffEditors = codeEditorService.listDiffEditors();
+	const activeCodeEditor = codeEditorService.getFocusedCodeEditor() ?? codeEditorService.getActiveCodeEditor();
+	if (!activeCodeEditor) {
+		return null;
+	}
+
+	for (let i = 0, len = diffEditors.length; i < len; i++) {
+		const diffEditor = <IDiffEditor>diffEditors[i];
+		if (diffEditor.getModifiedEditor().getId() === activeCodeEditor.getId() || diffEditor.getOriginalEditor().getId() === activeCodeEditor.getId()) {
+			return diffEditor;
+		}
+	}
+	return null;
+}
+
+registerEditorAction(DiffReviewNext);
+registerEditorAction(DiffReviewPrev);

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts

@@ -44,6 +44,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
 import { deepClone } from 'vs/base/common/objects';
 import { autorunWithStore2 } from 'vs/base/common/observableImpl/autorun';
+import { DiffReview2 } from 'vs/editor/browser/widget/diffEditorWidget2/diffReview';
 
 const diffEditorDefaultOptions: ValidDiffEditorBaseOptions = {
 	enableSplitViewResizing: true,
@@ -93,6 +94,8 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 
 	private unchangedRangesFeature!: UnchangedRangesFeature;
 
+	private readonly _reviewPane: DiffReview2;
+
 	constructor(
 		private readonly _domElement: HTMLElement,
 		options: Readonly<IDiffEditorConstructionOptions>,
@@ -177,6 +180,11 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 			this._renderOverviewRuler,
 		));
 
+		this._reviewPane = this._register(this._instantiationService.createInstance(DiffReview2, this));
+		this.elements.root.appendChild(this._reviewPane.domNode.domNode);
+		this.elements.root.appendChild(this._reviewPane.shadow.domNode);
+		this.elements.root.appendChild(this._reviewPane.actionBarContainer.domNode);
+
 		this._createDiffEditorContributions();
 
 		codeEditorService.addDiffEditor(this);
@@ -217,6 +225,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 				(this._renderOverviewRuler.read(reader) ? OverviewRulerPart.ENTIRE_DIFF_OVERVIEW_WIDTH : 0),
 			height
 		});
+		this._reviewPane.layout(0, width, height);
 
 		return {
 			modifiedEditor: this._modifiedEditor.getLayoutInfo(),
@@ -676,6 +685,13 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 		});
 	}
 
+	public diffReviewNext(): void {
+		this._reviewPane.next();
+	}
+
+	public diffReviewPrev(): void {
+		this._reviewPane.prev();
+	}
 
 	public async waitForDiff(): Promise<void> {
 		const diffModel = this._diffModel.get();