Merge pull request #24 from davidhcefx/js-merge

enh(js): Merge the two JS files

Author: galenguyer

javascript.nanorc

@@ -1,7 +1,6 @@
 ### all *js and *mjs files  ( e.g. Firefox user.js, prefs.js )
 
 ## Old version
-
 #syntax "JavaScript" "(\.|/|)js$"
 #color green "//.*$" start="\/\*" end="\*\/"
 #color blue "'(\\.|[^'])*'"
@@ -12,7 +11,7 @@
 
 ## New updated taken from http://wiki.linuxhelp.net/index.php/Nano_Syntax_Highlighting
 
-syntax "JavaScript" "\.(m?js)$"
+syntax "JavaScript" "\.(m?js|ts|javascript|typescript)$"
 header "^#!.*\/(env +)node"
 comment "//"
 
@@ -28,29 +27,42 @@ color yellow "\<[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
 
 ## Keywords
 color green "\<(break|case|catch|continue|default|delete|do|else|finally)\>"
-color green "\<(for|function|if|in|instanceof|new|null|return|switch)\>"
-color green "\<(switch|this|throw|try|typeof|undefined|var|void|while|with)\>"
+color green "\<(for|function|if|in|instanceof|new|return|switch)\>"
+color green "\<(switch|this|throw|try|typeof|var|void|while|with)\>"
 color green "\<(import|as|from|export)\>"
 color green "\<(const|let|class|extends|of|get|set|await|async|yield)\>"
 
 ## Type specifiers
 color red "\<(Array|Boolean|Date|Enumerator|Error|Function|Math)\>"
 color red "\<(WeakMap|Map|WeakSet|Set|Symbol|Promise)\>"
 color red "\<(Number|Object|RegExp|String)\>"
-color red "\<(true|false)\>"
+color red "\<(true|false|null|undefined|NaN)\>"
+
+## Function names
+color cyan "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]|)"
+
+## Operators
+#color red "[-+/*=<>!~%?:&|]"
 
 ## String
 color brightyellow "L?\"(\\"|[^"])*\""
-color brightyellow "L?'(\'|[^'])*'"
-color brightcyan "L?`(\`|[^`])*`"
+color brightyellow "L?'(\\'|[^'])*'"
+color brightyellow "L?`(\\`|[^`])*`"
 color brightwhite,blue start="\$\{" end="\}"
 
-## Trailing spaces
-color ,green "[[:space:]]+$"
+## Regex
+color magenta "/[^*]([^/]|(\\/))*[^\\]/[gim]*"
 
 ## Escapes
-color red "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
+color yellow "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"`\?\\]"
 
 ## Comments
 color brightblue start="^\s*/\*" end="\*/"
 color brightblue "^\s*//.*$"
+
+## Trailing spaces and mixed whitespaces
+color ,green "[[:space:]]+$"
+color ,red   "( +	+|	+ +)"
+
+## Reminders
+color brightwhite,yellow "\<(FIXME|TODO|XXX)\>"

js.nanorc

@@ -54,7 +54,6 @@ include "~/.nano/ini.nanorc"
 include "~/.nano/inputrc.nanorc"
 include "~/.nano/jade.nanorc"
 include "~/.nano/java.nanorc"
-include "~/.nano/javascript.nanorc"
 include "~/.nano/jrnl.nanorc"
 include "~/.nano/js.nanorc"
 include "~/.nano/json.nanorc"