allow passing of promise to validate. fix inconsistent selection

This now allows passing of promise to validate function. This also
fixes inconsistent selection on new file creation.

Signed-off-by: Uni Sayo <unibtc@gmail.com>

packages/core/src/browser/dialogs.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { injectable, inject } from 'inversify';
-import { Disposable } from '../common';
+import { Disposable, MaybePromise } from '../common';
 import { Key } from './keys';
 import { Widget, BaseWidget, Message } from './widgets';
 
@@ -194,27 +194,24 @@ export abstract class AbstractDialog<T> extends BaseWidget {
         this.activeElement = undefined;
         super.close();
     }
-    error(error: string): void {
-        this.setErrorMessage(error);
-    }
     protected onUpdateRequest(msg: Message): void {
         super.onUpdateRequest(msg);
         this.validate();
     }
 
-    protected validate(): void {
+    protected async validate(): Promise<void> {
         if (!this.resolve) {
             return;
         }
         const value = this.value;
-        const error = this.isValid(value, 'preview');
+        const error = await this.isValid(value, 'preview');
         this.setErrorMessage(error);
     }
 
-    protected accept(): void {
+    protected async accept(): Promise<void> {
         if (this.resolve) {
             const value = this.value;
-            const error = this.isValid(value, 'open');
+            const error = await this.isValid(value, 'open');
             if (!DialogError.getResult(error)) {
                 this.setErrorMessage(error);
             } else {
@@ -229,7 +226,7 @@ export abstract class AbstractDialog<T> extends BaseWidget {
     /**
      * Return a string of zero-length or true if valid.
      */
-    protected isValid(value: T, mode: DialogMode): DialogError {
+    protected isValid(value: T, mode: DialogMode): MaybePromise<DialogError> {
         return '';
     }
 
@@ -301,7 +298,7 @@ export class SingleTextInputDialogProps extends DialogProps {
         end: number
         direction?: 'forward' | 'backward' | 'none'
     };
-    readonly validate?: (input: string, mode: DialogMode) => DialogError;
+    readonly validate?: (input: string, mode: DialogMode) => MaybePromise<DialogError>;
 }
 
 export class SingleTextInputDialog extends AbstractDialog<string> {
@@ -335,7 +332,7 @@ export class SingleTextInputDialog extends AbstractDialog<string> {
         return this.inputField.value;
     }
 
-    protected isValid(value: string, mode: DialogMode): DialogError {
+    protected isValid(value: string, mode: DialogMode): MaybePromise<DialogError> {
         if (this.props.validate) {
             return this.props.validate(value, mode);
         }

packages/filesystem/src/browser/file-dialog/file-dialog.ts

@@ -261,7 +261,7 @@ export class OpenFileDialog extends FileDialog<MaybeArray<FileStatNode>> {
         }
     }
 
-    protected accept(): void {
+    protected async accept(): Promise<void> {
         if (this.props.canSelectFolders === false && !Array.isArray(this.value)) {
             this.widget.model.openNode(this.value);
             return;

packages/filesystem/src/browser/file-resource.ts

@@ -116,7 +116,7 @@ export class FileResource implements Resource {
     }
 
     protected async getFileStat(): Promise<FileStat | undefined> {
-        if (!this.fileSystem.exists(this.uriString)) {
+        if (!await this.fileSystem.exists(this.uriString)) {
             return undefined;
         }
         try {

packages/workspace/src/browser/workspace-commands.ts

@@ -178,16 +178,16 @@ export class WorkspaceCommandContribution implements CommandContribution {
             }
         });
         registry.registerCommand(WorkspaceCommands.NEW_FILE, this.newWorkspaceRootUriAwareCommandHandler({
-            execute: uri => this.getDirectory(uri).then(parent => {
+            execute: async uri => this.getDirectory(uri).then(parent => {
                 if (parent) {
                     const parentUri = new URI(parent.uri);
                     const { fileName, fileExtension } = this.getDefaultFileConfig();
                     const vacantChildUri = FileSystemUtils.generateUniqueResourceURI(parentUri, parent, fileName, fileExtension);
 
-                    const dialog: SingleTextInputDialog = new SingleTextInputDialog({
+                    const dialog = new SingleTextInputDialog({
                         title: 'New File',
                         initialValue: vacantChildUri.path.base,
-                        validate: name => this.validateFileName(name, parent, true, dialog)
+                        validate: name => this.validateFileName(name, parent, true)
                     });
 
                     dialog.open().then(name => {
@@ -206,10 +206,10 @@ export class WorkspaceCommandContribution implements CommandContribution {
                 if (parent) {
                     const parentUri = new URI(parent.uri);
                     const vacantChildUri = FileSystemUtils.generateUniqueResourceURI(parentUri, parent, 'Untitled');
-                    const dialog: SingleTextInputDialog = new SingleTextInputDialog({
+                    const dialog = new SingleTextInputDialog({
                         title: 'New Folder',
                         initialValue: vacantChildUri.path.base,
-                        validate: name => this.validateFileName(name, parent, true, dialog)
+                        validate: name => this.validateFileName(name, parent, true)
                     });
                     dialog.open().then(name => {
                         if (name) {
@@ -312,9 +312,8 @@ export class WorkspaceCommandContribution implements CommandContribution {
      * @param name the simple file name of the file to validate.
      * @param parent the parent directory's file stat.
      * @param recursive allow file or folder creation using recursive path
-     * @param dialog optional SingleTextInputDialog instance
      */
-    protected validateFileName(name: string, parent: FileStat, recursive: boolean = false, dialog?: SingleTextInputDialog): string {
+    protected async validateFileName(name: string, parent: FileStat, recursive: boolean = false): Promise<string> {
         if (!name) {
             return '';
         }
@@ -326,11 +325,10 @@ export class WorkspaceCommandContribution implements CommandContribution {
             return `The name <strong>${fileName}</strong> is not a valid file or folder name.`;
         }
         const childUri = new URI(parent.uri).resolve(name).toString();
-        this.fileSystem.exists(childUri).then(exists => {
-            if (exists && dialog) {
-                dialog.error(`A file or folder <strong>${fileName}</strong> already exists at this location.`);
-            }
-        });
+        const exists = await this.fileSystem.exists(childUri);
+        if (exists) {
+            return `A file or folder <strong>${fileName}</strong> already exists at this location.`;
+        }
         return '';
     }
 
@@ -411,7 +409,6 @@ export class WorkspaceCommandContribution implements CommandContribution {
         }
         return false;
     }
-
 }
 
 export class WorkspaceRootUriAwareCommandHandler extends UriAwareCommandHandler<URI> {
@@ -432,6 +429,7 @@ export class WorkspaceRootUriAwareCommandHandler extends UriAwareCommandHandler<
         if (uri) {
             return uri;
         }
+
         const root = this.workspaceService.tryGetRoots()[0];
         return root && new URI(root.uri);
     }