Merge branch 'Acode-Foundation:main' into main

Author: hyperz111

.github/workflows/nightly-build.yml

@@ -249,7 +249,7 @@
 #          Only run this step, if not called from another workflow. And a previous step is successful with releasedRequired=true
           id: release
           if: ${{ ! inputs.skip_tagging_and_releases && steps.check-nightly-tag-force-update.outcome == 'success' && env.releaseRequired == 'true' && !inputs.is_PR }}
-          uses: softprops/action-gh-release@v2
+          uses: softprops/action-gh-release@v3
           env:
             FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
           with:

bun.lock

@@ -155,7 +155,7 @@
     "cordova": "13.0.0",
     "core-js": "^3.47.0",
     "dayjs": "^1.11.19",
-    "dompurify": "^3.3.2",
+    "dompurify": "^3.4.0",
     "escape-string-regexp": "^5.0.0",
     "esprima": "^4.0.1",
     "filesize": "^11.0.13",

package-lock.json

@@ -0,0 +1,115 @@
+import { EditorSelection } from "@codemirror/state";
+import type { BlockInfo, EditorView } from "@codemirror/view";
+
+type LineInfo = Pick<BlockInfo, "from" | "to"> | null | undefined;
+
+type LineNumberClickEvent = Pick<
+	MouseEvent,
+	| "button"
+	| "shiftKey"
+	| "altKey"
+	| "ctrlKey"
+	| "metaKey"
+	| "preventDefault"
+	| "defaultPrevented"
+>;
+
+function toDocumentOffset(
+	value: number | null | undefined,
+	fallback = 0,
+): number {
+	const resolved = value != null ? Number(value) : fallback;
+	return Number.isFinite(resolved) ? resolved : fallback;
+}
+
+/**
+ * Resolve the selection range for a clicked document line.
+ * Includes the trailing line break when one exists to mirror Ace's
+ * full-line selection behavior.
+ */
+export function getLineSelectionRange(
+	state: EditorView["state"],
+	line: LineInfo,
+): { from: number; to: number } | null {
+	if (!line) return null;
+	const from = Math.max(0, toDocumentOffset(line.from));
+	const to = Math.max(from, toDocumentOffset(line.to, from));
+	return {
+		from,
+		to: Math.min(to + 1, state.doc.length),
+	};
+}
+
+function getCurrentSelectionLineRange(state: EditorView["state"]): {
+	from: number;
+	to: number;
+} {
+	const selection = state.selection.main;
+	const startLine = state.doc.lineAt(selection.from);
+	const endPos = selection.empty
+		? selection.head
+		: Math.max(selection.to - 1, selection.from);
+	const endLine = state.doc.lineAt(endPos);
+	const startRange = getLineSelectionRange(state, startLine);
+	const endRange = getLineSelectionRange(state, endLine);
+
+	return {
+		from: startRange?.from ?? selection.from,
+		to: endRange?.to ?? selection.to,
+	};
+}
+
+function createLineSelection(range: {
+	from: number;
+	to: number;
+}): EditorSelection {
+	return EditorSelection.single(range.to, range.from);
+}
+
+function createExtendedLineSelection(
+	state: EditorView["state"],
+	clickedRange: { from: number; to: number },
+): EditorSelection {
+	const currentRange = getCurrentSelectionLineRange(state);
+	const from = Math.min(currentRange.from, clickedRange.from);
+	const to = Math.max(currentRange.to, clickedRange.to);
+
+	if (clickedRange.from <= currentRange.from) {
+		return EditorSelection.single(to, from);
+	}
+
+	return EditorSelection.single(from, to);
+}
+
+/**
+ * Select the clicked line from the line-number gutter.
+ * Shift-click extends the current selection by whole lines.
+ * Other modified or non-primary clicks are ignored so they don't interfere
+ * with context menus or alternate selection gestures.
+ */
+export function handleLineNumberClick(
+	view: EditorView | null | undefined,
+	line: LineInfo,
+	event: LineNumberClickEvent | null | undefined,
+): boolean {
+	if (!view || !event || event.defaultPrevented) return false;
+	if ((event.button ?? 0) !== 0) return false;
+	if (event.altKey || event.ctrlKey || event.metaKey) {
+		return false;
+	}
+
+	const range = getLineSelectionRange(view.state, line);
+	if (!range) return false;
+
+	event.preventDefault();
+	view.dispatch({
+		selection: event.shiftKey
+			? createExtendedLineSelection(view.state, range)
+			: createLineSelection(range),
+		userEvent: event.shiftKey ? "select.extend.pointer" : "select.pointer",
+	});
+	view.focus();
+	return true;
+}
+
+export default handleLineNumberClick;

package.json

@@ -57,6 +57,72 @@ function escapeRegExp(value: string): string {
 	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
+async function shouldAutoCloseTags(): Promise<boolean> {
+	const { default: appSettings } = await import("lib/settings");
+	return appSettings.value.autoCloseTags !== false;
+}
+
+function createLanguageLoader(name: string, lang: LanguageDescription) {
+	const normalizedName = normalizeModeKey(name);
+
+	switch (normalizedName) {
+		case "html":
+			return async () => {
+				const { html } = await import("@codemirror/lang-html");
+				return html({ autoCloseTags: await shouldAutoCloseTags() });
+			};
+
+		case "xml":
+			return async () => {
+				const { xml } = await import("@codemirror/lang-xml");
+				return xml({ autoCloseTags: await shouldAutoCloseTags() });
+			};
+
+		case "vue":
+			return async () => {
+				const [{ vue }, { html }] = await Promise.all([
+					import("@codemirror/lang-vue"),
+					import("@codemirror/lang-html"),
+				]);
+				return vue({
+					base: html({ autoCloseTags: await shouldAutoCloseTags() }),
+				});
+			};
+
+		case "angular":
+			return async () => {
+				const [{ angular }, { html }] = await Promise.all([
+					import("@codemirror/lang-angular"),
+					import("@codemirror/lang-html"),
+				]);
+				return angular({
+					base: html({
+						autoCloseTags: await shouldAutoCloseTags(),
+						selfClosingTags: true,
+					}),
+				});
+			};
+
+		case "php":
+			return async () => {
+				const [{ php }, { html }] = await Promise.all([
+					import("@codemirror/lang-php"),
+					import("@codemirror/lang-html"),
+				]);
+				const htmlSupport = html({
+					autoCloseTags: await shouldAutoCloseTags(),
+					matchClosingTags: false,
+				});
+				return [
+					php({ baseLanguage: htmlSupport.language }),
+					htmlSupport.support,
+				];
+			};
+	}
+
+	return typeof lang.load === "function" ? () => lang.load!() : null;
+}
+
 // 1) Always register a plain text fallback
 addMode("Text", "txt|text|log|plain", "Plain Text", () => []);
 
@@ -106,7 +172,7 @@ for (const lang of languages as readonly LanguageDescription[]) {
 
 		// Wrap language-data loader as our modelist language provider
 		// lang.load() returns a Promise<Extension>; we let the editor handle async loading
-		const loader = typeof lang.load === "function" ? () => lang.load!() : null;
+		const loader = createLanguageLoader(name, lang);
 
 		addMode(modeId, pattern, name, loader, {
 			aliases,

src/cm/lineNumberSelection.ts

@@ -721,5 +721,7 @@
 	"close selected tabs warning": "Are you sure you want to close the selected tabs? You will lose the unsaved changes and this action cannot be reversed.",
 	"close tabs to right": "Close Right",
 	"close tabs to left": "Close Left",
-	"close other tabs": "Close Others"
+	"close other tabs": "Close Others",
+	"auto close tags": "Auto close tags",
+	"settings-info-editor-auto-close-tags": "Automatically insert closing tags in HTML, XML, Vue, Angular, and PHP template files."
 }

src/cm/supportedModes.ts

@@ -723,5 +723,7 @@
 	"close selected tabs warning": "Are you sure you want to close the selected tabs? You will lose the unsaved changes and this action cannot be reversed.",
 	"close tabs to right": "Close Right",
 	"close tabs to left": "Close Left",
-	"close other tabs": "Close Others"
+	"close other tabs": "Close Others",
+	"auto close tags": "Auto close tags",
+	"settings-info-editor-auto-close-tags": "Automatically insert closing tags in HTML, XML, Vue, Angular, and PHP template files."
 }

src/lang/ar-ye.json

@@ -722,5 +722,7 @@
 	"close selected tabs warning": "Are you sure you want to close the selected tabs? You will lose the unsaved changes and this action cannot be reversed.",
 	"close tabs to right": "Close Right",
 	"close tabs to left": "Close Left",
-	"close other tabs": "Close Others"
+	"close other tabs": "Close Others",
+	"auto close tags": "Auto close tags",
+	"settings-info-editor-auto-close-tags": "Automatically insert closing tags in HTML, XML, Vue, Angular, and PHP template files."
 }

src/lang/be-by.json

@@ -722,5 +722,7 @@
 	"close selected tabs warning": "Are you sure you want to close the selected tabs? You will lose the unsaved changes and this action cannot be reversed.",
 	"close tabs to right": "Close Right",
 	"close tabs to left": "Close Left",
-	"close other tabs": "Close Others"
+	"close other tabs": "Close Others",
+	"auto close tags": "Auto close tags",
+	"settings-info-editor-auto-close-tags": "Automatically insert closing tags in HTML, XML, Vue, Angular, and PHP template files."
 }