fix: Validate input & change pre-fill value (#366)

Author: xqzlgy2

src/explorerCommands/new.ts

@@ -5,8 +5,8 @@ import * as fse from "fs-extra";
 import * as path from "path";
 import { QuickPickItem, Uri, window, workspace, WorkspaceEdit } from "vscode";
 import { NodeKind } from "../java/nodeData";
-import { isJavaIdentifier, isKeyword } from "../utility";
 import { DataNode } from "../views/dataNode";
+import { checkJavaQualifiedName } from "./utils";
 
 export async function newJavaClass(node: DataNode): Promise<void> {
     const packageFsPath: string = await getPackageFsPath(node);
@@ -138,24 +138,6 @@ function getNewPackagePath(packageRootPath: string, packageName: string): string
     return path.join(packageRootPath, ...packageName.split("."));
 }
 
-function checkJavaQualifiedName(value: string): string {
-    if (!value || !value.trim()) {
-        return "Input cannot be empty.";
-    }
-
-    for (const part of value.split(".")) {
-        if (isKeyword(part)) {
-            return `Keyword '${part}' cannot be used.`;
-        }
-
-        if (!isJavaIdentifier(part)) {
-            return `Invalid Java qualified name.`;
-        }
-    }
-
-    return "";
-}
-
 interface ISourceRootPickItem extends QuickPickItem {
     fsPath: string;
 }

src/explorerCommands/rename.ts

@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+import * as fse from "fs-extra";
 import * as path from "path";
 import { Uri, window, workspace, WorkspaceEdit } from "vscode";
+import { NodeKind } from "../java/nodeData";
 import { DataNode } from "../views/dataNode";
 import { ExplorerNode } from "../views/explorerNode";
-import { isMutable } from "./utils";
+import { checkJavaQualifiedName, isMutable } from "./utils";
 
 export async function renameFile(node: DataNode, selectedNode: ExplorerNode): Promise<void> {
     // if command not invoked by context menu, use selected node in explorer
@@ -16,29 +18,75 @@ export async function renameFile(node: DataNode, selectedNode: ExplorerNode): Pr
         }
     }
 
+    const oldFsPath = Uri.parse(node.uri).fsPath;
+
     const newName: string | undefined = await window.showInputBox({
         placeHolder: "Input new file name",
-        value: node.name,
+        value: getPrefillValue(node),
         ignoreFocusOut: true,
+        valueSelection: getValueSelection(node.uri),
+        validateInput: async (value: string): Promise<string> => {
+            const checkMessage = CheckQualifiedInputName(value, node.nodeData.kind);
+            if (checkMessage) {
+                return checkMessage;
+            }
+
+            const inputFsPath = getRenamedFsPath(oldFsPath, value);
+            if (await fse.pathExists(inputFsPath)) {
+                return `File path: ${inputFsPath} already exists.`;
+            }
+
+            return "";
+        },
     });
 
     if (!newName) {
         return;
     }
 
-    const oldFsPath = Uri.parse(node.uri).fsPath;
-    const renamedFilePath = getRenamedFilePath(oldFsPath, newName);
-
+    const newFsPath = getRenamedFsPath(oldFsPath, newName);
     const workspaceEdit: WorkspaceEdit = new WorkspaceEdit();
-    workspaceEdit.renameFile(Uri.file(oldFsPath), Uri.file(renamedFilePath));
+    workspaceEdit.renameFile(Uri.file(oldFsPath), Uri.file(newFsPath));
     workspace.applyEdit(workspaceEdit);
 }
 
-function getRenamedFilePath(oldUri: string, newName: string): string {
+function getRenamedFsPath(oldUri: string, newName: string): string {
     // preserve default file extension if not provided
     if (!path.extname(newName)) {
         newName += path.extname(oldUri);
     }
     const dirname = path.dirname(oldUri);
     return path.join(dirname, newName);
 }
+
+function getPrefillValue(node: DataNode): string {
+    const nodeKind = node.nodeData.kind;
+    if (nodeKind === NodeKind.PrimaryType) {
+        return node.name;
+    }
+    return path.basename(node.uri);
+}
+
+function getValueSelection(uri: string): [number, number] | undefined {
+    const pos = path.basename(uri).lastIndexOf(".");
+    if (pos !== -1) {
+        return [0, pos];
+    }
+    return undefined;
+}
+
+function CheckQualifiedInputName(value: string, nodeKind: NodeKind): string {
+    const javaValidateMessage = checkJavaQualifiedName(value);
+
+    if (javaValidateMessage) {
+        return javaValidateMessage;
+    }
+
+    if (nodeKind === NodeKind.Package || nodeKind === NodeKind.PackageRoot) {
+        if (value.indexOf(".") !== -1) {
+            return "Rename is only applicable to innermost package.";
+        }
+    }
+
+    return "";
+}

src/explorerCommands/utils.ts

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+import { isJavaIdentifier, isKeyword } from "../utility";
 import { DataNode } from "../views/dataNode";
 
 export function isMutable(node: DataNode): boolean {
@@ -11,3 +12,21 @@ export function isMutable(node: DataNode): boolean {
     const contextValue = node.computeContextValue();
     return packageExp.test(contextValue) || resourceOrTypeExp.test(contextValue);
 }
+
+export function checkJavaQualifiedName(value: string): string {
+    if (!value || !value.trim()) {
+        return "Input cannot be empty.";
+    }
+
+    for (const part of value.split(".")) {
+        if (isKeyword(part)) {
+            return `Keyword '${part}' cannot be used.`;
+        }
+
+        if (!isJavaIdentifier(part)) {
+            return `Invalid Java qualified name.`;
+        }
+    }
+
+    return "";
+}