support jsonnet and jssm

JSerZANP · Aug 13, 2023 · 2ce3f44 · 2ce3f44 · vercel · Aug 13, 2023
1 parent f94e1bc
commit 2ce3f44
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/examples/web/components/CodeSnippet.tsx b/examples/web/components/CodeSnippet.tsx
@@ -103,8 +103,8 @@ const ALL_LANGS = [
   "json",
   "json5",
   "jsonc",
-  // "jsonnet",
-  // "jssm",
+  "jsonnet",
+  "jssm",
   // "fsl",
   // "jsx",
   "julia",
@@ -303,7 +303,7 @@ export function CodeSnippet({ code: _code }: { code?: string }) {
   const [selectedTheme, setTheme] = useState<(typeof themes)[number]>(
     themes[0]
   );
-  const [lang, setLang] = useState<shiki.Lang>("jsonc");
+  const [lang, setLang] = useState<shiki.Lang>("jssm");
   const [code, setCode] = useState(_code ?? defaultCode[lang] ?? "");
   useEffect(() => {
     setCode(defaultCode[lang]);

diff --git a/packages/remark-shaku-code-annotate/src/__tests__/langs/jsonnet/output.txt b/packages/remark-shaku-code-annotate/src/__tests__/langs/jsonnet/output.txt
@@ -0,0 +1 @@
+<pre class="shiki github-light" style="color:#24292e;background-color:#fff"><div class="code-container"><code><div class="line"></div><div class="line"><span style="color: #24292E">{</span></div><div class="line"><span style="color: #24292E">  </span><span style="color: #6A737D">// This is a JSON5 object with comments</span></div><div class="line"><span style="color: #24292E">  </span><span style="color: #032F62">"name"</span><span style="color: #D73A49">:</span><span style="color: #24292E"> </span><span style="color: #032F62">"John"</span><span style="color: #24292E">,</span></div><div class="line dim"><span style="color: #24292E">  </span><span style="color: #032F62">"age"</span><span style="color: #D73A49">:</span><span style="color: #24292E"> </span><span style="color: #005CC5">30</span><span style="color: #24292E">,</span></div><div class="line"><span style="color: #24292E">  </span><span style="color: #032F62">"isStudent"</span><span style="color: #D73A49">:</span><span style="color: #24292E"> </span><span style="color: #005CC5">false</span><span style="color: #24292E">,</span></div><div class="shaku-underline shaku-underline-solid" style="left:3ch"><span class="shaku-underline-line" style="left:0ch">---------</span></div><div class="shaku-callout" style="left:2ch"><span class="shaku-callout-arrow" style="left:1ch"></span><p>Hello World!</p></div><div class="line"><span style="color: #24292E">}</span></div><div class="line"></div></code></div></pre>
diff --git a/packages/remark-shaku-code-annotate/src/__tests__/langs/jssm/output.txt b/packages/remark-shaku-code-annotate/src/__tests__/langs/jssm/output.txt
@@ -0,0 +1 @@
+<pre class="shiki github-light" style="color:#24292e;background-color:#fff"><div class="code-container"><code><div class="line"></div><div class="line dim"><span style="color: #6A737D">// coffee</span></div><div class="shaku-underline shaku-underline-solid" style="left:3ch"><span class="shaku-underline-line" style="left:0ch">------</span></div><div class="shaku-callout" style="left:3ch"><span class="shaku-callout-arrow" style="left:2ch"></span><p>Hello!</p></div><div class="line"></div></code></div></pre>
diff --git a/packages/remark-shaku-code-annotate/src/defaultCode.ts b/packages/remark-shaku-code-annotate/src/defaultCode.ts
@@ -541,6 +541,25 @@ export default function Counter() {
 // ^
 //[Hello World!]
 }
+`,
+  jsonnet: `
+{
+  // This is a JSON5 object with comments
+  "name": "John",
+// @dim
+  "age": 30,
+  "isStudent": false,
+// ---------
+// ^
+//[Hello World!]
+}
+`,
+  jssm: `
+// @dim
+// coffee
+// ------
+  // ^
+// [Hello!]
 `,
   julia: `
 # @dim

diff --git a/packages/remark-shaku-code-annotate/src/index.ts b/packages/remark-shaku-code-annotate/src/index.ts
@@ -308,7 +308,7 @@ function parseComment(
   // rather we can just try to trim for each lang?
   if (
     lang != null &&
-    ["ada", "berry", "elm", "haml", "handlebars", "hlsl"].includes(lang)
+    ["ada", "berry", "elm", "haml", "handlebars", "hlsl", "jssm"].includes(lang)
   ) {
     body = line
       .slice(shouldTreatFirstTokenOffset ? 1 : 0)
@@ -494,6 +494,12 @@ const commentMarkers: Record<string, { head?: RegExp; tail?: RegExp }> = {
   json5: {
     head: /^\s*\/\//,
   },
+  jsonnet: {
+    head: /^\s*\/\//,
+  },
+  jssm: {
+    head: /^\s*\/\//,
+  },
   rust: {
     head: /^\s*\/\//,
   },