New mfm fn syntax Resolve #3063

mei23 · Oct 16, 2021 · 8ab687a · 8ab687a
1 parent 19762bb
commit 8ab687a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue
@@ -131,29 +131,29 @@ const angleDb: MfmDef[] = [
 ];
 
 const fnDb: MfmDef[] = [
-	{ name: 'jelly', head: '[jelly ', tail: ']', desc: '[jelly 🍮]' },
-	{ name: 'tada', head: '[tada ', tail: ']', desc: '[tada 🍮]' },
-	{ name: 'jump', head: '[jump ', tail: ']', desc: '[jump 🍮]' },
-	{ name: 'bounce', head: '[bounce ', tail: ']', desc: '[bounce 🍮]' },
-	{ name: 'shake', head: '[shake ', tail: ']', desc: '[shake 🍮]' },
-	{ name: 'twitch', head: '[twitch ', tail: ']', desc: '[twitch 🍮]' },
+	{ name: 'jelly', head: '$[jelly ', tail: ']', desc: '$[jelly 🍮]' },
+	{ name: 'tada', head: '$[tada ', tail: ']', desc: '$[tada 🍮]' },
+	{ name: 'jump', head: '$[jump ', tail: ']', desc: '$[jump 🍮]' },
+	{ name: 'bounce', head: '$[bounce ', tail: ']', desc: '$[bounce 🍮]' },
+	{ name: 'shake', head: '$[shake ', tail: ']', desc: '$[shake 🍮]' },
+	{ name: 'twitch', head: '$[twitch ', tail: ']', desc: '$[twitch 🍮]' },
 
-	{ name: 'flip', head: '[flip ', tail: ']', desc: '[flip flip]' },
-	{ name: 'flip.v', head: '[flip.v ', tail: ']', desc: '[flip.v flip]' },
-	{ name: 'flip.v,h', head: '[flip.v,h ', tail: ']', desc: '[flip.v,h flip]' },
+	{ name: 'flip', head: '$[flip ', tail: ']', desc: '$[flip flip]' },
+	{ name: 'flip.v', head: '$[flip.v ', tail: ']', desc: '$[flip.v flip]' },
+	{ name: 'flip.v,h', head: '$[flip.v,h ', tail: ']', desc: '$[flip.v,h flip]' },
 
-	{ name: 'spin', head: '[spin ', tail: ']', desc: '[spin spin]' },
-	{ name: 'spin.x', head: '[spin.x ', tail: ']', desc: '[spin.x spin]' },
-	{ name: 'spin.y', head: '[spin.y ', tail: ']', desc: '[spin.y spin]' },
+	{ name: 'spin', head: '$[spin ', tail: ']', desc: '$[spin spin]' },
+	{ name: 'spin.x', head: '$[spin.x ', tail: ']', desc: '$[spin.x spin]' },
+	{ name: 'spin.y', head: '$[spin.y ', tail: ']', desc: '$[spin.y spin]' },
 
-	{ name: 'x2', head: '[x2 ', tail: ']', desc: '[x2 🍮]' },
-	{ name: 'x3', head: '[x3 ', tail: ']', desc: '[x3 🍮]' },
-	{ name: 'x4', head: '[x4 ', tail: ']', desc: '[x4 🍮]' },
+	{ name: 'x2', head: '$[x2 ', tail: ']', desc: '$[x2 🍮]' },
+	{ name: 'x3', head: '$[x3 ', tail: ']', desc: '$[x3 🍮]' },
+	{ name: 'x4', head: '$[x4 ', tail: ']', desc: '$[x4 🍮]' },
 
-	{ name: 'blur', head: '[blur ', tail: ']', desc: '[blur 🍮]' },
+	{ name: 'blur', head: '$[blur ', tail: ']', desc: '$[blur 🍮]' },
 
-	{ name: 'font.serif', head: '[font.serif ', tail: ']', desc: '[font.serif serif]' },
-	{ name: 'font.monospace', head: '[font.monospace ', tail: ']', desc: '[font.monospace monospace]' },
+	{ name: 'font.serif', head: '$[font.serif ', tail: ']', desc: '$[font.serif serif]' },
+	{ name: 'font.monospace', head: '$[font.monospace ', tail: ']', desc: '$[font.monospace monospace]' },
 ];
 
 export default Vue.extend({
@@ -339,8 +339,8 @@ export default Vue.extend({
 					const name = this.q.substr(1);
 					const db = angleDb.filter(x => x.name.startsWith(name));
 					this.mfms = db;
-				} else if (this.q.startsWith('[')) {
-					const name = this.q.substr(1);
+				} else if (this.q.startsWith('$[')) {
+					const name = this.q.substr(2);
 					const db = fnDb.filter(x => x.name.startsWith(name));
 					this.mfms = db;
 				}

diff --git a/src/client/app/common/views/directives/autocomplete.ts b/src/client/app/common/views/directives/autocomplete.ts
@@ -82,7 +82,7 @@ class Autocomplete {
 		const hashtagIndex = text.lastIndexOf('#');
 		const emojiIndex = text.lastIndexOf(':');
 		const angleIndex = text.lastIndexOf('<');
-		const fnIndex = text.lastIndexOf('[');
+		const fnIndex = text.lastIndexOf('$[');
 
 		const max = Math.max(
 			mentionIndex,
@@ -138,9 +138,9 @@ class Autocomplete {
 		}
 
 		if (isFn && opened == false) {
-			const fn = text.substr(fnIndex + 1);
+			const fn = text.substr(fnIndex + 2);
 			if (fn.match(/^[a-z]*$/)) {
-				this.open('mfm', `[${fn}`);
+				this.open('mfm', `$[${fn}`);
 				opened = true;
 			}
 		}

diff --git a/src/mfm/language.ts b/src/mfm/language.ts
@@ -331,7 +331,7 @@ export const mfmLanguage = P.createLanguage({
 	fn: r => {
 		return P((input, i) => {
 			const text = input.substr(i);
-			const match = text.match(/^\[([0-9a-z]+)(?:\.([0-9a-z.,=]+))?\s+([^\n\[\]]+)\]/);
+			const match = text.match(/^\$\[([0-9a-z]+)(?:\.([0-9a-z.,=]+))?\s+([^\n\[\]]+)\]/);
 			if (!match) return P.makeFailure(i, 'not a fn');
 
 			const name = match[1];