From 9eded797d6e0d905fa27321a92e5318c399fd603 Mon Sep 17 00:00:00 2001
From: Leah <leah@leahdevs.xyz>
Date: Sun, 19 Jan 2025 17:34:43 +0100
Subject: [PATCH] add line numbers on code blocks

---
 locales/index.d.ts                            |  2 +-
 .../frontend/src/components/MkCode.core.vue   | 19 +++++++++++++++++++
 .../frontend/src/components/MkCodeEditor.vue  |  3 ++-
 .../frontend/src/scripts/install-plugin.ts    |  6 +++++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index da14073e8..086a23373 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -6843,7 +6843,7 @@ export interface Locale extends ILocale {
             };
             "_tutorialCompleted": {
                 /**
-                 * Misskey初心者講座 修了証
+                 * Forkey初心者講座 修了証
                  */
                 "title": string;
                 /**
diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue
index c0e7df5da..f52397219 100644
--- a/packages/frontend/src/components/MkCode.core.vue
+++ b/packages/frontend/src/components/MkCode.core.vue
@@ -72,6 +72,25 @@ watch(() => props.lang, (to) => {
 </script>
 
 <style module lang="scss">
+.codeBlockRoot {
+  text-align: left;
+}
+
+.codeBlockRoot :global(.shiki) > code {
+  counter-reset: step;
+  counter-increment: step 0;
+}
+
+.codeBlockRoot :global(.shiki) > code > span::before {
+  content: counter(step);
+  counter-increment: step;
+  width: 1rem;
+  margin-right: 1.5rem;
+  display: inline-block;
+  text-align: right;
+  color: rgba(115,138,148,.4)
+}
+
 .codeBlockRoot :global(.shiki) {
 	padding: 1em;
 	margin: .5em 0;
diff --git a/packages/frontend/src/components/MkCodeEditor.vue b/packages/frontend/src/components/MkCodeEditor.vue
index 442045927..604bd79b9 100644
--- a/packages/frontend/src/components/MkCodeEditor.vue
+++ b/packages/frontend/src/components/MkCodeEditor.vue
@@ -206,7 +206,8 @@ watch(v, newValue => {
 	outline: 0;
 	min-width: calc(100% - 24px);
 	height: 100%;
-	padding: 12px;
+	// the +2.5 rem is because of the line numbers
+	padding: 12px 12px 12px calc(12px + 2.5rem);
 	line-height: 1.5em;
 	font-size: 1em;
 	font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
diff --git a/packages/frontend/src/scripts/install-plugin.ts b/packages/frontend/src/scripts/install-plugin.ts
index d0a8675b1..15b0cedc7 100644
--- a/packages/frontend/src/scripts/install-plugin.ts
+++ b/packages/frontend/src/scripts/install-plugin.ts
@@ -64,7 +64,11 @@ export async function parsePluginMeta(code: string): Promise<AiScriptPluginMeta>
 	try {
 		ast = parser.parse(code);
 	} catch (err) {
-		throw new Error('Aiscript syntax error');
+		if (err instanceof Error) {
+			throw new Error(`Aiscript syntax error\n${(err as Error).message}`);
+		} else {
+			throw new Error('Aiscript syntax error');
+		}
 	}
 
 	const meta = Interpreter.collectMetadata(ast);