From 8380be304e3d469c77870d476f2b47a43746ba7b Mon Sep 17 00:00:00 2001
From: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com>
Date: Fri, 31 Jul 2026 12:50:36 +0200
Subject: [PATCH] refactor(file-browser): deduplicate renameFile flow and add
 prompt validation

- Enforce `required: true` on the file/folder rename prompt to prevent empty inputs.
- Unify post-rename side effects (recents update, editor tab URI sync, tree state, success toast, reload) across standard and Termux filesystem paths.
- Wrap standard filesystem rename execution inside the master try-catch block to gracefully capture errors.

(AI generated commit message)
---
 src/pages/fileBrowser/fileBrowser.js | 46 ++++++++++------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js
index 30da2e8f0..1d73c9f11 100644
--- a/src/pages/fileBrowser/fileBrowser.js
+++ b/src/pages/fileBrowser/fileBrowser.js
@@ -1096,6 +1096,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 					case "rename": {
 						let newname = await prompt(strings.rename, name, "text", {
 							match: config.FILE_NAME_REGEX,
+							required: true,
 						});
 
 						newname = helpers.fixFilename(newname);
@@ -1160,40 +1161,25 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 			}
 
 			async function renameFile(newname) {
-				if (isTermuxUrl(url)) {
-					if (helpers.isDir(type)) {
-						alert(strings.warning, strings["rename not supported"]);
-						return;
-					} else {
-						// Special handling for Termux content files
-						const fs = fsOperation(url);
-						try {
+				let newUrl;
+				try {
+					if (isTermuxUrl(url)) {
+						if (helpers.isDir(type)) {
+							alert(strings.warning, strings["rename not supported"]);
+							return;
+						} else {
+							// Special handling for Termux content files
+							const fs = fsOperation(url);
 							const content = await fs.readFile();
-							const newUrl = Url.join(Url.dirname(url), newname);
-							await fsOperation(Url.dirname(url)).createFile(newname, content);
+							const dirname = Url.dirname(url);
+							newUrl = Url.join(dirname, newname);
+							await fsOperation(dirname).createFile(newname, content);
 							await fs.delete();
-
-							recents.removeFile(url);
-							recents.addFile(newUrl);
-							const file = editorManager.getFile(url, "uri");
-							if (file) {
-								file.uri = newUrl;
-								file.filename = newname;
-							}
-							openFolder.renameItem(url, newUrl, newname);
-							toast(strings.success);
-							reload();
-							return;
-						} catch (err) {
-							window.log("error", err);
-							helpers.error(err);
-							return;
 						}
+					} else {
+						const fs = fsOperation(url);
+						newUrl = await fs.renameTo(newname);
 					}
-				}
-				const fs = fsOperation(url);
-				try {
-					const newUrl = await fs.renameTo(newname);
 					recents.removeFile(url);
 					recents.addFile(newUrl);
 					const file = editorManager.getFile(url, "uri");