npm - @codingame/monaco-vscode-dialogs-service-override - Versions diffs - 1.85.6 → 2.0.0-v2.1 - Mend

@codingame/monaco-vscode-dialogs-service-override 1.85.6 → 2.0.0-v2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dialogs.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import './vscode/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.js';
 import { DialogService } from './vscode/src/vs/workbench/services/dialogs/common/dialogService.js';
 import './override/vs/platform/dialogs/common/dialogs.js';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { AbstractFileDialogService } from './vscode/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.js';
 import getServiceOverride$1 from '@codingame/monaco-vscode-layout-service-override';
 import { unsupported } from './tools.js';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-dialogs-service-override",
-  "version": "1.85.6",
+  "version": "2.0.0-v2.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
+    "url": "git@github.com:CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "private": false,
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.6",
-    "monaco-editor": "0.45.0",
-    "@codingame/monaco-vscode-layout-service-override": "1.85.6"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
+    "vscode-marked": "npm:marked@=3.0.2",
+    "@codingame/monaco-vscode-layout-service-override": "2.0.0-v2.1"
   }
 }

package/vscode/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.js CHANGED Viewed

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { BrowserDialogHandler } from './dialogHandler.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 let DialogHandlerContribution = class DialogHandlerContribution extends Disposable {

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

@@ -1,19 +1,19 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
-import { Dialog } from 'monaco-editor/esm/vs/base/browser/ui/dialog/dialog.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { EventHelper } from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
-import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.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 { 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';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { fromNow } from 'vscode/vscode/vs/base/common/date';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { MarkdownRenderer } from 'monaco-editor/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer.js';
-import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { MarkdownRenderer } from 'vscode/vscode/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
+import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { AbstractDialogHandler } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 var BrowserDialogHandler_1;

package/vscode/src/vs/workbench/common/dialogs.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 class DialogsModel extends Disposable {
     constructor() {

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

@@ -1,32 +1,32 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { isWorkspaceToOpen, isFileToOpen } from 'vscode/vscode/vs/platform/window/common/window';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { isSavedWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION, IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { isSavedWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION, IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
-import { isAbsolute, normalize } from 'monaco-editor/esm/vs/base/common/path.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { dirname, toLocalResource, basename, extname } from 'vscode/vscode/vs/base/common/resources';
+import { isAbsolute, normalize } from 'vscode/vscode/vs/base/common/path';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { SimpleFileDialog } from './simpleFileDialog.js';
 import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+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 'monaco-editor/esm/vs/base/common/severity.js';
-import { coalesce, distinct } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { trim } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
+import Severity 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';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { PLAINTEXT_EXTENSION } from 'monaco-editor/esm/vs/editor/common/languages/modesRegistry.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { PLAINTEXT_EXTENSION } from 'vscode/vscode/vs/editor/common/languages/modesRegistry';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { EditorOpenSource } from 'monaco-editor/esm/vs/platform/editor/common/editor.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { EditorOpenSource } from 'vscode/vscode/vs/platform/editor/common/editor';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { getFileNamesMessage, IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 let AbstractFileDialogService = class AbstractFileDialogService {
@@ -55,7 +55,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter, authorityFilter);
         }
         else {
-            candidate = resources.dirname(candidate);
+            candidate = dirname(candidate);
         }
         if (!candidate) {
             candidate = await this.preferredHome(schemeFilter);
@@ -70,7 +70,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         if (!candidate) {
             return this.preferredHome(schemeFilter);
         }
-        return resources.dirname(candidate);
+        return dirname(candidate);
     }
     async preferredHome(schemeFilter = this.getSchemeFilterForWindow()) {
         const preferLocal = schemeFilter === Schemas.file;
@@ -80,7 +80,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             const isPreferredHomeCandidateAbsolute = preferLocal ? isAbsolute(preferredHomeCandidate) : (await this.pathService.path).isAbsolute(preferredHomeCandidate);
             if (isPreferredHomeCandidateAbsolute) {
                 const preferredHomeNormalized = preferLocal ? normalize(preferredHomeCandidate) : (await this.pathService.path).normalize(preferredHomeCandidate);
-                const preferredHome = resources.toLocalResource(await this.pathService.fileURI(preferredHomeNormalized), this.environmentService.remoteAuthority, this.pathService.defaultUriScheme);
+                const preferredHome = toLocalResource(await this.pathService.fileURI(preferredHomeNormalized), this.environmentService.remoteAuthority, this.pathService.defaultUriScheme);
                 if (await this.fileService.exists(preferredHome)) {
                     return preferredHome;
                 }
@@ -93,7 +93,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         if (this.contextService.getWorkbenchState() === 3 ) {
             const configuration = this.contextService.getWorkspace().configuration;
             if (configuration?.scheme === schemeFilter && isSavedWorkspace(configuration, this.environmentService) && !isTemporaryWorkspace(configuration)) {
-                defaultWorkspacePath = resources.dirname(configuration);
+                defaultWorkspacePath = dirname(configuration);
             }
         }
         if (!defaultWorkspacePath) {
@@ -119,21 +119,21 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             return 1 ;
         }
         let message;
-        let detail = ( nls.localizeWithPath(
+        let detail = ( localizeWithPath(
             'vs/workbench/services/dialogs/browser/abstractFileDialogService',
             'saveChangesDetail',
             "Your changes will be lost if you don't save them."
         ));
         if (fileNamesOrResources.length === 1) {
-            message = ( nls.localizeWithPath(
+            message = ( localizeWithPath(
                 'vs/workbench/services/dialogs/browser/abstractFileDialogService',
                 'saveChangesMessage',
                 "Do you want to save the changes you made to {0}?",
-                typeof fileNamesOrResources[0] === 'string' ? fileNamesOrResources[0] : resources.basename(fileNamesOrResources[0])
+                typeof fileNamesOrResources[0] === 'string' ? fileNamesOrResources[0] : basename(fileNamesOrResources[0])
             ));
         }
         else {
-            message = ( nls.localizeWithPath(
+            message = ( localizeWithPath(
                 'vs/workbench/services/dialogs/browser/abstractFileDialogService',
                 'saveChangesMessages',
                 "Do you want to save the changes to the following {0} files?",
@@ -148,12 +148,12 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             buttons: [
                 {
                     label: fileNamesOrResources.length > 1 ?
-                        ( nls.localizeWithPath(
+                        ( localizeWithPath(
                             'vs/workbench/services/dialogs/browser/abstractFileDialogService',
                             { key: 'saveAll', comment: ['&& denotes a mnemonic'] },
                             "&&Save All"
                         )) :
-                        ( nls.localizeWithPath(
+                        ( localizeWithPath(
                             'vs/workbench/services/dialogs/browser/abstractFileDialogService',
                             { key: 'save', comment: ['&& denotes a mnemonic'] },
                             "&&Save"
@@ -161,7 +161,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
                     run: () => 0
                 },
                 {
-                    label: ( nls.localizeWithPath(
+                    label: ( localizeWithPath(
                         'vs/workbench/services/dialogs/browser/abstractFileDialogService',
                         { key: 'dontSave', comment: ['&& denotes a mnemonic'] },
                         "Do&&n't Save"
@@ -179,7 +179,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         return schema === Schemas.untitled ? [Schemas.file] : (schema !== Schemas.file ? [schema, Schemas.file] : [schema]);
     }
     async pickFileFolderAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( nls.localizeWithPath(
+        const title = ( localizeWithPath(
             'vs/workbench/services/dialogs/browser/abstractFileDialogService',
             'openFileOrFolder.title',
             'Open File or Folder'
@@ -201,7 +201,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickFileAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( nls.localizeWithPath(
+        const title = ( localizeWithPath(
             'vs/workbench/services/dialogs/browser/abstractFileDialogService',
             'openFile.title',
             'Open File'
@@ -222,7 +222,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         this.workspacesService.addRecentlyOpened([{ fileUri: uri, label: this.labelService.getUriLabel(uri) }]);
     }
     async pickFolderAndOpenSimplified(schema, options) {
-        const title = ( nls.localizeWithPath(
+        const title = ( localizeWithPath(
             'vs/workbench/services/dialogs/browser/abstractFileDialogService',
             'openFolder.title',
             'Open Folder'
@@ -234,12 +234,12 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickWorkspaceAndOpenSimplified(schema, options) {
-        const title = ( nls.localizeWithPath(
+        const title = ( localizeWithPath(
             'vs/workbench/services/dialogs/browser/abstractFileDialogService',
             'openWorkspace.title',
             'Open Workspace from File'
         ));
-        const filters = [{ name: ( nls.localizeWithPath(
+        const filters = [{ name: ( localizeWithPath(
             'vs/workbench/services/dialogs/browser/abstractFileDialogService',
             'filterName.workspace',
             'Workspace'
@@ -254,7 +254,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         if (!options.availableFileSystems) {
             options.availableFileSystems = this.addFileSchemaIfNeeded(schema);
         }
-        options.title = ( nls.localizeWithPath(
+        options.title = ( localizeWithPath(
             'vs/workbench/services/dialogs/browser/abstractFileDialogService',
             'saveFileAs.title',
             'Save As'
@@ -309,14 +309,14 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     getPickFileToSaveDialogOptions(defaultUri, availableFileSystems) {
         const options = {
             defaultUri,
-            title: ( nls.localizeWithPath(
+            title: ( localizeWithPath(
                 'vs/workbench/services/dialogs/browser/abstractFileDialogService',
                 'saveAsTitle',
                 "Save As"
             )),
             availableFileSystems
         };
-        const ext = defaultUri ? resources.extname(defaultUri) : undefined;
+        const ext = defaultUri ? extname(defaultUri) : undefined;
         let matchingFilter;
         const registeredLanguageNames = this.languageService.getSortedRegisteredLanguageNames();
         const registeredLanguageFilters = coalesce(( registeredLanguageNames.map(({ languageName, languageId }) => {
@@ -340,14 +340,14 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             matchingFilter = { name: trim(ext, '.').toUpperCase(), extensions: [trim(ext, '.')] };
         }
         options.filters = coalesce([
-            { name: ( nls.localizeWithPath(
+            { name: ( localizeWithPath(
                 'vs/workbench/services/dialogs/browser/abstractFileDialogService',
                 'allFiles',
                 "All Files"
             )), extensions: ['*'] },
             matchingFilter,
             ...registeredLanguageFilters,
-            { name: ( nls.localizeWithPath(
+            { name: ( localizeWithPath(
                 'vs/workbench/services/dialogs/browser/abstractFileDialogService',
                 'noExt',
                 "No Extension"

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

@@ -1,39 +1,39 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
-import * as Objects from 'monaco-editor/esm/vs/base/common/objects.js';
-import { FileKind, IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { isWindows } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { basename, joinPath, toLocalResource, extname, dirname, extUriIgnorePathCase, relativePath, hasTrailingPathSeparator, addTrailingPathSeparator, isEqual, removeTrailingPathSeparator } from 'vscode/vscode/vs/base/common/resources';
+import { deepClone } from 'vscode/vscode/vs/base/common/objects';
+import { FileKind, IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { isWindows } from 'vscode/vscode/vs/base/common/platform';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { getIconClasses } from 'monaco-editor/esm/vs/editor/common/services/getIconClasses.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
+import { getIconClasses } from 'vscode/vscode/vs/editor/common/services/getIconClasses';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { RawContextKey, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { format, equalsIgnoreCase, startsWithIgnoreCase } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { isValidBasename } from 'monaco-editor/esm/vs/base/common/extpath.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { createCancelablePromise } from 'monaco-editor/esm/vs/base/common/async.js';
+import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { format, equalsIgnoreCase, startsWithIgnoreCase } from 'vscode/vscode/vs/base/common/strings';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { isValidBasename } from 'vscode/vscode/vs/base/common/extpath';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { createCancelablePromise } from 'vscode/vscode/vs/base/common/async';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { normalizeDriveLetter } from 'monaco-editor/esm/vs/base/common/labels.js';
+import { normalizeDriveLetter } from 'vscode/vscode/vs/base/common/labels';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
-import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
-import { getActiveDocument } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
+import { getActiveDocument } from 'vscode/vscode/vs/base/browser/dom';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 var OpenLocalFileCommand;
 ( (function(OpenLocalFileCommand) {
     OpenLocalFileCommand.ID = 'workbench.action.files.openLocalFile';
-    OpenLocalFileCommand.LABEL = ( nls.localizeWithPath(
+    OpenLocalFileCommand.LABEL = ( localizeWithPath(
         'vs/workbench/services/dialogs/browser/simpleFileDialog',
         'openLocalFile',
         "Open Local File..."
@@ -49,7 +49,7 @@ var OpenLocalFileCommand;
 var SaveLocalFileCommand;
 ( (function(SaveLocalFileCommand) {
     SaveLocalFileCommand.ID = 'workbench.action.files.saveLocalFile';
-    SaveLocalFileCommand.LABEL = ( nls.localizeWithPath(
+    SaveLocalFileCommand.LABEL = ( localizeWithPath(
         'vs/workbench/services/dialogs/browser/simpleFileDialog',
         'saveLocalFile',
         "Save Local File..."
@@ -69,7 +69,7 @@ var SaveLocalFileCommand;
 var OpenLocalFolderCommand;
 ( (function(OpenLocalFolderCommand) {
     OpenLocalFolderCommand.ID = 'workbench.action.files.openLocalFolder';
-    OpenLocalFolderCommand.LABEL = ( nls.localizeWithPath(
+    OpenLocalFolderCommand.LABEL = ( localizeWithPath(
         'vs/workbench/services/dialogs/browser/simpleFileDialog',
         'openLocalFolder',
         "Open Local Folder..."
@@ -85,7 +85,7 @@ var OpenLocalFolderCommand;
 var OpenLocalFileFolderCommand;
 ( (function(OpenLocalFileFolderCommand) {
     OpenLocalFileFolderCommand.ID = 'workbench.action.files.openLocalFileFolder';
-    OpenLocalFileFolderCommand.LABEL = ( nls.localizeWithPath(
+    OpenLocalFileFolderCommand.LABEL = ( localizeWithPath(
         'vs/workbench/services/dialogs/browser/simpleFileDialog',
         'openLocalFileFolder',
         "Open Local..."
@@ -181,16 +181,16 @@ let SimpleFileDialog = class SimpleFileDialog {
         let filename = undefined;
         if (options.defaultUri) {
             defaultUri = (this.scheme === options.defaultUri.scheme) ? options.defaultUri : undefined;
-            filename = isSave ? resources.basename(options.defaultUri) : undefined;
+            filename = isSave ? basename(options.defaultUri) : undefined;
         }
         if (!defaultUri) {
             defaultUri = this.userHome;
             if (filename) {
-                defaultUri = resources.joinPath(defaultUri, filename);
+                defaultUri = joinPath(defaultUri, filename);
             }
         }
         if ((this.scheme !== Schemas.file) && !this.fileService.hasProvider(defaultUri)) {
-            this.notificationService.info(( nls.localizeWithPath(
+            this.notificationService.info(( localizeWithPath(
                 'vs/workbench/services/dialogs/browser/simpleFileDialog',
                 'remoteFileDialog.notConnectedToRemote',
                 'File system provider for {0} is not available.',
@@ -198,7 +198,7 @@ let SimpleFileDialog = class SimpleFileDialog {
             )));
             return undefined;
         }
-        const newOptions = Objects.deepClone(options);
+        const newOptions = deepClone(options);
         newOptions.defaultUri = defaultUri;
         return newOptions;
     }
@@ -210,7 +210,7 @@ let SimpleFileDialog = class SimpleFileDialog {
             { scheme: this.scheme, path, query: hintUri?.query, fragment: hintUri?.fragment }
         ));
         const authority = (uri.scheme === Schemas.file) ? undefined : (this.remoteAuthority ?? hintUri?.authority);
-        return resources.toLocalResource(uri, authority,
+        return toLocalResource(uri, authority,
         authority ? this.pathService.defaultUriScheme : uri.scheme);
     }
     getScheme(available, defaultUri) {
@@ -244,7 +244,7 @@ let SimpleFileDialog = class SimpleFileDialog {
         this.isWindows = await this.checkIsWindowsOS();
         let homedir = this.options.defaultUri ? this.options.defaultUri : this.workspaceContextService.getWorkspace().folders[0].uri;
         let stat;
-        const ext = resources.extname(homedir);
+        const ext = extname(homedir);
         if (this.options.defaultUri) {
             try {
                 stat = await this.fileService.stat(this.options.defaultUri);
@@ -252,8 +252,8 @@ let SimpleFileDialog = class SimpleFileDialog {
             catch (e) {
             }
             if (!stat || !stat.isDirectory) {
-                homedir = resources.dirname(this.options.defaultUri);
-                this.trailing = resources.basename(this.options.defaultUri);
+                homedir = dirname(this.options.defaultUri);
+                this.trailing = basename(this.options.defaultUri);
             }
         }
         return ( new Promise((resolve) => {
@@ -266,7 +266,7 @@ let SimpleFileDialog = class SimpleFileDialog {
             this.filePickBox.ok = true;
             if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
                 this.filePickBox.customButton = true;
-                this.filePickBox.customLabel = ( nls.localizeWithPath(
+                this.filePickBox.customLabel = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.local',
                     'Show Local'
@@ -288,7 +288,7 @@ let SimpleFileDialog = class SimpleFileDialog {
             }
             let isResolving = 0;
             let isAcceptHandled = false;
-            this.currentFolder = resources.dirname(homedir);
+            this.currentFolder = dirname(homedir);
             this.userEnteredPathSegment = '';
             this.autoCompletePathSegment = '';
             this.filePickBox.title = this.options.title;
@@ -297,8 +297,8 @@ let SimpleFileDialog = class SimpleFileDialog {
             this.filePickBox.items = [];
             function doResolve(dialog, uri) {
                 if (uri) {
-                    uri = resources.addTrailingPathSeparator(uri, dialog.separator);
-                    uri = resources.removeTrailingPathSeparator(uri);
+                    uri = addTrailingPathSeparator(uri, dialog.separator);
+                    uri = removeTrailingPathSeparator(uri);
                 }
                 resolve(uri);
                 dialog.contextKey.set(false);
@@ -398,7 +398,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                     this.filePickBox.validationMessage = undefined;
                     const filePickBoxUri = this.filePickBoxValue();
                     let updated = UpdateResult.NotUpdated;
-                    if (!resources.extUriIgnorePathCase.isEqual(this.currentFolder, filePickBoxUri)) {
+                    if (!extUriIgnorePathCase.isEqual(this.currentFolder, filePickBoxUri)) {
                         updated = await this.tryUpdateItems(value, filePickBoxUri);
                     }
                     if ((updated === UpdateResult.NotUpdated) || (updated === UpdateResult.UpdatedWithTrailing)) {
@@ -450,15 +450,15 @@ let SimpleFileDialog = class SimpleFileDialog {
             return this.currentFolder;
         }
         const currentDisplayUri = this.remoteUriFrom(currentPath, this.currentFolder);
-        const relativePath = resources.relativePath(currentDisplayUri, directUri);
+        const relativePath$1 = relativePath(currentDisplayUri, directUri);
         const isSameRoot = (this.filePickBox.value.length > 1 && currentPath.length > 1) ? equalsIgnoreCase(this.filePickBox.value.substr(0, 2), currentPath.substr(0, 2)) : false;
-        if (relativePath && isSameRoot) {
-            let path = resources.joinPath(this.currentFolder, relativePath);
-            const directBasename = resources.basename(directUri);
+        if (relativePath$1 && isSameRoot) {
+            let path = joinPath(this.currentFolder, relativePath$1);
+            const directBasename = basename(directUri);
             if ((directBasename === '.') || (directBasename === '..')) {
                 path = this.remoteUriFrom(this.pathAppend(path, directBasename), this.currentFolder);
             }
-            return resources.hasTrailingPathSeparator(directUri) ? resources.addTrailingPathSeparator(path) : path;
+            return hasTrailingPathSeparator(directUri) ? addTrailingPathSeparator(path) : path;
         }
         else {
             return directUri;
@@ -474,7 +474,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                 }
                 else {
                     const newPath = this.pathFromUri(item.uri);
-                    if (startsWithIgnoreCase(newPath, this.filePickBox.value) && (equalsIgnoreCase(item.label, resources.basename(item.uri)))) {
+                    if (startsWithIgnoreCase(newPath, this.filePickBox.value) && (equalsIgnoreCase(item.label, basename(item.uri)))) {
                         this.filePickBox.valueSelection = [this.pathFromUri(this.currentFolder).length, this.filePickBox.value.length];
                         this.insertText(newPath, this.basenameWithTrailingSlash(item.uri));
                     }
@@ -515,24 +515,24 @@ let SimpleFileDialog = class SimpleFileDialog {
     }
     root(value) {
         let lastDir = value;
-        let dir = resources.dirname(value);
-        while (!resources.isEqual(lastDir, dir)) {
+        let dir = dirname(value);
+        while (!isEqual(lastDir, dir)) {
             lastDir = dir;
-            dir = resources.dirname(dir);
+            dir = dirname(dir);
         }
         return dir;
     }
     tildaReplace(value) {
         const home = this.trueHome;
         if ((value.length > 0) && (value[0] === '~')) {
-            return resources.joinPath(home, value.substring(1));
+            return joinPath(home, value.substring(1));
         }
         return this.remoteUriFrom(value);
     }
     tryAddTrailingSeparatorToDirectory(uri, stat) {
         if (stat.isDirectory) {
             if (!this.endsWithSlash(uri.path)) {
-                return resources.addTrailingPathSeparator(uri);
+                return addTrailingPathSeparator(uri);
             }
         }
         return uri;
@@ -547,19 +547,19 @@ let SimpleFileDialog = class SimpleFileDialog {
             value = this.pathFromUri(valueUri);
             return (await this.updateItems(valueUri, true)) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
         }
-        else if (!resources.extUriIgnorePathCase.isEqual(this.currentFolder, valueUri) && (this.endsWithSlash(value) || (!resources.extUriIgnorePathCase.isEqual(this.currentFolder, resources.dirname(valueUri)) && resources.extUriIgnorePathCase.isEqualOrParent(this.currentFolder, resources.dirname(valueUri))))) {
+        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 && (resources.basename(valueUri) !== '.') && this.endsWithSlash(value)) {
+            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 = ( nls.localizeWithPath(
+                this.filePickBox.validationMessage = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.badPath',
                     'The path does not exist.'
@@ -568,10 +568,10 @@ let SimpleFileDialog = class SimpleFileDialog {
                 return UpdateResult.InvalidPath;
             }
             else {
-                let inputUriDirname = resources.dirname(valueUri);
-                const currentFolderWithoutSep = resources.removeTrailingPathSeparator(resources.addTrailingPathSeparator(this.currentFolder));
-                const inputUriDirnameWithoutSep = resources.removeTrailingPathSeparator(resources.addTrailingPathSeparator(inputUriDirname));
-                if (!resources.extUriIgnorePathCase.isEqual(currentFolderWithoutSep, inputUriDirnameWithoutSep)
+                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;
@@ -583,7 +583,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                     if (statWithoutTrailing && statWithoutTrailing.isDirectory) {
                         this.badPath = undefined;
                         inputUriDirname = this.tryAddTrailingSeparatorToDirectory(inputUriDirname, statWithoutTrailing);
-                        return (await this.updateItems(inputUriDirname, false, resources.basename(valueUri))) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
+                        return (await this.updateItems(inputUriDirname, false, basename(valueUri))) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
                     }
                 }
             }
@@ -592,15 +592,15 @@ let SimpleFileDialog = class SimpleFileDialog {
         return UpdateResult.NotUpdated;
     }
     tryUpdateTrailing(value) {
-        const ext = resources.extname(value);
+        const ext = extname(value);
         if (this.trailing && ext) {
-            this.trailing = resources.basename(value);
+            this.trailing = basename(value);
         }
     }
     setActiveItems(value) {
         value = this.pathFromUri(this.tildaReplace(value));
         const asUri = this.remoteUriFrom(value);
-        const inputBasename = resources.basename(asUri);
+        const inputBasename = basename(asUri);
         const userPath = this.constructFullUserPath();
         const pathsEqual = equalsIgnoreCase(userPath, value.substring(0, userPath.length)) ||
             equalsIgnoreCase(value, userPath.substring(0, value.length));
@@ -690,9 +690,9 @@ let SimpleFileDialog = class SimpleFileDialog {
     }
     addPostfix(uri) {
         let result = uri;
-        if (this.requiresTrailing && this.options.filters && this.options.filters.length > 0 && !resources.hasTrailingPathSeparator(uri)) {
+        if (this.requiresTrailing && this.options.filters && this.options.filters.length > 0 && !hasTrailingPathSeparator(uri)) {
             let hasExt = false;
-            const currentExt = resources.extname(uri).substr(1);
+            const currentExt = extname(uri).substr(1);
             for (let i = 0; i < this.options.filters.length; i++) {
                 for (let j = 0; j < this.options.filters[i].extensions.length; j++) {
                     if ((this.options.filters[i].extensions[j] === '*') || (this.options.filters[i].extensions[j] === currentExt)) {
@@ -705,7 +705,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                 }
             }
             if (!hasExt) {
-                result = resources.joinPath(resources.dirname(uri), resources.basename(uri) + '.' + this.options.filters[0].extensions[0]);
+                result = joinPath(dirname(uri), basename(uri) + '.' + this.options.filters[0].extensions[0]);
             }
         }
         return result;
@@ -719,7 +719,7 @@ let SimpleFileDialog = class SimpleFileDialog {
         prompt.ignoreFocusOut = true;
         prompt.ok = true;
         prompt.customButton = true;
-        prompt.customLabel = ( nls.localizeWithPath(
+        prompt.customLabel = ( localizeWithPath(
             'vs/workbench/services/dialogs/browser/simpleFileDialog',
             'remoteFileDialog.cancel',
             'Cancel'
@@ -752,7 +752,7 @@ let SimpleFileDialog = class SimpleFileDialog {
     }
     async validate(uri) {
         if (uri === undefined) {
-            this.filePickBox.validationMessage = ( nls.localizeWithPath(
+            this.filePickBox.validationMessage = ( localizeWithPath(
                 'vs/workbench/services/dialogs/browser/simpleFileDialog',
                 'remoteFileDialog.invalidPath',
                 'Please enter a valid path.'
@@ -762,14 +762,14 @@ let SimpleFileDialog = class SimpleFileDialog {
         let stat;
         let statDirname;
         try {
-            statDirname = await this.fileService.stat(resources.dirname(uri));
+            statDirname = await this.fileService.stat(dirname(uri));
             stat = await this.fileService.stat(uri);
         }
         catch (e) {
         }
         if (this.requiresTrailing) {
             if (stat && stat.isDirectory) {
-                this.filePickBox.validationMessage = ( nls.localizeWithPath(
+                this.filePickBox.validationMessage = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.validateFolder',
                     'The folder already exists. Please use a new file name.'
@@ -777,16 +777,16 @@ let SimpleFileDialog = class SimpleFileDialog {
                 return Promise.resolve(false);
             }
             else if (stat) {
-                const message = ( nls.localizeWithPath(
+                const message = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.validateExisting',
                     '{0} already exists. Are you sure you want to overwrite it?',
-                    resources.basename(uri)
+                    basename(uri)
                 ));
                 return this.yesNoPrompt(uri, message);
             }
-            else if (!(isValidBasename(resources.basename(uri), this.isWindows))) {
-                this.filePickBox.validationMessage = ( nls.localizeWithPath(
+            else if (!(isValidBasename(basename(uri), this.isWindows))) {
+                this.filePickBox.validationMessage = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.validateBadFilename',
                     'Please enter a valid file name.'
@@ -794,16 +794,16 @@ let SimpleFileDialog = class SimpleFileDialog {
                 return Promise.resolve(false);
             }
             else if (!statDirname) {
-                const message = ( nls.localizeWithPath(
+                const message = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.validateCreateDirectory',
                     'The folder {0} does not exist. Would you like to create it?',
-                    resources.basename(resources.dirname(uri))
+                    basename(dirname(uri))
                 ));
                 return this.yesNoPrompt(uri, message);
             }
             else if (!statDirname.isDirectory) {
-                this.filePickBox.validationMessage = ( nls.localizeWithPath(
+                this.filePickBox.validationMessage = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.validateNonexistentDir',
                     'Please enter a path that exists.'
@@ -811,7 +811,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                 return Promise.resolve(false);
             }
             else if (statDirname.readonly || statDirname.locked) {
-                this.filePickBox.validationMessage = ( nls.localizeWithPath(
+                this.filePickBox.validationMessage = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.validateReadonlyFolder',
                     'This folder cannot be used as a save destination. Please choose another folder'
@@ -821,7 +821,7 @@ let SimpleFileDialog = class SimpleFileDialog {
         }
         else {
             if (!stat) {
-                this.filePickBox.validationMessage = ( nls.localizeWithPath(
+                this.filePickBox.validationMessage = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.validateNonexistentDir',
                     'Please enter a path that exists.'
@@ -829,7 +829,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                 return Promise.resolve(false);
             }
             else if (uri.path === '/' && this.isWindows) {
-                this.filePickBox.validationMessage = ( nls.localizeWithPath(
+                this.filePickBox.validationMessage = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.windowsDriveLetter',
                     'Please start the path with a drive letter.'
@@ -837,7 +837,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                 return Promise.resolve(false);
             }
             else if (stat.isDirectory && !this.allowFolderSelection) {
-                this.filePickBox.validationMessage = ( nls.localizeWithPath(
+                this.filePickBox.validationMessage = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.validateFileOnly',
                     'Please select a file.'
@@ -845,7 +845,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                 return Promise.resolve(false);
             }
             else if (!stat.isDirectory && !this.allowFileSelection) {
-                this.filePickBox.validationMessage = ( nls.localizeWithPath(
+                this.filePickBox.validationMessage = ( localizeWithPath(
                     'vs/workbench/services/dialogs/browser/simpleFileDialog',
                     'remoteFileDialog.validateFolderOnly',
                     'Please select a folder.'
@@ -865,8 +865,8 @@ let SimpleFileDialog = class SimpleFileDialog {
             try {
                 folderStat = await this.fileService.resolve(newFolder);
                 if (!folderStat.isDirectory) {
-                    trailing = resources.basename(newFolder);
-                    newFolder = resources.dirname(newFolder);
+                    trailing = basename(newFolder);
+                    newFolder = dirname(newFolder);
                     folderStat = undefined;
                     result = true;
                 }
@@ -874,7 +874,7 @@ let SimpleFileDialog = class SimpleFileDialog {
             catch (e) {
             }
             const newValue = trailing ? this.pathAppend(newFolder, trailing) : this.pathFromUri(newFolder, true);
-            this.currentFolder = this.endsWithSlash(newFolder.path) ? newFolder : resources.addTrailingPathSeparator(newFolder, this.separator);
+            this.currentFolder = this.endsWithSlash(newFolder.path) ? newFolder : addTrailingPathSeparator(newFolder, this.separator);
             this.userEnteredPathSegment = trailing ? trailing : '';
             return this.createItems(folderStat, this.currentFolder, token).then(items => {
                 if (token.isCancellationRequested) {
@@ -924,7 +924,7 @@ let SimpleFileDialog = class SimpleFileDialog {
             return basePath + additional;
         }
         else {
-            return this.pathFromUri(resources.joinPath(uri, additional));
+            return this.pathFromUri(joinPath(uri, additional));
         }
     }
     async checkIsWindowsOS() {
@@ -940,16 +940,16 @@ let SimpleFileDialog = class SimpleFileDialog {
     }
     basenameWithTrailingSlash(fullPath) {
         const child = this.pathFromUri(fullPath, true);
-        const parent = this.pathFromUri(resources.dirname(fullPath), true);
+        const parent = this.pathFromUri(dirname(fullPath), true);
         return child.substring(parent.length);
     }
     async createBackItem(currFolder) {
         const fileRepresentationCurr = this.currentFolder.with({ scheme: Schemas.file, authority: '' });
-        const fileRepresentationParent = resources.dirname(fileRepresentationCurr);
-        if (!resources.isEqual(fileRepresentationCurr, fileRepresentationParent)) {
-            const parentFolder = resources.dirname(currFolder);
+        const fileRepresentationParent = dirname(fileRepresentationCurr);
+        if (!isEqual(fileRepresentationCurr, fileRepresentationParent)) {
+            const parentFolder = dirname(currFolder);
             if (await this.fileService.exists(parentFolder)) {
-                return { label: '..', uri: resources.addTrailingPathSeparator(parentFolder, this.separator), isFolder: true };
+                return { label: '..', uri: addTrailingPathSeparator(parentFolder, this.separator), isFolder: true };
             }
         }
         return undefined;
@@ -1005,10 +1005,10 @@ let SimpleFileDialog = class SimpleFileDialog {
         if (token.isCancellationRequested) {
             return undefined;
         }
-        let fullPath = resources.joinPath(parent, stat.name);
+        let fullPath = joinPath(parent, stat.name);
         if (stat.isDirectory) {
-            const filename = resources.basename(fullPath);
-            fullPath = resources.addTrailingPathSeparator(fullPath, this.separator);
+            const filename = basename(fullPath);
+            fullPath = addTrailingPathSeparator(fullPath, this.separator);
             return { label: filename, uri: fullPath, isFolder: true, iconClasses: getIconClasses(this.modelService, this.languageService, fullPath || undefined, FileKind.FOLDER) };
         }
         else if (!stat.isDirectory && this.allowFileSelection && this.filterFile(fullPath)) {

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

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import Severity 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';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 let DialogService = class DialogService extends Disposable {
     constructor(environmentService, logService) {