From 3465607c5a42a7687000b366f580fa3dc91c60d6 Mon Sep 17 00:00:00 2001
From: davidhcefx <davidhu0903ex3@gmail.com>
Date: Thu, 13 Apr 2023 22:13:39 +0800
Subject: [PATCH] Enhancements: Batch, HTML, JS

- [Batch] Fix that using "::" as comments sometimes failed
- [html] Tabs give 2 spaces by default
- [JS] Tabs give 2 spaces by default; Allow comments to be inline with code.
- [Sh] Also highlight PKGBUILD; Fix `${v%tail}` not highlighted; Use shellcheck as linter
---
 batch.nanorc | 2 +-
 html.nanorc  | 1 +
 js.nanorc    | 2 +-
 sh.nanorc    | 6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/batch.nanorc b/batch.nanorc
index bc936d8..af65a35 100644
--- a/batch.nanorc
+++ b/batch.nanorc
@@ -4,7 +4,7 @@
 
 syntax "batch" "\.(bat|cmd)$"
 header "^@[eE](cho|CHO) (on|off|ON|OFF)"
-comment "::"
+comment "REM "
 
 # Native commands, symbols, and comparisons.
 icolor green "\<(ASSOC|CALL|CD|CLS|CMDEXTVERSION|COLOR|COPY|DATE|DEL|DIR|ECHO|ENDLOCAL|ERASE|ERRORLEVEL|EXIT|FOR|FTYPE|GOTO|IF|MD|MKLINK|MOVE|PATH|PAUSE|POPD|PROMPT|PUSHD|RD|REM|REN|SET|SETLOCAL|SHIFT|START|TIME|TITLE|TYPE|VER|VERIFY|VOL)\>"
diff --git a/html.nanorc b/html.nanorc
index 01bb24a..a23c2d7 100644
--- a/html.nanorc
+++ b/html.nanorc
@@ -3,6 +3,7 @@
 syntax "HTML" "\.html?(.j2)?(.twig)?$"
 magic "HTML document"
 comment "<!--|-->"
+tabgives "  "
 
 ## Emphasis tags
 color brightwhite start="<([biu]|em|strong)[^>]*>" end="</([biu]|em|strong)>"
diff --git a/js.nanorc b/js.nanorc
index 8991928..403a555 100644
--- a/js.nanorc
+++ b/js.nanorc
@@ -53,4 +53,4 @@ color red "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
 
 ## Comments
 color brightblue start="^\s*/\*" end="\*/"
-color brightblue "^\s*//.*$"
+color brightblue "(^|\s)//.*$"
diff --git a/sh.nanorc b/sh.nanorc
index 826b784..f9609a5 100644
--- a/sh.nanorc
+++ b/sh.nanorc
@@ -1,11 +1,11 @@
 ## Here is an example for Bourne shell scripts.
 ##
-syntax "SH" "\.sh$" "\.ash$" "\.bashrc$" "bashrc$" "\.bash_aliases$" "bash_aliases$" "\.bash_functions$" "bash_functions$" "\.bash_login$" "\.bash_logout$" "\.bash_profile$" "bash_profile$" "\.profile$" "revise\..+$"
+syntax "SH" "\.sh$" "\.ash$" "\.bashrc$" "bashrc$" "\.bash_aliases$" "bash_aliases$" "\.bash_functions$" "bash_functions$" "\.bash_login$" "\.bash_logout$" "\.bash_profile$" "bash_profile$" "\.profile$" "revise\..+$" "^PKGBUILD$"
 header "^#!.*/(env +)?(ba|da|a)?sh( |$)"
 magic "(POSIX|Bourne-Again) shell script.*text"
 comment "#"
 
-linter dash -n
+linter shellcheck --format=gcc
 
 ## keywords:
 color green "\<(case|do|done|elif|else|esac|fi|for|function|if|in|select|then|time|until|while)\>"
@@ -17,7 +17,7 @@ color brightblue "\<(alias|bg|bind|break|builtin|caller|cd|command|compgen|compl
 ## not buitins:
 ## cat|chmod|chown|cp|env|grep|install|ln|make|mkdir|mv|rm|sed|tar|touch
 icolor brightgreen "^\s+[0-9A-Z_]+\s+\(\)"
-icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+icolor brightred "\$\{?[0-9A-Z_!@#%$*?-]+\}?"
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
 color cyan "(^|[[:space:]])#.*$"
 color ,green "[[:space:]]+$"