[nongnu] elpa/webpaste 44df573 244/298: Merge branch 'kaushalmodi-add-lang-detection-from-shebang'

[ELPA Syncer]

branch: elpa/webpaste
commit 44df573eca344e7f4b86970717ca64d8d4f4e702
Merge: 69a8eed 2c399a0
Author: Elis Hirwing <elis@hirwing.se>
Commit: Elis Hirwing <elis@hirwing.se>

    Merge branch 'kaushalmodi-add-lang-detection-from-shebang'
---
 tests/unit/test-webpaste-get-language.el | 45 ++++++++++++++++++++++++++++++++
 webpaste.el                              | 41 ++++++++++++++++++++++++++---
 2 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/tests/unit/test-webpaste-get-language.el 
b/tests/unit/test-webpaste-get-language.el
new file mode 100644
index 0000000..17d9e4a
--- /dev/null
+++ b/tests/unit/test-webpaste-get-language.el
@@ -0,0 +1,45 @@
+;;; test-webpaste-get-language.el --- Tests for webpaste
+;;; Commentary:
+;;; Code:
+
+(load "tests/load-undercover.el")
+(require 'webpaste)
+
+(describe
+ "Get language for buffer"
+
+ ;; Setup the current buffer with a bash script
+ (before-each
+  (insert "#!/usr/bin/env bash")
+  (newline)
+  (insert "echo 'Hello'"))
+
+ ;; Kill the contents of the current buffers bash script
+ (after-each
+  (kill-region (point-min) (point-max)))
+
+ (it
+  "can get the language by shebang"
+
+  ;; Setup. Let the mode be fundamental-mode.
+  (let ((major-mode 'fundamental-mode))
+    ;; Do test. And expect the matched mode to be bash-mode, since the buffer
+    ;; contains a bash shebang.
+    (expect (webpaste--get-shebang-lang-mode)
+            :to-equal
+            'bash-mode)))
+
+ (it
+  "will use shebangs before major-mode"
+
+  ;; Setup.
+  (let ((major-mode 'fundamental-mode)
+        (webpaste--provider-lang-alists '(("https://example.com/"; .
+                                           ((fundamental-mode . "text")
+                                            (bash-mode . "bash"))))))
+
+    (expect (webpaste--get-buffer-language "https://example.com/";)
+            :to-equal
+            "bash"))))
+
+;;; test-webpaste-get-language.el ends here
diff --git a/webpaste.el b/webpaste.el
index ce12f2e..3665a38 100644
--- a/webpaste.el
+++ b/webpaste.el
@@ -93,7 +93,13 @@ This uses `browse-url-generic' to open URLs."
      :lang-uri-separator "/"
      :lang-overrides ((emacs-lisp-mode . "elisp")
                       (nix-mode . "nix")
-                      (conf-toml-mode . "toml"))
+                      (conf-toml-mode . "toml")
+                      (bash-mode . "bash")
+                      (sh-mode . "sh")
+                      (csh-mode . "csh")
+                      (tcsh-mode . "tcsh")
+                      (python3-mode . "python3")
+                      (nim-mode . "nim"))
      :success-lambda webpaste--providers-success-location-header)
 
     ("ix.io"
@@ -399,6 +405,32 @@ Optional params:
   webpaste-provider-priority)
 
 
+(cl-defun webpaste--get-shebang-lang-mode ()
+  "Return language of the buffer set using a shebang as a mode symbol.
+
+Return nil if no shebang found.
+
+Example: For \"#!/usr/bin/env bash\", 'bash-mode is returned.
+         For \"#!/bin/python\", 'python-mode is returned."
+
+  (let* ((end-of-first-line (save-excursion
+                              (save-restriction
+                               (widen)
+                                (goto-char (point-min))
+                                (end-of-line 1)
+                                (point))))
+         (first-line (save-restriction
+                       (widen)
+                       (buffer-substring-no-properties
+                        (point-min) end-of-first-line))))
+    (when (string-match "\\`#!\\(?1:\\(?:[^ ]+/\\)\\(?2:[^ /]+\\)\\)\\(?: 
+\\(?3:[^ ]+\\)\\)*" first-line)
+      (let ((lang (if (string= "/usr/bin/env" (match-string-no-properties 1 
first-line))
+                      (match-string-no-properties 3 first-line)
+                    (match-string-no-properties 2 first-line))))
+        (when lang
+          (intern (format "%s-mode" lang)))))))
+
+
 (cl-defun webpaste--get-buffer-language (provider)
   "Return language of the buffer that should be sent to the PROVIDER.
 
@@ -406,9 +438,10 @@ This also depends on which provider it is since different 
providers might have
 different opinions of how the input for their fields should look like."
 
   (unless webpaste-paste-raw-text
-    (let ((provider-lang-alist (cdr (assoc provider 
webpaste--provider-lang-alists))))
-      (let ((language-name (cdr (assoc major-mode provider-lang-alist))))
-        language-name))))
+    (let* ((provider-lang-alist (cdr (assoc provider 
webpaste--provider-lang-alists)))
+           (detected-mode (or (webpaste--get-shebang-lang-mode) major-mode))
+           (language-name (cdr (assoc detected-mode provider-lang-alist))))
+      language-name)))
 
 
 (cl-defun webpaste--return-url (returned-url)