@codingame/monaco-vscode-dialogs-service-override 3.2.3 → 4.0.0

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-dialogs-service-override",
-  "version": "3.2.3",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

package/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.js

@@ -3,7 +3,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { Dialog } from 'vscode/vscode/vs/base/browser/ui/dialog/dialog';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { EventHelper } from 'vscode/vscode/vs/base/browser/dom';
@@ -69,7 +69,7 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         };
         const detail = detailString(true);
         const detailToCopy = detailString(false);
-        const { button } = await this.doShow(Severity.Info, this.productService.nameLong, [
+        const { button } = await this.doShow(Severity$1.Info, this.productService.nameLong, [
             ( localizeWithPath(
                 'vs/workbench/browser/parts/dialogs/dialogHandler',
                 { key: 'copy', comment: ['&& denotes a mnemonic'] },

package/vscode/src/vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.js

@@ -16,7 +16,17 @@ import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
 import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { renderFormattedText } from 'vscode/vscode/vs/base/browser/formattedTextRenderer';
 import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { editorWidgetBackground, widgetShadow, widgetBorder, contrastBorder, editorWidgetForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { contrastBorder } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorWidgetBackground, widgetShadow, widgetBorder, editorWidgetForeground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 
 class WelcomeWidget extends Disposable {
     constructor(_editor, instantiationService, commandService, telemetryService, openerService) {

package/vscode/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.js

@@ -14,7 +14,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { coalesce, distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { trim } from 'vscode/vscode/vs/base/common/strings';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
@@ -142,7 +142,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             detail = getFileNamesMessage(fileNamesOrResources) + '\n' + detail;
         }
         const { result } = await this.dialogService.prompt({
-            type: Severity.Warning,
+            type: Severity$1.Warning,
             message,
             detail,
             buttons: [

package/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.js

@@ -545,43 +545,49 @@ let SimpleFileDialog = class SimpleFileDialog {
             value = this.pathFromUri(valueUri);
             return (await this.updateItems(valueUri, true)) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
         }
-        else if (!extUriIgnorePathCase.isEqual(this.currentFolder, valueUri) && (this.endsWithSlash(value) || (!extUriIgnorePathCase.isEqual(this.currentFolder, dirname(valueUri)) && extUriIgnorePathCase.isEqualOrParent(this.currentFolder, dirname(valueUri))))) {
-            let stat;
-            try {
-                stat = await this.fileService.stat(valueUri);
-            }
-            catch (e) {
-            }
-            if (stat && stat.isDirectory && (basename(valueUri) !== '.') && this.endsWithSlash(value)) {
-                valueUri = this.tryAddTrailingSeparatorToDirectory(valueUri, stat);
-                return (await this.updateItems(valueUri)) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
-            }
-            else if (this.endsWithSlash(value)) {
-                this.filePickBox.validationMessage = ( localizeWithPath(
-                    'vs/workbench/services/dialogs/browser/simpleFileDialog',
-                    'remoteFileDialog.badPath',
-                    'The path does not exist.'
-                ));
-                this.badPath = value;
-                return UpdateResult.InvalidPath;
-            }
-            else {
-                let inputUriDirname = dirname(valueUri);
-                const currentFolderWithoutSep = removeTrailingPathSeparator(addTrailingPathSeparator(this.currentFolder));
-                const inputUriDirnameWithoutSep = removeTrailingPathSeparator(addTrailingPathSeparator(inputUriDirname));
-                if (!extUriIgnorePathCase.isEqual(currentFolderWithoutSep, inputUriDirnameWithoutSep)
-                    && (!/^[a-zA-Z]:$/.test(this.filePickBox.value)
-                        || !equalsIgnoreCase(this.pathFromUri(this.currentFolder).substring(0, this.filePickBox.value.length), this.filePickBox.value))) {
-                    let statWithoutTrailing;
-                    try {
-                        statWithoutTrailing = await this.fileService.stat(inputUriDirname);
-                    }
-                    catch (e) {
-                    }
-                    if (statWithoutTrailing && statWithoutTrailing.isDirectory) {
-                        this.badPath = undefined;
-                        inputUriDirname = this.tryAddTrailingSeparatorToDirectory(inputUriDirname, statWithoutTrailing);
-                        return (await this.updateItems(inputUriDirname, false, basename(valueUri))) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
+        else {
+            const newFolderIsOldFolder = extUriIgnorePathCase.isEqual(this.currentFolder, valueUri);
+            const newFolderIsSubFolder = extUriIgnorePathCase.isEqual(this.currentFolder, dirname(valueUri));
+            const newFolderIsParent = extUriIgnorePathCase.isEqualOrParent(this.currentFolder, dirname(valueUri));
+            const newFolderIsUnrelated = !newFolderIsParent && !newFolderIsSubFolder;
+            if (!newFolderIsOldFolder && (this.endsWithSlash(value) || newFolderIsParent || newFolderIsUnrelated)) {
+                let stat;
+                try {
+                    stat = await this.fileService.stat(valueUri);
+                }
+                catch (e) {
+                }
+                if (stat && stat.isDirectory && (basename(valueUri) !== '.') && this.endsWithSlash(value)) {
+                    valueUri = this.tryAddTrailingSeparatorToDirectory(valueUri, stat);
+                    return (await this.updateItems(valueUri)) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
+                }
+                else if (this.endsWithSlash(value)) {
+                    this.filePickBox.validationMessage = ( localizeWithPath(
+                        'vs/workbench/services/dialogs/browser/simpleFileDialog',
+                        'remoteFileDialog.badPath',
+                        'The path does not exist.'
+                    ));
+                    this.badPath = value;
+                    return UpdateResult.InvalidPath;
+                }
+                else {
+                    let inputUriDirname = dirname(valueUri);
+                    const currentFolderWithoutSep = removeTrailingPathSeparator(addTrailingPathSeparator(this.currentFolder));
+                    const inputUriDirnameWithoutSep = removeTrailingPathSeparator(addTrailingPathSeparator(inputUriDirname));
+                    if (!extUriIgnorePathCase.isEqual(currentFolderWithoutSep, inputUriDirnameWithoutSep)
+                        && (!/^[a-zA-Z]:$/.test(this.filePickBox.value)
+                            || !equalsIgnoreCase(this.pathFromUri(this.currentFolder).substring(0, this.filePickBox.value.length), this.filePickBox.value))) {
+                        let statWithoutTrailing;
+                        try {
+                            statWithoutTrailing = await this.fileService.stat(inputUriDirname);
+                        }
+                        catch (e) {
+                        }
+                        if (statWithoutTrailing && statWithoutTrailing.isDirectory) {
+                            this.badPath = undefined;
+                            inputUriDirname = this.tryAddTrailingSeparatorToDirectory(inputUriDirname, statWithoutTrailing);
+                            return (await this.updateItems(inputUriDirname, false, basename(valueUri))) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
+                        }
                     }
                 }
             }

package/vscode/src/vs/workbench/services/dialogs/common/dialogService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { DialogsModel } from '../../../common/dialogs.js';
@@ -48,13 +48,13 @@ let DialogService = class DialogService extends Disposable {
         return await handle.result;
     }
     async info(message, detail) {
-        await this.prompt({ type: Severity.Info, message, detail });
+        await this.prompt({ type: Severity$1.Info, message, detail });
     }
     async warn(message, detail) {
-        await this.prompt({ type: Severity.Warning, message, detail });
+        await this.prompt({ type: Severity$1.Warning, message, detail });
     }
     async error(message, detail) {
-        await this.prompt({ type: Severity.Error, message, detail });
+        await this.prompt({ type: Severity$1.Error, message, detail });
     }
     async about() {
         if (this.skipDialogs()) {