Merge remote-tracking branch 'origin/main' into codemirror

bajrangCoder · bajrangCoder · commit e04603237a44 · 2026-01-13T14:46:23.000+05:30
diff --git a/src/ace/commands.js b/src/ace/commands.js
@@ -357,6 +357,14 @@ const commands = [
 		},
 		readOnly: true,
 	},
+	{
+		name: "run-tests",
+		description: "Run Tests",
+		exec() {
+			acode.exec("run-tests");
+		},
+		readOnly: true,
+	},
 ];
 
 export function setCommands(editor) {
diff --git a/src/handlers/quickTools.js b/src/handlers/quickTools.js
@@ -168,14 +168,22 @@ appSettings.on("update:quicktoolsItems:after", () => {
 	}, 100);
 });
 
+let historyNavigationInitialized = false;
 // Initialize history navigation
 function setupHistoryNavigation() {
+	if (historyNavigationInitialized) return;
+	historyNavigationInitialized = true;
 	const { $searchInput, $replaceInput } = quickTools;
 
 	// Search input history navigation
 	if ($searchInput.el) {
 		$searchInput.el.addEventListener("keydown", (e) => {
-			if (e.key === "ArrowUp") {
+			if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "f") {
+				e.preventDefault();
+				const { editor, activeFile } = editorManager;
+				editor.focus();
+				actionStack.get("search-bar")?.action();
+			} else if (e.key === "ArrowUp") {
 				e.preventDefault();
 				const newValue = searchHistory.navigateSearchUp($searchInput.el.value);
 				$searchInput.el.value = newValue;
diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/be-by.json b/src/lang/be-by.json
@@ -494,5 +494,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/de-de.json b/src/lang/de-de.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/en-us.json b/src/lang/en-us.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/he-il.json b/src/lang/he-il.json
@@ -494,5 +494,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json
@@ -494,5 +494,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json
@@ -493,5 +493,6 @@
 	"recent": "Legutóbbi fájlok",
 	"command palette": "Parancspaletta megnyitása",
 	"change theme": "Téma módosítása",
-	"documentation": "Dokumentáció"
+	"documentation": "Dokumentáció",
+	"open in terminal": "Megnyitás terminálban"
 }
diff --git a/src/lang/id-id.json b/src/lang/id-id.json
@@ -494,5 +494,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json
@@ -494,5 +494,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/it-it.json b/src/lang/it-it.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json
@@ -494,5 +494,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json
@@ -493,5 +493,6 @@
 	"recent": "Recent Files",
 	"command palette": "Open Command Palette",
 	"change theme": "Change Theme",
-	"documentation": "Documentation"
+	"documentation": "Documentation",
+	"open in terminal": "Open in Terminal"
 }
diff --git a/src/lib/commands.js b/src/lib/commands.js
@@ -21,6 +21,7 @@ import findFile from "palettes/findFile";
 import browser from "plugins/browser";
 import help from "settings/helpSettings";
 import mainSettings from "settings/mainSettings";
+import { runAllTests } from "test/tester";
 import { getColorRange } from "utils/color/regex";
 import helpers from "utils/helpers";
 import Url from "utils/Url";
@@ -35,6 +36,9 @@ import appSettings from "./settings";
 import showFileInfo from "./showFileInfo";
 
 export default {
+	async "run-tests"() {
+		await runAllTests();
+	},
 	async "close-all-tabs"() {
 		let save = false;
 		const unsavedFiles = editorManager.files.filter(
diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js
@@ -830,40 +830,55 @@ export default class EditorFile {
 		const protocol = Url.getProtocol(this.#uri);
 		const text = this.session.doc.toString();
 
+		// Helper for JS-based comparison (used as fallback)
+		const jsCompare = async (fileUri) => {
+			const fs = fsOperation(fileUri);
+			const oldText = await fs.readFile(this.encoding);
+			return await system.compareTexts(oldText, text);
+		};
+
 		if (/s?ftp:/.test(protocol)) {
-			// if file is a ftp or sftp file, get file content from cached file.
-			// remove ':' from protocol because cache file of remote files are
-			// stored as ftp102525465N i.e. protocol + id
-			// Cache files are local file:// URIs, so native file reading works
+			// FTP/SFTP files use cached local file
 			const cacheFilename = protocol.slice(0, -1) + this.id;
 			const cacheFileUri = Url.join(CACHE_STORAGE, cacheFilename);
 
 			try {
 				return await system.compareFileText(cacheFileUri, this.encoding, text);
 			} catch (error) {
-				console.error("Native compareFileText failed:", error);
-				return false;
+				console.error(
+					"Native compareFileText failed, using JS fallback:",
+					error,
+				);
+				try {
+					return await jsCompare(cacheFileUri);
+				} catch (fallbackError) {
+					console.error(fallbackError);
+					return false;
+				}
 			}
 		}
 
 		if (/^(file|content):/.test(protocol)) {
-			// file:// and content:// URIs can be handled by native Android code
-			// Native reads file AND compares in background thread
+			// file:// and content:// URIs - try native first, fallback to JS
 			try {
 				return await system.compareFileText(this.uri, this.encoding, text);
 			} catch (error) {
-				console.error("Native compareFileText failed:", error);
-				return false;
+				console.error(
+					"Native compareFileText failed, using JS fallback:",
+					error,
+				);
+				try {
+					return await jsCompare(this.uri);
+				} catch (fallbackError) {
+					console.error(fallbackError);
+					return false;
+				}
 			}
 		}
 
+		// Other protocols - JS reads file, native compares strings
 		try {
-			const fs = fsOperation(this.uri);
-			const oldText = await fs.readFile(this.encoding);
-			const text = this.session.doc.toString();
-
-			// Offload string comparison to background thread
-			return await system.compareTexts(oldText, text);
+			return await jsCompare(this.uri);
 		} catch (error) {
 			console.error(error);
 			return false;
diff --git a/src/lib/openFolder.js b/src/lib/openFolder.js
diff --git a/src/plugins/system/android/com/foxdebug/system/System.java b/src/plugins/system/android/com/foxdebug/system/System.java
diff --git a/src/test/editor.tests.js b/src/test/editor.tests.js
diff --git a/src/test/sanity.tests.js b/src/test/sanity.tests.js
diff --git a/src/test/tester.js b/src/test/tester.js

Original file line number	Diff line number	Diff line change
`@@ -493,5 +493,6 @@`
`493`	`493`	`"recent": "Recent Files",`
`494`	`494`	`"command palette": "Open Command Palette",`
`495`	`495`	`"change theme": "Change Theme",`
`496`		`- "documentation": "Documentation"`
	`496`	`+ "documentation": "Documentation",`
	`497`	`+ "open in terminal": "Open in Terminal"`
`497`	`498`	`}`
Original file line number	Diff line number	Diff line change
`@@ -494,5 +494,6 @@`
`494`	`494`	`"recent": "Recent Files",`
`495`	`495`	`"command palette": "Open Command Palette",`
`496`	`496`	`"change theme": "Change Theme",`
`497`		`- "documentation": "Documentation"`
	`497`	`+ "documentation": "Documentation",`
	`498`	`+ "open in terminal": "Open in Terminal"`
`498`	`499`	`}`