fix the enter key

Author: bluskript

src/logic/formatting.ts

@@ -17,14 +17,100 @@ export function linkify(text: string): string {
 	return text.replaceAll(/(?:www|https?)[^\s]+/ig, "<a target=\"_blank\" href=\"$&\">$&</a>");
 }
 
-export function nearestOverlap(f: number[], formats: number[][]) {
-	return Math.min(...formats.map(f2 => Math.max(f[0], f2[0])));
+interface IRange {
+	start: number
+	end: number
+	traits: string[]
 }
 
-// function transformFormats(formats: Format[]): CleanedFormat[] {
-// 	const res: CleanedFormat[] = [];
-// 	for (const f of formats) {
-// 		const nearestOverlap = Math.max(...formats.map(f2 => Math.max(f.start, f2.start)));
-// 	}
-// 	return res;
-// }
+function sortRange(lhs: IRange, rhs: IRange): number {
+	return lhs.start - rhs.start;
+}
+
+export function merge(ranges: IRange[]): Array<IRange> {
+	ranges.sort(sortRange);
+
+	const s = new Array<IRange>();
+
+	s.push(ranges[0]);
+
+	for (let i = 1; i < ranges.length; i++) {
+		const top = s[s.length - 1];
+		const against = ranges[i];
+
+		/*
+					|---top---|
+												|---against---|
+			 */
+		if (top.end < against.start) {
+			s.push(against);
+			/*
+					|---top---|
+					|----against----|
+			*/
+		}
+		else if (top.start === against.start && top.end < against.end) {
+			s.pop();
+			s.push({
+				start: top.start,
+				end: top.end,
+				traits: top.traits.concat(against.traits),
+			});
+			s.push({
+				start: top.end,
+				end: against.end,
+				traits: against.traits,
+			});
+			/*
+					|---top---|
+									|---against---|
+			 */
+		}
+		else if (top.end < against.end) {
+			s.pop();
+			s.push({
+				start: top.start,
+				end: against.start,
+				traits: top.traits,
+			});
+			s.push({
+				start: against.start,
+				end: top.end,
+				traits: top.traits.concat(against.traits),
+			});
+			s.push({
+				start: top.end,
+				end: against.end,
+				traits: against.traits,
+			});
+			/*
+					|--------top--------|
+							|---against---|
+			 */
+		}
+		else if (top.start < against.start && top.end > against.end) {
+			s.pop();
+			s.push({
+				start: top.start,
+				end: against.start,
+				traits: top.traits,
+			});
+			s.push({
+				start: against.start,
+				end: against.end,
+				traits: top.traits.concat(against.traits),
+			});
+			s.push({
+				start: against.end,
+				end: top.end,
+				traits: top.traits,
+			});
+		}
+		else {
+			console.warn(top, against);
+			throw new Error("unhandled case");
+		}
+	}
+
+	return s;
+}

src/views/chat/Composer/Composer.vue

@@ -211,7 +211,7 @@ const onKeyDown = async(ev: KeyboardEvent) => {
 		lastTyping = Date.now();
 		api.sendTyping(host.value, guild.value, channel.value);
 	}
-	if (ev.key !== this.$t("enter") || ev.shiftKey) return;
+	if (ev.key !== "Enter" || ev.shiftKey) return;
 	ev.preventDefault();
 	sendMessage();
 };

tests/formatting.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "vitest";
-import { getLinks, linkify, nearestOverlap } from "../src/logic/formatting";
+import { getLinks, linkify } from "../src/logic/formatting";
 
 describe.concurrent("linkification", () => {
 	const cases = [