From 26fe1b7c0adb64b7bfdbe166f358478d56b06dfd Mon Sep 17 00:00:00 2001
From: Dmitry <dimio@dimio.org>
Date: Fri, 21 Jul 2023 22:48:05 +0300
Subject: [PATCH 1/5] Add simple file extension mapping to highlighted lang

(cherry picked from commit 6cd29f1ef8107c2efc4374bbd223f79216d34f14)
---
 script.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/script.js b/script.js
index ffc152a..8bda337 100644
--- a/script.js
+++ b/script.js
@@ -54,7 +54,7 @@ const initLangSelector = () => {
 
     // Set lang selector
     const l = new URLSearchParams(window.location.search).get('l');
-    select.set(l ? decodeURIComponent(l) : shorten('Plain Text'));
+    select.set(l ? decodeURIComponent(fileExtToLang(l)) : shorten('Plain Text'));
 };
 
 const initCode = () => {
@@ -271,6 +271,19 @@ const hash = function (str, seed = 0) {
     return h.toString(36).substr(0, 4).toUpperCase();
 };
 
+const fileExtToLang = function (str) {
+    const mapping = new Map();
+    mapping.set("shll", ["sh", "bash", "zsh"]);
+    mapping.set("pwll", ["ps1"]);
+    mapping.set("perl", ["pl"]);
+    for (const [lang, fileExt] of mapping.entries()) {
+        if (fileExt.includes(str)) {
+            return lang;
+        }
+    }
+    return str;
+}
+
 // Only for tests purposes
 const testAllModes = () => {
     for (const [index, language] of Object.entries(CodeMirror.modeInfo)) {

From e6edffd83ae6668184344b14fc3edec87afddfb1 Mon Sep 17 00:00:00 2001
From: Dmitry <dimio@dimio.org>
Date: Mon, 24 Jul 2023 13:15:05 +0300
Subject: [PATCH 2/5] Move file extension mapping rules to external resource
 file

---
 index.html                            |  9 ++++++
 resources/file-extension-to-lang.json | 16 ++++++++++
 script.js                             | 42 ++++++++++++++++++++-------
 3 files changed, 56 insertions(+), 11 deletions(-)
 create mode 100644 resources/file-extension-to-lang.json

diff --git a/index.html b/index.html
index e26d1a9..35c04ea 100644
--- a/index.html
+++ b/index.html
@@ -163,6 +163,15 @@ <h3>Because of this design:</h3>
                 </div>
             </div>
         </div>
+        <div id="resource-error-modal" class="modal" data-micromodal-close>
+            <div tabindex="-1" class="modal-overlay">
+                <div role="dialog" class="modal-content shadow-bottom p-3 m-3">
+                    <div class="modal-close" data-micromodal-close><span class="icon-close"></span></div>
+                    NoPaste cannot load resources<br /><br />
+                    Sorry about that
+                </div>
+            </div>
+        </div>
 
         <script src="https://cdn.jsdelivr.net/combine/
 npm/lzma@2.3.2/src/lzma.min.js,
diff --git a/resources/file-extension-to-lang.json b/resources/file-extension-to-lang.json
new file mode 100644
index 0000000..3d50eb8
--- /dev/null
+++ b/resources/file-extension-to-lang.json
@@ -0,0 +1,16 @@
+{
+  "shll": [
+    "sh",
+    "bash",
+    "zsh"
+  ],
+  "pwll": [
+    "ps1"
+  ],
+  "perl": [
+    "pl"
+  ],
+  "mrwn": [
+    "md"
+  ]
+}
diff --git a/script.js b/script.js
index 8bda337..bb41efb 100644
--- a/script.js
+++ b/script.js
@@ -5,8 +5,12 @@ let editor = null;
 let select = null;
 let clipboard = null;
 let statsEl = null;
+var fileExtToLangMap = null;
 
 const init = () => {
+    Object.entries({
+        'fileExtToLangMap': 'file-extension-to-lang.json',
+    }).forEach(([varName, resource]) => this[varName] = loadResource(resource))
     handleLegacyUrl();
     initCodeEditor();
     initLangSelector();
@@ -54,7 +58,9 @@ const initLangSelector = () => {
 
     // Set lang selector
     const l = new URLSearchParams(window.location.search).get('l');
-    select.set(l ? decodeURIComponent(fileExtToLang(l)) : shorten('Plain Text'));
+    fileExtToLang(l)
+        .then((lang) => select.set(decodeURIComponent(lang)))
+        .catch(select.set(shorten('Plain Text')));
 };
 
 const initCode = () => {
@@ -271,17 +277,31 @@ const hash = function (str, seed = 0) {
     return h.toString(36).substr(0, 4).toUpperCase();
 };
 
-const fileExtToLang = function (str) {
-    const mapping = new Map();
-    mapping.set("shll", ["sh", "bash", "zsh"]);
-    mapping.set("pwll", ["ps1"]);
-    mapping.set("perl", ["pl"]);
-    for (const [lang, fileExt] of mapping.entries()) {
-        if (fileExt.includes(str)) {
-            return lang;
+const fileExtToLang = (str) => {
+    return new Promise((resolve, reject) => {
+        if (str) {
+            fileExtToLangMap.then((mapping) => {
+                for (const [lang, fileExt] of Object.entries(mapping)) {
+                    if (fileExt.includes(str)) {
+                        resolve(lang);
+                        return;
+                    }
+                }
+                resolve(str);
+            });
+        } else {
+            reject(str);
         }
-    }
-    return str;
+    })
+}
+
+const loadResource = (resource) => {
+    return fetch(`./resources/${resource}`)
+        .then(response => response.json())
+        .catch(error => {
+            console.log(error);
+            MicroModal.show('resource-error-modal');
+        });
 }
 
 // Only for tests purposes

From 4e642aefee4f25ff6c1b8f6fbc6ffa90512656a5 Mon Sep 17 00:00:00 2001
From: Dmitry <dimio@dimio.org>
Date: Mon, 24 Jul 2023 20:12:29 +0300
Subject: [PATCH 3/5] Detect lang by file extension via
 `CodeMirror.findModeByExtension`

---
 script.js | 46 +++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/script.js b/script.js
index bb41efb..dc4eae8 100644
--- a/script.js
+++ b/script.js
@@ -5,12 +5,8 @@ let editor = null;
 let select = null;
 let clipboard = null;
 let statsEl = null;
-var fileExtToLangMap = null;
 
 const init = () => {
-    Object.entries({
-        'fileExtToLangMap': 'file-extension-to-lang.json',
-    }).forEach(([varName, resource]) => this[varName] = loadResource(resource))
     handleLegacyUrl();
     initCodeEditor();
     initLangSelector();
@@ -57,10 +53,14 @@ const initLangSelector = () => {
     });
 
     // Set lang selector
-    const l = new URLSearchParams(window.location.search).get('l');
-    fileExtToLang(l)
-        .then((lang) => select.set(decodeURIComponent(lang)))
-        .catch(select.set(shorten('Plain Text')));
+    new Promise((resolve, reject, l = new URLSearchParams(window.location.search).get('l')) => {
+        l ? resolve(l) : reject()
+    })
+    .then(l => select.set(decodeURIComponent(l)))
+    .catch((ext = new URLSearchParams(window.location.search).get('e')) => {
+        fileExtToSelectValue(ext).then(e => select.set(decodeURIComponent(e)))
+    })
+    .catch(select.set(shorten('Plain Text')))
 };
 
 const initCode = () => {
@@ -277,33 +277,21 @@ const hash = function (str, seed = 0) {
     return h.toString(36).substr(0, 4).toUpperCase();
 };
 
-const fileExtToLang = (str) => {
-    return new Promise((resolve, reject) => {
-        if (str) {
-            fileExtToLangMap.then((mapping) => {
-                for (const [lang, fileExt] of Object.entries(mapping)) {
-                    if (fileExt.includes(str)) {
-                        resolve(lang);
-                        return;
+const fileExtToSelectValue = (ext) => {
+    return new Promise(resolve => {
+        if (ext) {
+            const info = CodeMirror.findModeByExtension(ext);
+            if (info) {
+                for (const el of select.data.data) {
+                    if (el.data.mode === info.mode) {
+                        resolve(el.value);
                     }
                 }
-                resolve(str);
-            });
-        } else {
-            reject(str);
+            }
         }
     })
 }
 
-const loadResource = (resource) => {
-    return fetch(`./resources/${resource}`)
-        .then(response => response.json())
-        .catch(error => {
-            console.log(error);
-            MicroModal.show('resource-error-modal');
-        });
-}
-
 // Only for tests purposes
 const testAllModes = () => {
     for (const [index, language] of Object.entries(CodeMirror.modeInfo)) {

From 6922ab3dd725bcc4604afafc02fa737efd1e3a33 Mon Sep 17 00:00:00 2001
From: Dmitry <dimio@dimio.org>
Date: Mon, 24 Jul 2023 20:14:22 +0300
Subject: [PATCH 4/5] Remove useless `resources` folder

---
 resources/file-extension-to-lang.json | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 resources/file-extension-to-lang.json

diff --git a/resources/file-extension-to-lang.json b/resources/file-extension-to-lang.json
deleted file mode 100644
index 3d50eb8..0000000
--- a/resources/file-extension-to-lang.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "shll": [
-    "sh",
-    "bash",
-    "zsh"
-  ],
-  "pwll": [
-    "ps1"
-  ],
-  "perl": [
-    "pl"
-  ],
-  "mrwn": [
-    "md"
-  ]
-}

From a591ccce6e580e20b3819465ca0105ef0fb5ad6c Mon Sep 17 00:00:00 2001
From: Dmitry <dimio@dimio.org>
Date: Mon, 24 Jul 2023 20:15:05 +0300
Subject: [PATCH 5/5] Remove useless resource loading error message

---
 index.html | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/index.html b/index.html
index 35c04ea..e26d1a9 100644
--- a/index.html
+++ b/index.html
@@ -163,15 +163,6 @@ <h3>Because of this design:</h3>
                 </div>
             </div>
         </div>
-        <div id="resource-error-modal" class="modal" data-micromodal-close>
-            <div tabindex="-1" class="modal-overlay">
-                <div role="dialog" class="modal-content shadow-bottom p-3 m-3">
-                    <div class="modal-close" data-micromodal-close><span class="icon-close"></span></div>
-                    NoPaste cannot load resources<br /><br />
-                    Sorry about that
-                </div>
-            </div>
-        </div>
 
         <script src="https://cdn.jsdelivr.net/combine/
 npm/lzma@2.3.2/src/lzma.min.js,