@codingame/monaco-vscode-api 4.5.1 → 5.0.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -8,6 +8,7 @@ import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/arrays.js';
 import { basename, isEqual } from '../../../../base/common/resources.js';
 import Severity$1 from '../../../../base/common/severity.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
@@ -25,6 +26,7 @@ import { StorageCloseWithConflicts } from '../common/mergeEditor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 var WorkspaceMergeEditorModeFactory_1;
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel";
 let TempFileMergeEditorModeFactory = class TempFileMergeEditorModeFactory {
     constructor(_mergeEditorTelemetry, _instantiationService, _textModelService, _modelService) {
         this._mergeEditorTelemetry = _mergeEditorTelemetry;
@@ -33,7 +35,7 @@ let TempFileMergeEditorModeFactory = class TempFileMergeEditorModeFactory {
         this._modelService = _modelService;
     }
     async createInputModel(args) {
-        const store = ( new DisposableStore());
+        const store = ( (new DisposableStore()));
         const [base, result, input1Data, input2Data,] = await Promise.all([
             this._textModelService.createModelReference(args.base),
             this._textModelService.createModelReference(args.result),
@@ -57,11 +59,11 @@ let TempFileMergeEditorModeFactory = class TempFileMergeEditorModeFactory {
         return this._instantiationService.createInstance(TempFileMergeEditorInputModel, model, store, result.object, args.result);
     }
 };
-TempFileMergeEditorModeFactory = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, ITextModelService)),
-    ( __param(3, IModelService))
-], TempFileMergeEditorModeFactory));
+TempFileMergeEditorModeFactory = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, ITextModelService))),
+    ( (__param(3, IModelService)))
+], TempFileMergeEditorModeFactory)));
 let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends EditorModel {
     constructor(model, disposable, result, resultUri, textFileService, dialogService, editorService) {
         super();
@@ -98,46 +100,34 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         return true;
     }
     async confirmClose(inputModels) {
-        assertFn(() => ( inputModels.some((m) => m === this)));
-        const someDirty = ( inputModels.some((m) => m.isDirty.get()));
+        assertFn(() => ( (inputModels.some((m) => m === this))));
+        const someDirty = ( (inputModels.some((m) => m.isDirty.get())));
         let choice;
         if (someDirty) {
             const isMany = inputModels.length > 1;
             const message = isMany
                 ? ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                'messageN',
+                _moduleId,
+                0,
                 'Do you want keep the merge result of {0} files?',
                 inputModels.length
             ))
                 : ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                'message1',
+                _moduleId,
+                1,
                 'Do you want keep the merge result of {0}?',
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
-            const hasUnhandledConflicts = ( inputModels.some((m) => m.model.hasUnhandledConflicts.get()));
+            const hasUnhandledConflicts = ( (inputModels.some((m) => m.model.hasUnhandledConflicts.get())));
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'saveWithConflict', comment: ['&& denotes a mnemonic'] },
-                            "&&Save With Conflicts"
-                        )) :
-                        ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'save', comment: ['&& denotes a mnemonic'] },
-                            "&&Save"
-                        )),
+                        ( localizeWithPath(_moduleId, 2, "&&Save With Conflicts")) :
+                        ( localizeWithPath(_moduleId, 3, "&&Save")),
                     run: () => 0
                 },
                 {
-                    label: ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        { key: 'discard', comment: ['&& denotes a mnemonic'] },
-                        "Do&&n't Save"
-                    )),
+                    label: ( localizeWithPath(_moduleId, 4, "Do&&n't Save")),
                     run: () => 1
                 }
             ];
@@ -147,26 +137,18 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 detail: hasUnhandledConflicts
                     ? isMany
                         ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'detailNConflicts',
+                    _moduleId,
+                    5,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 ))
                         : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'detail1Conflicts',
+                    _moduleId,
+                    6,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
                 ))
                     : isMany
-                        ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'detailN',
-                    "The merge results will be lost if you don't save them."
-                ))
-                        : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'detail1',
-                    "The merge result will be lost if you don't save it."
-                )),
+                        ? ( localizeWithPath(_moduleId, 7, "The merge results will be lost if you don't save them."))
+                        : ( localizeWithPath(_moduleId, 8, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => 2
@@ -177,10 +159,10 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             choice = 1 ;
         }
         if (choice === 0 ) {
-            await Promise.all(( inputModels.map(m => m.accept())));
+            await Promise.all(( (inputModels.map(m => m.accept()))));
         }
         else if (choice === 1 ) {
-            await Promise.all(( inputModels.map(m => m._discard())));
+            await Promise.all(( (inputModels.map(m => m._discard()))));
         }
         else ;
         return choice;
@@ -191,21 +173,13 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'saveTempFile.message',
-                    "Do you want to accept the merge result?"
-                )),
+                message: ( localizeWithPath(_moduleId, 9, "Do you want to accept the merge result?")),
                 detail: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'saveTempFile.detail',
+                    _moduleId,
+                    10,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    { key: 'acceptMerge', comment: ['&& denotes a mnemonic'] },
-                    '&&Accept Merge'
-                ))
+                primaryButton: ( localizeWithPath(_moduleId, 11, '&&Accept Merge'))
             });
             if (confirmed) {
                 await this.accept();
@@ -217,11 +191,11 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
     async revert(options) {
     }
 };
-TempFileMergeEditorInputModel = ( __decorate([
-    ( __param(4, ITextFileService)),
-    ( __param(5, IDialogService)),
-    ( __param(6, IEditorService))
-], TempFileMergeEditorInputModel));
+TempFileMergeEditorInputModel = ( (__decorate([
+    ( (__param(4, ITextFileService))),
+    ( (__param(5, IDialogService))),
+    ( (__param(6, IEditorService)))
+], TempFileMergeEditorInputModel)));
 let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
     static { WorkspaceMergeEditorModeFactory_1 = this; }
     constructor(_mergeEditorTelemetry, _instantiationService, _textModelService, textFileService) {
@@ -230,15 +204,11 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._textModelService = _textModelService;
         this.textFileService = textFileService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localizeWithPath(
-        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-        'merge-editor.source',
-        "Before Resolving Conflicts In Merge Editor"
-    ))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localizeWithPath(_moduleId, 12, "Before Resolving Conflicts In Merge Editor"))); }
     async createInputModel(args) {
-        const store = ( new DisposableStore());
+        const store = ( (new DisposableStore()));
         let resultTextFileModel = undefined;
-        const modelListener = store.add(( new DisposableStore()));
+        const modelListener = store.add(( (new DisposableStore())));
         const handleDidCreate = (model) => {
             if (isEqual(args.result, model.resource)) {
                 modelListener.clear();
@@ -256,11 +226,11 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         store.add(base);
         store.add(result);
         if (!resultTextFileModel) {
-            throw new BugIndicatingError();
+            throw ( (new BugIndicatingError()));
         }
         await resultTextFileModel.save({ source: WorkspaceMergeEditorModeFactory_1.FILE_SAVED_SOURCE });
         const lines = resultTextFileModel.textEditorModel.getLinesContent();
-        const hasConflictMarkers = ( lines.some(l => l.startsWith(conflictMarkers.start)));
+        const hasConflictMarkers = ( (lines.some(l => l.startsWith(conflictMarkers.start))));
         const resetResult = hasConflictMarkers;
         const mergeDiffComputer = this._instantiationService.createInstance(MergeDiffComputer);
         const model = this._instantiationService.createInstance(MergeEditorModel, base.object.textEditorModel, input1Data, input2Data, result.object.textEditorModel, mergeDiffComputer, {
@@ -271,11 +241,11 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         return this._instantiationService.createInstance(WorkspaceMergeEditorInputModel, model, store, resultTextFileModel, this._mergeEditorTelemetry);
     }
 };
-WorkspaceMergeEditorModeFactory = WorkspaceMergeEditorModeFactory_1 = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, ITextModelService)),
-    ( __param(3, ITextFileService))
-], WorkspaceMergeEditorModeFactory));
+WorkspaceMergeEditorModeFactory = WorkspaceMergeEditorModeFactory_1 = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, ITextModelService))),
+    ( (__param(3, ITextFileService)))
+], WorkspaceMergeEditorModeFactory)));
 let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extends EditorModel {
     constructor(model, disposableStore, resultTextFileModel, telemetry, _dialogService, _storageService) {
         super();
@@ -287,7 +257,7 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         this._storageService = _storageService;
         this.isDirty = observableFromEvent(Event.any(this.resultTextFileModel.onDidChangeDirty, this.resultTextFileModel.onDidSaveError), () =>  this.resultTextFileModel.isDirty());
         this.reported = false;
-        this.dateTimeOpened = ( new Date());
+        this.dateTimeOpened = ( (new Date()));
     }
     dispose() {
         this.disposableStore.dispose();
@@ -297,7 +267,7 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
     reportClose(accepted) {
         if (!this.reported) {
             const remainingConflictCount = this.model.unhandledConflictsCount.get();
-            const durationOpenedMs = ( new Date()).getTime() - this.dateTimeOpened.getTime();
+            const durationOpenedMs = ( (new Date())).getTime() - this.dateTimeOpened.getTime();
             this.telemetry.reportMergeEditorClosed({
                 durationOpenedSecs: durationOpenedMs / 1000,
                 remainingConflictCount,
@@ -339,19 +309,19 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
     }
     async confirmClose(inputModels) {
         const isMany = inputModels.length > 1;
-        const someDirty = ( inputModels.some(m => m.isDirty.get()));
-        const someUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
+        const someDirty = ( (inputModels.some(m => m.isDirty.get())));
+        const someUnhandledConflicts = ( (inputModels.some(m => m.model.hasUnhandledConflicts.get())));
         if (someDirty) {
             const message = isMany
                 ? ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                'workspace.messageN',
+                _moduleId,
+                13,
                 'Do you want to save the changes you made to {0} files?',
                 inputModels.length
             ))
                 : ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                'workspace.message1',
+                _moduleId,
+                14,
                 'Do you want to save the changes you made to {0}?',
                 basename(inputModels[0].resultUri)
             ));
@@ -361,47 +331,27 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 detail: someUnhandledConflicts ?
                     isMany
                         ? ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        'workspace.detailN.unhandled',
+                        _moduleId,
+                        15,
                         "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                         : ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        'workspace.detail1.unhandled',
+                        _moduleId,
+                        16,
                         "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                     : isMany
-                        ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'workspace.detailN.handled',
-                    "Your changes will be lost if you don't save them."
-                ))
-                        : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'workspace.detail1.handled',
-                    "Your changes will be lost if you don't save them."
-                )),
+                        ? ( localizeWithPath(_moduleId, 17, "Your changes will be lost if you don't save them."))
+                        : ( localizeWithPath(_moduleId, 18, "Your changes will be lost if you don't save them.")),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'workspace.saveWithConflict', comment: ['&& denotes a mnemonic'] },
-                            '&&Save with Conflicts'
-                        ))
-                            : ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'workspace.save', comment: ['&& denotes a mnemonic'] },
-                            '&&Save'
-                        )),
+                            ? ( localizeWithPath(_moduleId, 19, '&&Save with Conflicts'))
+                            : ( localizeWithPath(_moduleId, 20, '&&Save')),
                         run: () => 0
                     },
                     {
-                        label: ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'workspace.doNotSave', comment: ['&& denotes a mnemonic'] },
-                            "Do&&n't Save"
-                        )),
+                        label: ( localizeWithPath(_moduleId, 21, "Do&&n't Save")),
                         run: () => 1
                     }
                 ],
@@ -415,46 +365,26 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
                     ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'workspace.messageN.nonDirty',
+                    _moduleId,
+                    22,
                     'Do you want to close {0} merge editors?',
                     inputModels.length
                 ))
                     : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'workspace.message1.nonDirty',
+                    _moduleId,
+                    23,
                     'Do you want to close the merge editor for {0}?',
                     basename(inputModels[0].resultUri)
                 )),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        'workspace.detailN.unhandled.nonDirty',
-                        "The files contain unhandled conflicts."
-                    ))
-                        : ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        'workspace.detail1.unhandled.nonDirty',
-                        "The file contains unhandled conflicts."
-                    ))
+                        ? ( localizeWithPath(_moduleId, 24, "The files contain unhandled conflicts."))
+                        : ( localizeWithPath(_moduleId, 25, "The file contains unhandled conflicts."))
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    { key: 'workspace.closeWithConflicts', comment: ['&& denotes a mnemonic'] },
-                    '&&Close with Conflicts'
-                ))
-                    : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    { key: 'workspace.close', comment: ['&& denotes a mnemonic'] },
-                    '&&Close'
-                )),
-                checkbox: { label: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'noMoreWarn',
-                    "Do not ask me again"
-                )) }
+                    ? ( localizeWithPath(_moduleId, 26, '&&Close with Conflicts'))
+                    : ( localizeWithPath(_moduleId, 27, '&&Close')),
+                checkbox: { label: ( localizeWithPath(_moduleId, 28, "Do not ask me again")) }
             });
             if (checkboxChecked) {
                 this._storageService.store(StorageCloseWithConflicts, true, 0 , 0 );
@@ -466,10 +396,10 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         }
     }
 };
-WorkspaceMergeEditorInputModel = ( __decorate([
-    ( __param(4, IDialogService)),
-    ( __param(5, IStorageService))
-], WorkspaceMergeEditorInputModel));
+WorkspaceMergeEditorInputModel = ( (__decorate([
+    ( (__param(4, IDialogService))),
+    ( (__param(5, IStorageService)))
+], WorkspaceMergeEditorInputModel)));
 async function toInputData(data, textModelService, store) {
     const ref = await textModelService.createModelReference(data.uri);
     store.add(ref);

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js

@@ -1,5 +1,6 @@
 import '../../../../../base/browser/dom.js';
 import '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/arrays.js';
 import '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/utils.js';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.js

@@ -22,7 +22,7 @@ let MergeDiffComputer = class MergeDiffComputer {
             computeMoves: false,
         }, diffAlgorithm);
         if (!result) {
-            throw new Error('Diff computation failed');
+            throw ( new Error('Diff computation failed'));
         }
         if (textModel1.isDisposed() || textModel2.isDisposed()) {
             return { diffs: null };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.js

@@ -22,7 +22,7 @@ class LineRange {
         this.startLineNumber = startLineNumber;
         this.lineCount = lineCount;
         if (lineCount < 0) {
-            throw new BugIndicatingError();
+            throw ( new BugIndicatingError());
         }
     }
     join(other) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js

@@ -17,7 +17,7 @@ class LineRangeMapping {
     }
     extendInputRange(extendedInputRange) {
         if (!extendedInputRange.containsRange(this.inputRange)) {
-            throw new BugIndicatingError();
+            throw ( new BugIndicatingError());
         }
         const startDelta = extendedInputRange.startLineNumber - this.inputRange.startLineNumber;
         const endDelta = extendedInputRange.endLineNumberExclusive - this.inputRange.endLineNumberExclusive;