@codingame/monaco-vscode-notebook-service-override 5.2.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.js

@@ -3,12 +3,12 @@ import { append, $, reset, scheduleAtNextAnimationFrame, getWindow } from 'vscod
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { PropertyFoldingState, SideBySideDiffElementViewModel, getFormattedMetadataJSON, getFormattedOutputJSON, OUTPUT_EDITOR_HEIGHT_MAGIC, outputEqual } from './diffElementViewModel.js';
+import { PropertyFoldingState, SideBySideDiffElementViewModel, getFormattedMetadataJSON, getFormattedOutputJSON, OUTPUT_EDITOR_HEIGHT_MAGIC, OutputComparison, outputEqual } from './diffElementViewModel.js';
 import { NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, DIFF_CELL_MARGIN, DiffSide, NOTEBOOK_DIFF_CELL_INPUT } from './notebookDiffEditorBrowser.js';
 import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellEditType, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { MenuItemAction, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -33,6 +33,7 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { fixedDiffEditorOptions, fixedEditorOptions, fixedEditorPadding } from './diffCellEditorOptions.js';
+import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { DiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/diffEditorWidget';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
@@ -388,7 +389,7 @@ class AbstractElementRenderer extends Disposable {
                 return;
             }
             this.notebookEditor.textModel.applyEdits([
-                { editType: 3 , index, metadata: result }
+                { editType: CellEditType.Metadata, index, metadata: result }
             ], true, undefined, () => undefined, undefined, true);
         }
         catch {
@@ -503,7 +504,7 @@ class AbstractElementRenderer extends Disposable {
                         height: Math.min(OUTPUT_EDITOR_HEIGHT_MAGIC, this.cell.layoutInfo.rawOutputHeight || lineHeight * lineCount),
                         width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true)
                     },
-                    accessibilityVerbose: this.configurationService.getValue("accessibility.verbosity.diffEditor" ) ?? false
+                    accessibilityVerbose: this.configurationService.getValue(AccessibilityVerbositySettingId.DiffEditor) ?? false
                 }, {
                     originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
                     modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
@@ -1072,10 +1073,10 @@ let ModifiedElement = class ModifiedElement extends AbstractElementRenderer {
             this._outputMetadataContainer = append(this._outputViewContainer, $('.output-view-container-metadata'));
             const outputModified = this.cell.checkIfOutputsModified();
             const outputMetadataChangeOnly = outputModified
-                && outputModified.kind === 1
+                && outputModified.kind === OutputComparison.Metadata
                 && this.cell.original.outputs.length === 1
                 && this.cell.modified.outputs.length === 1
-                && outputEqual(this.cell.original.outputs[0], this.cell.modified.outputs[0]) === 1 ;
+                && outputEqual(this.cell.original.outputs[0], this.cell.modified.outputs[0]) === OutputComparison.Metadata;
             if (outputModified && !outputMetadataChangeOnly) {
                 const originalOutputRenderListener = this.notebookEditor.onDidDynamicOutputRendered(e => {
                     if (( e.cell.uri.toString()) === ( this.cell.original.uri.toString()) && this.cell.checkIfOutputsModified()) {

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.js

@@ -4,10 +4,12 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SideBySideDiffElementViewModel } from './diffElementViewModel.js';
 import { DiffSide } from './notebookDiffEditorBrowser.js';
+import { RenderOutputType } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { mimetypeIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/diff/diffElementOutputs";
@@ -51,7 +53,7 @@ class OutputElement extends Disposable {
             }));
             this.resizeListener.add((addDisposableListener(mimeTypePicker, EventType.KEY_DOWN, async (e) => {
                 const event = ( (new StandardKeyboardEvent(e)));
-                if ((event.equals(3 ) || event.equals(10 ))) {
+                if ((event.equals(KeyCode.Enter) || event.equals(KeyCode.Space))) {
                     e.preventDefault();
                     e.stopPropagation();
                     await this.pickActiveMimeTypeRenderer(this._notebookTextModel, this.output);
@@ -63,7 +65,7 @@ class OutputElement extends Disposable {
         if (mimeTypes.length !== 0) {
             const renderer = this._notebookService.getRendererInfo(pickedMimeTypeRenderer.rendererId);
             result = renderer
-                ? { type: 1 , renderer, source: this.output, mimeType: pickedMimeTypeRenderer.mimeType }
+                ? { type: RenderOutputType.Extension, renderer, source: this.output, mimeType: pickedMimeTypeRenderer.mimeType }
                 : this._renderMissingRenderer(this.output, pickedMimeTypeRenderer.mimeType);
             this.output.pickedMimeType = pickedMimeTypeRenderer;
         }
@@ -103,14 +105,14 @@ class OutputElement extends Disposable {
         const p = $('p', undefined, `No renderer could be found for mimetype "${mimeType}", but one might be available on the Marketplace.`);
         const a = $('a', { href: `command:workbench.extensions.search?%22${query}%22`, class: 'monaco-button monaco-text-button', tabindex: 0, role: 'button', style: 'padding: 8px; text-decoration: none; color: rgb(255, 255, 255); background-color: rgb(14, 99, 156); max-width: 200px;' }, `Search Marketplace`);
         return {
-            type: 0 ,
+            type: RenderOutputType.Html,
             source: viewModel,
             htmlContent: p.outerHTML + a.outerHTML,
         };
     }
     _renderMessage(viewModel, message) {
         const el = $('p', undefined, message);
-        return { type: 0 , source: viewModel, htmlContent: el.outerHTML };
+        return { type: RenderOutputType.Html, source: viewModel, htmlContent: el.outerHTML };
     }
     async pickActiveMimeTypeRenderer(notebookTextModel, viewModel) {
         const [mimeTypes, currIndex] = viewModel.resolveMimeTypes(notebookTextModel, undefined);

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.js

@@ -321,11 +321,11 @@ class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
             return false;
         }
         const ret = outputsEqual(this.original?.outputs ?? [], this.modified?.outputs ?? []);
-        if (ret === 0 ) {
+        if (ret === OutputComparison.Unchanged) {
             return false;
         }
         return {
-            reason: ret === 1  ? 'Output metadata is changed' : undefined,
+            reason: ret === OutputComparison.Metadata ? 'Output metadata is changed' : undefined,
             kind: ret
         };
     }
@@ -454,58 +454,64 @@ class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
         return this.cellViewModel;
     }
 }
+var OutputComparison;
+( (function(OutputComparison) {
+    OutputComparison[OutputComparison["Unchanged"] = 0] = "Unchanged";
+    OutputComparison[OutputComparison["Metadata"] = 1] = "Metadata";
+    OutputComparison[OutputComparison["Other"] = 2] = "Other";
+})(OutputComparison || (OutputComparison = {})));
 function outputEqual(a, b) {
     if (hash(a.metadata) === hash(b.metadata)) {
-        return 2 ;
+        return OutputComparison.Other;
     }
     for (let j = 0; j < a.outputs.length; j++) {
         const aOutputItem = a.outputs[j];
         const bOutputItem = b.outputs[j];
         if (aOutputItem.mime !== bOutputItem.mime) {
-            return 2 ;
+            return OutputComparison.Other;
         }
         if (aOutputItem.data.buffer.length !== bOutputItem.data.buffer.length) {
-            return 2 ;
+            return OutputComparison.Other;
         }
         for (let k = 0; k < aOutputItem.data.buffer.length; k++) {
             if (aOutputItem.data.buffer[k] !== bOutputItem.data.buffer[k]) {
-                return 2 ;
+                return OutputComparison.Other;
             }
         }
     }
-    return 1 ;
+    return OutputComparison.Metadata;
 }
 function outputsEqual(original, modified) {
     if (original.length !== modified.length) {
-        return 2 ;
+        return OutputComparison.Other;
     }
     const len = original.length;
     for (let i = 0; i < len; i++) {
         const a = original[i];
         const b = modified[i];
         if (hash(a.metadata) !== hash(b.metadata)) {
-            return 1 ;
+            return OutputComparison.Metadata;
         }
         if (a.outputs.length !== b.outputs.length) {
-            return 2 ;
+            return OutputComparison.Other;
         }
         for (let j = 0; j < a.outputs.length; j++) {
             const aOutputItem = a.outputs[j];
             const bOutputItem = b.outputs[j];
             if (aOutputItem.mime !== bOutputItem.mime) {
-                return 2 ;
+                return OutputComparison.Other;
             }
             if (aOutputItem.data.buffer.length !== bOutputItem.data.buffer.length) {
-                return 2 ;
+                return OutputComparison.Other;
             }
             for (let k = 0; k < aOutputItem.data.buffer.length; k++) {
                 if (aOutputItem.data.buffer[k] !== bOutputItem.data.buffer[k]) {
-                    return 2 ;
+                    return OutputComparison.Other;
                 }
             }
         }
     }
-    return 0 ;
+    return OutputComparison.Unchanged;
 }
 function getFormattedMetadataJSON(documentTextModel, metadata, language) {
     let filteredMetadata = {};
@@ -560,4 +566,4 @@ function getFormattedOutputJSON(outputs) {
     })), undefined, '\t');
 }
 
-export { DiffElementViewModelBase, OUTPUT_EDITOR_HEIGHT_MAGIC, PropertyFoldingState, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel, getFormattedMetadataJSON, getFormattedOutputJSON, getStreamOutputData, outputEqual };
+export { DiffElementViewModelBase, OUTPUT_EDITOR_HEIGHT_MAGIC, OutputComparison, PropertyFoldingState, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel, getFormattedMetadataJSON, getFormattedOutputJSON, getStreamOutputData, outputEqual };

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.js

@@ -12,7 +12,9 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
-import { NOTEBOOK_DIFF_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
+import { CellEditType, NOTEBOOK_DIFF_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/diff/notebookDiffActions";
 registerAction2(class extends Action2 {
@@ -120,7 +122,7 @@ registerAction2(class extends Action2 {
             return;
         }
         context.cell.mainDocumentTextModel.applyEdits([{
-                editType: 2 , index: modifiedCellIndex, outputs: original.outputs
+                editType: CellEditType.Output, index: modifiedCellIndex, outputs: original.outputs
             }], true, undefined, () => undefined, undefined, true);
     }
 });
@@ -203,8 +205,8 @@ registerAction2(class extends Action2 {
             icon: previousChangeIcon,
             f1: false,
             keybinding: {
-                primary: 1024  | 512  | 61 ,
-                weight: 200 ,
+                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)))
             },
             menu: {
@@ -231,8 +233,8 @@ registerAction2(class extends Action2 {
             icon: nextChangeIcon,
             f1: false,
             keybinding: {
-                primary: 512  | 61 ,
-                weight: 200 ,
+                primary: KeyMod.Alt | KeyCode.F3,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)))
             },
             menu: {

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js

@@ -6,6 +6,7 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { EditorPaneSelectionCompareResult, EditorPaneSelectionChangeReason } from 'vscode/vscode/vs/workbench/common/editor';
 import { getDefaultNotebookCreationOptions } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from './diffElementViewModel.js';
@@ -54,17 +55,17 @@ class NotebookDiffEditorSelection {
     }
     compare(other) {
         if (!(other instanceof NotebookDiffEditorSelection)) {
-            return 3 ;
+            return EditorPaneSelectionCompareResult.DIFFERENT;
         }
         if (this.selections.length !== other.selections.length) {
-            return 3 ;
+            return EditorPaneSelectionCompareResult.DIFFERENT;
         }
         for (let i = 0; i < this.selections.length; i++) {
             if (this.selections[i] !== other.selections[i]) {
-                return 3 ;
+                return EditorPaneSelectionCompareResult.DIFFERENT;
             }
         }
-        return 1 ;
+        return EditorPaneSelectionCompareResult.IDENTICAL;
     }
     restore(options) {
         const notebookOptions = {
@@ -261,7 +262,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
         this._register(this._list.onDidScroll(() => {
             this._onDidScroll.fire();
         }));
-        this._register(this._list.onDidChangeFocus(() => this._onDidChangeSelection.fire({ reason: 2  })));
+        this._register(this._list.onDidChangeFocus(() => this._onDidChangeSelection.fire({ reason: EditorPaneSelectionChangeReason.USER })));
         this._overviewRulerContainer = document.createElement('div');
         this._overviewRulerContainer.classList.add('notebook-overview-ruler-container');
         this._rootElement.appendChild(this._overviewRulerContainer);