Add languages by filename

PythonistaGuild · Jul 12, 2024 · a3936f2 · a3936f2
1 parent 5896861
commit a3936f2
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 4 deletions.
diff --git a/web/password.html b/web/password.html
@@ -17,6 +17,7 @@
 
     <!-- SCRIPTS -->
     <script src="/static/scripts/initialTheme.js?v=1"></script>
+    <script src="/static/scripts/utils.js"></script>
     <script src="/static/scripts/themes.js?v=1" defer></script>
     <script src="/static/scripts/hidecopy.js?v=1" defer></script>
     <script src="/static/scripts/highlightsHTMX.js?v=5"></script>

diff --git a/web/paste.html b/web/paste.html
@@ -16,6 +16,7 @@
 
     <!-- SCRIPTS -->
     <script src="/static/scripts/initialTheme.js?v=1"></script>
+    <script src="/static/scripts/utils.js"></script>
     <script src="/static/scripts/themes.js?v=1" defer></script>
     <script src="/static/scripts/hidecopy.js?v=1" defer></script>
     <script src="/static/scripts/highlights.js?v=5" defer></script>

diff --git a/web/static/scripts/highlights.js b/web/static/scripts/highlights.js
@@ -6,11 +6,22 @@ let DlCount = 0;
 
 for (let area of HIGHLIGHT_AREAS) {
     let code = area.querySelector("pre > code");
+    let name = area.querySelector(".pasteHeader > div > .filenameArea");
+
     pasteStores.push(code.textContent);
 
     // Highlight Code Block and get Language Details...
-    let details = hljs.highlightAuto(code.textContent);
-    let highlightedLang = details.language ? details.language : "plaintext";
+    let nameLang = getLangByName(name.textContent);
+    let highlightedLang;
+    let details;
+
+    if (!nameLang) {
+        details = hljs.highlightAuto(code.textContent);
+        highlightedLang = details.language ? details.language : "plaintext";
+    } else {
+        details = hljs.highlight(code.textContent, { "language": nameLang })
+        highlightedLang = nameLang.toLowerCase();
+    }
 
     code.innerHTML = details.value;
 

diff --git a/web/static/scripts/highlightsHTMX.js b/web/static/scripts/highlightsHTMX.js
@@ -14,11 +14,21 @@ document.addEventListener("htmx:afterRequest", function (evt) {
 
         for (let area of HIGHLIGHT_AREAS) {
             let code = area.querySelector("pre > code");
+            let name = area.querySelector(".pasteHeader > div > .filenameArea");
             pasteStores.push(code.textContent);
 
             // Highlight Code Block and get Language Details...
-            let details = hljs.highlightAuto(code.textContent);
-            let highlightedLang = details.language ? details.language : "plaintext";
+            let nameLang = getLangByName(name.textContent);
+            let highlightedLang;
+            let details;
+
+            if (!nameLang) {
+                details = hljs.highlightAuto(code.textContent);
+                highlightedLang = details.language ? details.language : "plaintext";
+            } else {
+                details = hljs.highlight(code.textContent, { "language": nameLang })
+                highlightedLang = nameLang.toLowerCase();
+            }
 
             code.innerHTML = details.value;
 

diff --git a/web/static/scripts/utils.js b/web/static/scripts/utils.js
@@ -0,0 +1,14 @@
+function getLangByName(name) {
+    splat = name.split(".");
+    if (splat.length <= 1) {
+        return null
+    }
+
+    ext = splat[splat.length - 1];
+    lang = hljs.getLanguage(ext);
+
+    if (!lang) {
+        return null
+    }
+    return lang.name;
+}