@codingame/monaco-vscode-api 32.0.1 → 33.0.3

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookMetadataTextModel.js

@@ -0,0 +1,90 @@
+
+import { toFormattedString } from '../../../../../base/common/jsonFormatter.js';
+import { NotebookMetadataUri, NotebookCellsChangeType } from '../notebookCommon.js';
+import { StringSHA1 } from '../../../../../base/common/hash.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { DefaultEndOfLine, EndOfLinePreference } from '../../../../../editor/common/model.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { createTextBuffer } from '../../../../../editor/common/model/textModel.js';
+
+function getFormattedNotebookMetadataJSON(transientMetadata, metadata) {
+    let filteredMetadata = {};
+    if (transientMetadata) {
+        const keys = ( new Set([...( Object.keys(metadata))]));
+        for (const key of keys) {
+            if (!(transientMetadata[key])) {
+                filteredMetadata[key] = metadata[key];
+            }
+        }
+    } else {
+        filteredMetadata = metadata;
+    }
+    const metadataSource = toFormattedString(filteredMetadata, {});
+    return metadataSource;
+}
+class NotebookDocumentMetadataTextModel extends Disposable {
+    get metadata() {
+        return this.notebookModel.metadata;
+    }
+    get textBuffer() {
+        if (this._textBuffer) {
+            return this._textBuffer;
+        }
+        const source = getFormattedNotebookMetadataJSON(
+            this.notebookModel.transientOptions.transientDocumentMetadata,
+            this.metadata
+        );
+        this._textBuffer = this._register(createTextBuffer(source, DefaultEndOfLine.LF).textBuffer);
+        this._register(this._textBuffer.onDidChangeContent(() => {
+            this._onDidChange.fire();
+        }));
+        return this._textBuffer;
+    }
+    constructor(notebookModel) {
+        super();
+        this.notebookModel = notebookModel;
+        this._onDidChange = this._register(( new Emitter()));
+        this.onDidChange = this._onDidChange.event;
+        this._textBufferHash = null;
+        this.uri = NotebookMetadataUri.generate(this.notebookModel.uri);
+        this._register(this.notebookModel.onDidChangeContent(e => {
+            if (( e.rawEvents.some(
+                event => event.kind === NotebookCellsChangeType.ChangeDocumentMetadata || event.kind === NotebookCellsChangeType.ModelChange
+            ))) {
+                this._textBuffer?.dispose();
+                this._textBuffer = undefined;
+                this._textBufferHash = null;
+                this._onDidChange.fire();
+            }
+        }));
+    }
+    getHash() {
+        if (this._textBufferHash !== null) {
+            return this._textBufferHash;
+        }
+        const shaComputer = ( new StringSHA1());
+        const snapshot = this.textBuffer.createSnapshot(false);
+        let text;
+        while ((text = snapshot.read())) {
+            shaComputer.update(text);
+        }
+        this._textBufferHash = shaComputer.digest();
+        return this._textBufferHash;
+    }
+    getValue() {
+        const fullRange = this.getFullModelRange();
+        const eol = this.textBuffer.getEOL();
+        if (eol === "\n") {
+            return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.LF);
+        } else {
+            return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.CRLF);
+        }
+    }
+    getFullModelRange() {
+        const lineCount = this.textBuffer.getLineCount();
+        return ( new Range(1, 1, lineCount, this.textBuffer.getLineLength(lineCount) + 1));
+    }
+}
+
+export { NotebookDocumentMetadataTextModel, getFormattedNotebookMetadataJSON };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookDiff.d.ts

@@ -0,0 +1,26 @@
+import { CellKind, INotebookDiffResult } from "./notebookCommon.js";
+export type CellDiffInfo = {
+    originalCellIndex: number;
+    modifiedCellIndex: number;
+    type: "unchanged" | "modified";
+} | {
+    originalCellIndex: number;
+    type: "delete";
+} | {
+    modifiedCellIndex: number;
+    type: "insert";
+};
+interface ICell {
+    cellKind: CellKind;
+    getHashValue(): number;
+    equal(cell: ICell): boolean;
+}
+export declare function computeDiff(originalModel: {
+    readonly cells: readonly ICell[];
+}, modifiedModel: {
+    readonly cells: readonly ICell[];
+}, diffResult: INotebookDiffResult): {
+    cellDiffInfo: CellDiffInfo[];
+    firstChangeIndex: number;
+};
+export {};

package/vscode/src/vs/workbench/contrib/notebook/common/notebookDiff.js

@@ -0,0 +1,92 @@
+
+
+function computeDiff(originalModel, modifiedModel, diffResult) {
+    const cellChanges = diffResult.cellsDiff.changes;
+    const cellDiffInfo = [];
+    let originalCellIndex = 0;
+    let modifiedCellIndex = 0;
+    let firstChangeIndex = -1;
+    for (let i = 0; i < cellChanges.length; i++) {
+        const change = cellChanges[i];
+        for (let j = 0; j < change.originalStart - originalCellIndex; j++) {
+            const originalCell = originalModel.cells[originalCellIndex + j];
+            const modifiedCell = modifiedModel.cells[modifiedCellIndex + j];
+            if (originalCell.getHashValue() === modifiedCell.getHashValue()) {
+                cellDiffInfo.push({
+                    originalCellIndex: originalCellIndex + j,
+                    modifiedCellIndex: modifiedCellIndex + j,
+                    type: 'unchanged'
+                });
+            }
+            else {
+                if (firstChangeIndex === -1) {
+                    firstChangeIndex = cellDiffInfo.length;
+                }
+                cellDiffInfo.push({
+                    originalCellIndex: originalCellIndex + j,
+                    modifiedCellIndex: modifiedCellIndex + j,
+                    type: 'modified'
+                });
+            }
+        }
+        const modifiedLCS = computeModifiedLCS(change, originalModel, modifiedModel);
+        if (modifiedLCS.length && firstChangeIndex === -1) {
+            firstChangeIndex = cellDiffInfo.length;
+        }
+        cellDiffInfo.push(...modifiedLCS);
+        originalCellIndex = change.originalStart + change.originalLength;
+        modifiedCellIndex = change.modifiedStart + change.modifiedLength;
+    }
+    for (let i = originalCellIndex; i < originalModel.cells.length; i++) {
+        cellDiffInfo.push({
+            originalCellIndex: i,
+            modifiedCellIndex: i - originalCellIndex + modifiedCellIndex,
+            type: 'unchanged'
+        });
+    }
+    return {
+        cellDiffInfo,
+        firstChangeIndex
+    };
+}
+function computeModifiedLCS(change, originalModel, modifiedModel) {
+    const result = [];
+    const modifiedLen = Math.min(change.originalLength, change.modifiedLength);
+    for (let j = 0; j < modifiedLen; j++) {
+        const originalCell = originalModel.cells[change.originalStart + j];
+        const modifiedCell = modifiedModel.cells[change.modifiedStart + j];
+        if (originalCell.cellKind !== modifiedCell.cellKind) {
+            result.push({
+                originalCellIndex: change.originalStart + j,
+                type: 'delete'
+            });
+            result.push({
+                modifiedCellIndex: change.modifiedStart + j,
+                type: 'insert'
+            });
+        }
+        else {
+            const isTheSame = originalCell.equal(modifiedCell);
+            result.push({
+                originalCellIndex: change.originalStart + j,
+                modifiedCellIndex: change.modifiedStart + j,
+                type: isTheSame ? 'unchanged' : 'modified'
+            });
+        }
+    }
+    for (let j = modifiedLen; j < change.originalLength; j++) {
+        result.push({
+            originalCellIndex: change.originalStart + j,
+            type: 'delete'
+        });
+    }
+    for (let j = modifiedLen; j < change.modifiedLength; j++) {
+        result.push({
+            modifiedCellIndex: change.modifiedStart + j,
+            type: 'insert'
+        });
+    }
+    return result;
+}
+
+export { computeDiff };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js

@@ -87,11 +87,11 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
                 return;
             }
             const reason = e.auto ? ( localize(
-                11937,
+                12064,
                 "An extension provided notebook for '{0}' is still open that would close otherwise.",
                 this.getName()
             )) : ( localize(
-                11938,
+                12065,
                 "An extension provided notebook for '{0}' could not be saved.",
                 this.getName()
             ));

package/vscode/src/vs/workbench/contrib/opener/browser/opener.contribution.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/opener/browser/opener.contribution.js

@@ -0,0 +1,44 @@
+
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
+import { IFileService } from '../../../../platform/files/common/files.service.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { REVEAL_IN_EXPLORER_COMMAND_ID } from '../../files/browser/fileConstants.js';
+
+let WorkbenchOpenerContribution = class WorkbenchOpenerContribution extends Disposable {
+    static {
+        this.ID = "workbench.contrib.opener";
+    }
+    constructor(openerService, commandService, fileService, workspaceContextService) {
+        super();
+        this.commandService = commandService;
+        this.fileService = fileService;
+        this.workspaceContextService = workspaceContextService;
+        this._register(openerService.registerOpener(this));
+    }
+    async open(link, options) {
+        try {
+            if (options?.openExternal) {
+                return false;
+            }
+            const uri = typeof link === "string" ? ( URI.parse(link)) : link;
+            if (this.workspaceContextService.isInsideWorkspace(uri)) {
+                if ((await this.fileService.stat(uri)).isDirectory) {
+                    await this.commandService.executeCommand(REVEAL_IN_EXPLORER_COMMAND_ID, uri);
+                    return true;
+                }
+            }
+        } catch {}
+        return false;
+    }
+};
+WorkbenchOpenerContribution = ( __decorate([( __param(0, IOpenerService)), ( __param(1, ICommandService)), ( __param(2, IFileService)), ( __param(3, IWorkspaceContextService))], WorkbenchOpenerContribution));
+registerWorkbenchContribution2(
+    WorkbenchOpenerContribution.ID,
+    WorkbenchOpenerContribution,
+    WorkbenchPhase.Eventually
+);

package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js

@@ -155,7 +155,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
         this._domNode.setClassName("defineKeybindingWidget");
         this._domNode.setWidth(DefineKeybindingWidget_1.WIDTH);
         this._domNode.setHeight(DefineKeybindingWidget_1.HEIGHT);
-        const message = ( localize(12060, "Press desired key combination and then press ENTER."));
+        const message = ( localize(12187, "Press desired key combination and then press ENTER."));
         append(this._domNode.domNode, $(".message", undefined, message));
         this._domNode.domNode.style.backgroundColor = asCssVariable(editorWidgetBackground);
         this._domNode.domNode.style.color = asCssVariable(editorWidgetForeground);
@@ -210,7 +210,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
     printExisting(numberOfExisting) {
         if (numberOfExisting > 0) {
             const existingElement = $("span.existingText");
-            const text = numberOfExisting === 1 ? ( localize(12061, "1 existing command has this keybinding", numberOfExisting)) : ( localize(12062, "{0} existing commands have this keybinding", numberOfExisting));
+            const text = numberOfExisting === 1 ? ( localize(12188, "1 existing command has this keybinding", numberOfExisting)) : ( localize(12189, "{0} existing commands have this keybinding", numberOfExisting));
             append(existingElement, createTextNode(text));
             alert(text);
             this._showExistingKeybindingsNode.appendChild(existingElement);
@@ -234,7 +234,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
         firstLabel.set(this._chords?.[0] ?? undefined);
         if (this._chords) {
             for (let i = 1; i < this._chords.length; i++) {
-                this._outputNode.appendChild(createTextNode(( localize(12063, "chord to"))));
+                this._outputNode.appendChild(createTextNode(( localize(12190, "chord to"))));
                 const chordLabel = this._keybindingDisposables.add(( new KeybindingLabel(this._outputNode, OS, defaultKeybindingLabelStyles)));
                 chordLabel.set(this._chords[i]);
             }

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js

@@ -4,20 +4,20 @@ import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 const settingsScopeDropDownIcon = registerIcon("settings-folder-dropdown", Codicon.chevronDown, ( localize(
-    12156,
+    12283,
     "Icon for the folder dropdown button in the split JSON Settings editor."
 )));
-const settingsMoreActionIcon = registerIcon("settings-more-action", Codicon.gear, ( localize(12157, "Icon for the 'more actions' action in the Settings UI.")));
-const keybindingsRecordKeysIcon = registerIcon("keybindings-record-keys", Codicon.recordKeys, ( localize(12158, "Icon for the 'record keys' action in the keybinding UI.")));
-const keybindingsSortIcon = registerIcon("keybindings-sort", Codicon.sortPrecedence, ( localize(12159, "Icon for the 'sort by precedence' toggle in the keybinding UI.")));
-const keybindingsEditIcon = registerIcon("keybindings-edit", Codicon.edit, ( localize(12160, "Icon for the edit action in the keybinding UI.")));
-const keybindingsAddIcon = registerIcon("keybindings-add", Codicon.add, ( localize(12161, "Icon for the add action in the keybinding UI.")));
-const settingsEditIcon = registerIcon("settings-edit", Codicon.edit, ( localize(12162, "Icon for the edit action in the Settings UI.")));
-const settingsRemoveIcon = registerIcon("settings-remove", Codicon.close, ( localize(12163, "Icon for the remove action in the Settings UI.")));
-const settingsDiscardIcon = registerIcon("settings-discard", Codicon.discard, ( localize(12164, "Icon for the discard action in the Settings UI.")));
-const preferencesClearInputIcon = registerIcon("preferences-clear-input", Codicon.clearAll, ( localize(12165, "Icon for clear input in the Settings and keybinding UI.")));
-const preferencesAiResultsIcon = registerIcon("preferences-ai-results", Codicon.sparkle, ( localize(12166, "Icon for showing AI results in the Settings UI.")));
-const preferencesFilterIcon = registerIcon("preferences-filter", Codicon.filter, ( localize(12167, "Icon for the button that suggests filters for the Settings UI.")));
-const preferencesOpenSettingsIcon = registerIcon("preferences-open-settings", Codicon.goToFile, ( localize(12168, "Icon for open settings commands.")));
+const settingsMoreActionIcon = registerIcon("settings-more-action", Codicon.gear, ( localize(12284, "Icon for the 'more actions' action in the Settings UI.")));
+const keybindingsRecordKeysIcon = registerIcon("keybindings-record-keys", Codicon.recordKeys, ( localize(12285, "Icon for the 'record keys' action in the keybinding UI.")));
+const keybindingsSortIcon = registerIcon("keybindings-sort", Codicon.sortPrecedence, ( localize(12286, "Icon for the 'sort by precedence' toggle in the keybinding UI.")));
+const keybindingsEditIcon = registerIcon("keybindings-edit", Codicon.edit, ( localize(12287, "Icon for the edit action in the keybinding UI.")));
+const keybindingsAddIcon = registerIcon("keybindings-add", Codicon.add, ( localize(12288, "Icon for the add action in the keybinding UI.")));
+const settingsEditIcon = registerIcon("settings-edit", Codicon.edit, ( localize(12289, "Icon for the edit action in the Settings UI.")));
+const settingsRemoveIcon = registerIcon("settings-remove", Codicon.close, ( localize(12290, "Icon for the remove action in the Settings UI.")));
+const settingsDiscardIcon = registerIcon("settings-discard", Codicon.discard, ( localize(12291, "Icon for the discard action in the Settings UI.")));
+const preferencesClearInputIcon = registerIcon("preferences-clear-input", Codicon.clearAll, ( localize(12292, "Icon for clear input in the Settings and keybinding UI.")));
+const preferencesAiResultsIcon = registerIcon("preferences-ai-results", Codicon.sparkle, ( localize(12293, "Icon for showing AI results in the Settings UI.")));
+const preferencesFilterIcon = registerIcon("preferences-filter", Codicon.filter, ( localize(12294, "Icon for the button that suggests filters for the Settings UI.")));
+const preferencesOpenSettingsIcon = registerIcon("preferences-open-settings", Codicon.goToFile, ( localize(12295, "Icon for open settings commands.")));
 
 export { keybindingsAddIcon, keybindingsEditIcon, keybindingsRecordKeysIcon, keybindingsSortIcon, preferencesAiResultsIcon, preferencesClearInputIcon, preferencesFilterIcon, preferencesOpenSettingsIcon, settingsDiscardIcon, settingsEditIcon, settingsMoreActionIcon, settingsRemoveIcon, settingsScopeDropDownIcon };

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js

@@ -220,17 +220,17 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     resetLabels() {
         const remoteAuthority = this.environmentService.remoteAuthority;
         const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
-        this.userLocalSettings.label = ( localize(12188, "User"));
-        this.userRemoteSettings.label = ( localize(12189, "Remote")) + (hostLabel ? ` [${hostLabel}]` : "");
-        this.workspaceSettings.label = this.contextService.getWorkspace().name || ( localize(12190, "Workspace"));
-        this.folderSettingsAction.label = ( localize(12191, "Folder"));
+        this.userLocalSettings.label = ( localize(12315, "User"));
+        this.userRemoteSettings.label = ( localize(12316, "Remote")) + (hostLabel ? ` [${hostLabel}]` : "");
+        this.workspaceSettings.label = this.contextService.getWorkspace().name || ( localize(12317, "Workspace"));
+        this.folderSettingsAction.label = ( localize(12318, "Folder"));
     }
     create(parent) {
         const settingsTabsWidget = append(parent, $(".settings-tabs-widget"));
         this.settingsSwitcherBar = this._register(( new ActionBar(settingsTabsWidget, {
             orientation: ActionsOrientation.HORIZONTAL,
             focusOnlyEnabledItems: true,
-            ariaLabel: ( localize(12192, "Settings Switcher")),
+            ariaLabel: ( localize(12319, "Settings Switcher")),
             ariaRole: "tablist",
             actionViewItemProvider: (action, options) => action.id === "folderSettings" ? this.folderSettings : undefined
         })));
@@ -241,7 +241,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
             true,
             () => this.updateTarget(ConfigurationTarget.USER_LOCAL)
         )));
-        this.userLocalSettings.tooltip = ( localize(12188, "User"));
+        this.userLocalSettings.tooltip = ( localize(12315, "User"));
         this.userRemoteSettings = this._register(( new Action(
             "userSettingsRemote",
             "",
@@ -251,7 +251,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
         )));
         const remoteAuthority = this.environmentService.remoteAuthority;
         const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
-        this.userRemoteSettings.tooltip = ( localize(12189, "Remote")) + (hostLabel ? ` [${hostLabel}]` : "");
+        this.userRemoteSettings.tooltip = ( localize(12316, "Remote")) + (hostLabel ? ` [${hostLabel}]` : "");
         this.workspaceSettings = this._register(( new Action(
             "workspaceSettings",
             "",
@@ -291,13 +291,13 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     }
     setResultCount(settingsTarget, count) {
         if (settingsTarget === ConfigurationTarget.WORKSPACE) {
-            let label = this.contextService.getWorkspace().name ?? ( localize(12190, "Workspace"));
+            let label = this.contextService.getWorkspace().name ?? ( localize(12317, "Workspace"));
             if (count) {
                 label += ` (${count})`;
             }
             this.workspaceSettings.label = label;
         } else if (settingsTarget === ConfigurationTarget.USER_LOCAL) {
-            let label = ( localize(12188, "User"));
+            let label = ( localize(12315, "User"));
             if (count) {
                 label += ` (${count})`;
             }
@@ -342,7 +342,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
         this.userRemoteSettings.enabled = !!(this.options.enableRemoteSettings && this.environmentService.remoteAuthority);
         this.workspaceSettings.enabled = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY;
         this.folderSettings.action.enabled = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.contextService.getWorkspace().folders.length > 0;
-        this.workspaceSettings.tooltip = ( localize(12190, "Workspace"));
+        this.workspaceSettings.tooltip = ( localize(12317, "Workspace"));
     }
 };
 SettingsTargetsWidget = ( __decorate([( __param(2, IWorkspaceContextService)), ( __param(3, IInstantiationService)), ( __param(4, IWorkbenchEnvironmentService)), ( __param(5, ILabelService)), ( __param(6, ILanguageService))], SettingsTargetsWidget));