Merge branch 'main' into ai-agent

Author: bajrangCoder

.devcontainer/devcontainer.json

@@ -0,0 +1,6 @@
+{
+	"image": "mcr.microsoft.com/devcontainers/universal:2",
+	"features": {
+		"ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {}
+	}
+}

package-lock.json

@@ -37,6 +37,7 @@
         "ANDROIDBLACKLISTSECURESOCKETPROTOCOLS": "SSLv3,TLSv1"
       },
       "cordova-sqlite-storage": {},
+      "cordova-plugin-websocket": {},
       "com.foxdebug.acode.exec": {}
     },
     "platforms": [
@@ -78,6 +79,7 @@
     "cordova-plugin-sftp": "file:src/plugins/sftp",
     "cordova-plugin-system": "file:src/plugins/system",
     "cordova-sqlite-storage": "^7.0.0",
+    "cordova-plugin-websocket": "file:src/plugins/websocket",
     "css-loader": "^7.1.2",
     "mini-css-extract-plugin": "^2.9.0",
     "path-browserify": "^1.0.1",
@@ -113,6 +115,7 @@
     "langchain": "^0.3.27",
     "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^9.2.0",
+    "markdown-it-footnote": "^4.0.0",
     "markdown-it-github-alerts": "^0.3.0",
     "markdown-it-task-lists": "^2.1.1",
     "mime-types": "^2.1.35",

package.json

@@ -919,9 +919,9 @@ export default function addTouchListeners(editor, minimal, onclick) {
 
 			let { row, column } = renderer.screenToTextCoordinates(x, y);
 
-			if (column === start.column) {
-				++column;
-			}
+			// if (column === start.column) {
+			// 	++column;
+			// }
 
 			editor.selection.moveCursorToPosition({ row, column });
 			positionStart();

src/ace/touchHandler.js

@@ -62,6 +62,10 @@ let parentRight = 0;
  * @type {number}
  */
 let animationFrame = null;
+/**
+ * @type {number}
+ */
+let prevScrollLeft = 0;
 
 const MAX_SCROLL_SPEED = 4;
 
@@ -126,6 +130,9 @@ export default function startDrag(e) {
 	document.addEventListener("touchend", releaseDrag, opts);
 	document.addEventListener("touchcancel", releaseDrag, opts);
 	document.addEventListener("mouseleave", releaseDrag, opts);
+
+	prevScrollLeft = $parent.scrollLeft;
+	$parent.addEventListener("scroll", preventDefaultScroll, opts);
 }
 
 /**
@@ -225,6 +232,12 @@ function releaseDrag(e) {
 	document.removeEventListener("touchend", releaseDrag, opts);
 	document.removeEventListener("touchcancel", releaseDrag, opts);
 	document.removeEventListener("mouseleave", releaseDrag, opts);
+
+	$parent.removeEventListener("scroll", preventDefaultScroll);
+}
+
+function preventDefaultScroll() {
+	this.scrollLeft = prevScrollLeft;
 }
 
 /**
@@ -236,7 +249,7 @@ function scrollContainer() {
 	function animate() {
 		const scroll = getScroll();
 		if (!scroll) return;
-		$parent.scrollLeft += scroll;
+		prevScrollLeft = $parent.scrollLeft += scroll;
 		animationFrame = requestAnimationFrame(animate);
 	}
 }

src/handlers/editorFileTab.js

@@ -3,6 +3,11 @@ import openFile from "lib/openFile";
 import helpers from "utils/helpers";
 
 const handlers = [];
+/**
+ * Queue to store intents that arrive before files are restored
+ * @type {Array<{url: string, options: object}>}
+ */
+const pendingIntents = [];
 
 /**
  *
@@ -39,10 +44,21 @@ export default async function HandleIntent(intent = {}) {
 			return;
 		}
 
-		await openFile(url, {
-			mode: "single",
-			render: true,
-		});
+		if (sessionStorage.getItem("isfilesRestored") === "true") {
+			await openFile(url, {
+				mode: "single",
+				render: true,
+			});
+		} else {
+			// Store the intent for later processing when files are restored
+			pendingIntents.push({
+				url,
+				options: {
+					mode: "single",
+					render: true,
+				},
+			});
+		}
 	}
 }
 
@@ -59,6 +75,25 @@ export function removeIntentHandler(handler) {
 	if (index > -1) handlers.splice(index, 1);
 }
 
+/**
+ * Process all pending intents that were queued before files were restored.
+ * This function is called after isfilesRestored is set to true in main.js.
+ * @returns {Promise<void>}
+ */
+export async function processPendingIntents() {
+	if (sessionStorage.getItem("isfilesRestored") !== "true") return;
+
+	// Process all pending intents
+	while (pendingIntents.length > 0) {
+		const pendingIntent = pendingIntents.shift();
+		try {
+			await openFile(pendingIntent.url, pendingIntent.options);
+		} catch (error) {
+			helpers.error(error);
+		}
+	}
+}
+
 class IntentEvent {
 	module;
 	action;

src/handlers/intent.js

@@ -187,7 +187,7 @@
 	"help": "Bantuan",
 	"file has been deleted": "{file} telah dihapus!",
 	"feature not available": "Fitur ini hanya tersedia dalam versi berbayar dari aplikasi.",
-	"deleted file": "File yang dihapus",
+	"deleted file": "Berkas yang dihapus",
 	"line height": "Tinggi baris",
 	"preview info": "Jika Anda ingin menjalankan berkas aktif, ketuk dan tahan ikon Putar.",
 	"manage all files": "Izinkan Acode Editor untuk mengelola semua berkas dalam pengaturan untuk mengedit berkas di perangkat Anda dengan mudah.",
@@ -216,12 +216,12 @@
 	"remember opened folders": "Ingat folder yang dibuka",
 	"no suggestions": "Tidak ada saran",
 	"no suggestions aggressive": "Tidak ada saran yang agresif",
-	"install": "Instal",
-	"installing": "Menginstal...",
+	"install": "Pasang",
+	"installing": "Memasang...",
 	"plugins": "Plugin",
 	"recently used": "Baru - baru ini digunakan",
 	"update": "Perbarui",
-	"uninstall": "Uninstal",
+	"uninstall": "Copot pemasangan",
 	"download acode pro": "Unduh Acode pro",
 	"loading plugins": "Memuat plugin",
 	"faqs": "FAQ",
@@ -258,7 +258,7 @@
 	"preview port": "Port pratinjau",
 	"find file": "Temukan berkas",
 	"system": "Sistem",
-	"please select a formatter": "Mohon pilih formatter",
+	"please select a formatter": "Mohon pilih pemformat",
 	"case sensitive": "Sensitif huruf besar",
 	"regular expression": "Ekspresi Regular",
 	"whole word": "Seluruh kata",
@@ -269,15 +269,15 @@
 	"server port": "Port server",
 	"preview settings": "Pengaturan pratinjau",
 	"preview settings note": "Jika port pratinjau dan port server berbeda, aplikasi tidak akan memulai server dan sebaliknya akan membuka https://<host>:<pratinjau port> di peramban atau peramban-dalam-aplikasi. Ini berguna ketika Anda menjalankan server di tempat lain.",
-	"backup/restore note": "Ini hanya akan membuat cadangan pengaturan Anda, tema khusus, plugin yang diinstal, dan binding kunci. Ini tidak akan membuat cadangan FTP/SFTP atau status aplikasi Anda.",
+	"backup/restore note": "Ini hanya akan membuat cadangan pengaturan Anda, tema khusus, plugin yang dipasang, dan binding kunci. Ini tidak akan membuat cadangan FTP/SFTP atau status aplikasi Anda.",
 	"host": "Host",
-	"retry ftp/sftp when fail": "Ulangi ftp/sftp ketika gagal",
+	"retry ftp/sftp when fail": "Ulangi FTP/SFTP ketika gagal",
 	"more": "Lebih banyak",
 	"thank you :)": "Terima kasih :)",
 	"purchase pending": "Pembelian Tertunda",
 	"cancelled": "Dibatalkan",
 	"local": "Lokal",
-	"remote": "Remote",
+	"remote": "Jarak Jauh",
 	"show console toggler": "Tampilkan pengalih konsol",
 	"binary file": "Berkas ini berisi data biner, apakah Anda ingin membukanya?",
 	"relative line numbers": "Nomor garis relatif",
@@ -308,7 +308,7 @@
 	"info-quicktoolstriggermode": "Jika tombol dalam alat cepat tidak berfungsi, cobalah untuk mengubah nilai ini.",
 	"owned": "Dimiliki",
 	"api_error": "API server turun, silakan coba setelah beberapa waktu.",
-	"installed": "Terinstal",
+	"installed": "Terpasang",
 	"all": "Semua",
 	"medium": "Medium",
 	"refund": "Pengembalian dana",
@@ -388,21 +388,21 @@
 	"copy uri": "Salin Uri",
 	"delete entries": "Apakah Anda yakin ingin menghapus {count} item?",
 	"deleting items": "menghapus {count} item...",
-	"import project zip": "Impor Proyek(zip)",
+	"import project zip": "Impor Proyek (zip)",
 	"changelog": "Catatan Perubahan",
 	"notifications": "Notifikasi",
 	"no_unread_notifications": "Tidak ada pemberitahuan yang belum dibaca",
 	"should_use_current_file_for_preview": "Harus menggunakan berkas saat ini untuk pratinjau alih-alih default (index.html)",
 	"fade fold widgets": "Widget Lipat Pudar",
-	"quicktools:home-key": "Home Key",
-	"quicktools:end-key": "End Key",
-	"quicktools:pageup-key": "PageUp Key",
-	"quicktools:pagedown-key": "PageDown Key",
-	"quicktools:delete-key": "Delete Key",
-	"quicktools:tilde": "Insert tilde symbol",
-	"quicktools:backtick": "Insert backtick",
-	"quicktools:hash": "Insert Hash symbol",
-	"quicktools:dollar": "Insert dollar symbol",
-	"quicktools:modulo": "Insert modulo/percent symbol",
-	"quicktools:caret": "Insert caret symbol"
+	"quicktools:home-key": "Kunci Home",
+	"quicktools:end-key": "Kunci End",
+	"quicktools:pageup-key": "Kunci PageUp",
+	"quicktools:pagedown-key": "Kunci PageDown",
+	"quicktools:delete-key": "Kunci Delete",
+	"quicktools:tilde": "Masukkan tanda gelombang",
+	"quicktools:backtick": "Masukkan tanda kutip terbalik",
+	"quicktools:hash": "Masukkan tanda pagar",
+	"quicktools:dollar": "Masukkan simbol dolar",
+	"quicktools:modulo": "Masukkan simbol modulus/persen",
+	"quicktools:caret": "Masukkan tanda sisipan"
 }

src/lang/id-id.json

@@ -358,7 +358,17 @@ export default {
 		if (uri) {
 			const fs = fsOperation(uri);
 			try {
-				const newUri = await fs.renameTo(newname);
+				let newUri;
+				if (uri.startsWith("content://com.termux.documents/tree/")) {
+					// Special handling for Termux content files
+					const newFilePath = Url.join(Url.dirname(uri), newname);
+					const content = await fs.readFile();
+					await fsOperation(Url.dirname(uri)).createFile(newname, content);
+					await fs.delete();
+					newUri = newFilePath;
+				} else {
+					newUri = await fs.renameTo(newname);
+				}
 				const stat = await fsOperation(newUri).stat();
 
 				newname = stat.name;

src/lib/commands.js

@@ -676,7 +676,10 @@ async function EditorManager($header, $body) {
 			actions("set-height", { height: 0, save: false });
 		} else {
 			root.classList.remove("hide-floating-button");
-			const quickToolsHeight = appSettings.value.quickTools || 1;
+			const quickToolsHeight =
+				appSettings.value.quickTools !== undefined
+					? appSettings.value.quickTools
+					: 1;
 			actions("set-height", { height: quickToolsHeight, save: true });
 		}
 

src/lib/editorManager.js

@@ -17,7 +17,7 @@ import tile from "components/tile";
 import toast from "components/toast";
 import tutorial from "components/tutorial";
 import fsOperation from "fileSystem";
-import intentHandler from "handlers/intent";
+import intentHandler, { processPendingIntents } from "handlers/intent";
 import keyboardHandler from "handlers/keyboard";
 import quickToolsInit from "handlers/quickToolsInit";
 import windowResize from "handlers/windowResize";
@@ -481,12 +481,19 @@ async function loadApp() {
 	if (Array.isArray(files) && files.length) {
 		try {
 			await restoreFiles(files);
+			// save state to handle file loading gracefully
+			sessionStorage.setItem("isfilesRestored", true);
+			// Process any pending intents that were queued before files were restored
+			await processPendingIntents();
 		} catch (error) {
 			window.log("error", "File loading failed!");
 			window.log("error", error);
 			toast("File loading failed!");
 		}
 	} else {
+		// Even when no files need to be restored, mark as restored and process pending intents
+		sessionStorage.setItem("isfilesRestored", true);
+		await processPendingIntents();
 		onEditorUpdate(undefined, false);
 	}