Merge branch 'scopatz:master' into master

.authors.yml

@@ -252,9 +252,11 @@
   github: hawk93
 - name: Harsh Shandilya
   email: msfjarvis@gmail.com
-  num_commits: 10
+  num_commits: 13
   first_commit: 2019-09-19 15:52:44
   github: msfjarvis
+  alternate_emails:
+  - me@msfjarvis.dev
 - name: DesertPunk
   email: 38014530+DesertPunk@users.noreply.github.com
   num_commits: 2
@@ -335,7 +337,7 @@
   github: TJProgrammer
 - name: Anthony Scopatz
   email: scopatz@gmail.com
-  num_commits: 50
+  num_commits: 52
   first_commit: 2010-07-28 18:15:43
   github: astronautlevel
 - name: PhilipRoman
@@ -556,16 +558,16 @@
   email: zdecook@ccel.org
   alternate_emails:
   - zachdecook@librem.one
-  num_commits: 6
+  num_commits: 10
   first_commit: 2019-12-18 09:34:49
   github: earboxer
 - name: Gareth Jones
   email: Jones258@Gmail.com
-  num_commits: 3
+  num_commits: 11
   first_commit: 2019-11-01 23:57:35
 - name: Dante Falzone
   email: 48266179+DanteFalzone0@users.noreply.github.com
-  num_commits: 2
+  num_commits: 8
   first_commit: 2019-12-25 22:55:19
   github: DanteFalzone0
 - name: CryptoDragonLady
@@ -583,3 +585,93 @@
   num_commits: 4
   first_commit: 2017-05-23 11:12:47
   github: ritiek
+- name: hdquemada
+  email: 44162051+hdquemada@users.noreply.github.com
+  num_commits: 4
+  first_commit: 2020-04-26 23:09:25
+  github: hdquemada
+- name: Oïleurre
+  email: 66210874+oileurre@users.noreply.github.com
+  num_commits: 2
+  first_commit: 2020-06-07 07:20:21
+  github: oileurre
+- name: Joerg Stoever
+  email: stoever@dtv-verkehrsconsult.de
+  num_commits: 1
+  first_commit: 2020-08-14 06:04:10
+  github: Gaibhne
+- name: emidiostani
+  email: emidiostani@gmail.com
+  num_commits: 1
+  first_commit: 2020-02-05 05:48:21
+  github: EmidioStani
+- name: Justin P
+  email: Jpartain89@gmail.com
+  num_commits: 1
+  first_commit: 2020-01-30 23:28:08
+  github: jpartain89
+- name: Yvan Satyawan
+  email: y_satyawan@hotmail.com
+  num_commits: 2
+  first_commit: 2020-03-16 08:40:58
+  github: yvan674
+- name: Paulo S. Costa
+  email: pauloscosta5@gmail.com
+  num_commits: 2
+  first_commit: 2020-01-27 17:18:02
+  github: pscosta5
+- name: czechuuu
+  email: czechuuu@users.noreply.github.com
+  num_commits: 1
+  first_commit: 2020-08-26 12:13:33
+  github: czechuuu
+- name: msuska
+  email: Martin.Suska@dhl.com
+  num_commits: 1
+  first_commit: 2020-03-21 10:18:26
+  github: Betlista
+- name: davidhcefx
+  email: davidhu0903ex3@gmail.com
+  num_commits: 3
+  first_commit: 2020-08-30 21:21:54
+  github: davidhcefx
+- name: Mlendea, Horațiu
+  email: Mlendea.Horatiu@GMail.com
+  num_commits: 2
+  first_commit: 2020-02-09 03:50:20
+  github: hmlendea
+- name: Exonorid
+  email: exonorid@gmail.com
+  num_commits: 1
+  first_commit: 2020-10-02 02:46:00
+  github: Exonorid
+- name: yzzyx
+  email: yzzyx@yzzyx.network
+  alternate_emails:
+  - yzzyx@cock.li
+  num_commits: 3
+  first_commit: 2020-04-24 09:22:09
+- name: Aiden Gall
+  email: aidentvgall@gmail.com
+  num_commits: 1
+  first_commit: 2020-03-14 18:09:11
+  github: Wasby
+- name: Rashil Gandhi
+  email: rashil2000@gmail.com
+  num_commits: 1
+  first_commit: 2020-08-10 08:12:56
+  github: rashil2000
+- name: Ryan Westlund
+  email: rlwestlund@gmail.com
+  num_commits: 2
+  first_commit: 2020-04-08 08:16:57
+  github: yujiri8
+- name: Serhiy Zahoriya
+  email: serhiy.int@gmail.com
+  num_commits: 1
+  first_commit: 2020-10-08 10:43:13
+- name: Bart Hanssens
+  email: bart.hanssens@bosa.fgov.be
+  num_commits: 1
+  first_commit: 2020-10-07 11:30:35
+  github: Fedict

.mailmap

@@ -12,13 +12,15 @@
 Anthony Scopatz <scopatz@gmail.com>
 Elof <elofu17@users.noreply.github.com>
 Simon Volpert <simon@simonvolpert.com>
+Harsh Shandilya <msfjarvis@gmail.com> Harsh Shandilya <me@msfjarvis.dev>
 Andrea Dejan Grande <dejan-grande@mail.com>
 Alex Taber <aft.pokemon@gmail.com>
-Harsh Shandilya <msfjarvis@gmail.com>
+Gareth Jones <Jones258@Gmail.com>
+Zach DeCook <zdecook@ccel.org> Zach DeCook <zachdecook@librem.one>
 Mariusz Smykuła <mariuszs@gmail.com>
+Dante Falzone <48266179+DanteFalzone0@users.noreply.github.com>
 Michael Straube <m.s.online@gmx.de> Michael Straube <straubem@gmx.de>
 CoffeeTableEnnui <thiabaud.engelbrecht@gmail.com>
-Zach DeCook <zdecook@ccel.org> Zach DeCook <zachdecook@librem.one>
 Daniel Kaplun <dan@beardtree.com>
 Philipp <creekpld@users.noreply.github.com>
 Tiago Almeida <tjamadeira@gmail.com>
@@ -27,6 +29,7 @@ nl6720 <nl6720@gmail.com>
 Thomas Rosenau <thomasr@fantasymail.de> ThomasR <thomasr@fantasymail.de>
 Matthew Cox <matthewcpcox@gmail.com>
 Ritiek Malhotra <Ritiek@users.noreply.github.com>
+hdquemada <44162051+hdquemada@users.noreply.github.com>
 Birger Jarl <codefuhrer@gmail.com>
 divinity76 <divinity76@gmail.com>
 CirKu17 <cirku17@gmail.com> CirKu17 <CirKu17@gmail.com>
@@ -37,7 +40,8 @@ Huub de Beer <Huub@heerdebeer.org>
 Mikael O. Bonnier <mikael.bonnier@gmail.com>
 Jeppe Fihl-Pearson <jeppe@tenzer.dk>
 Ondřej Ešler <ondrej.esler@intraworlds.com>
-Gareth Jones <Jones258@Gmail.com>
+davidhcefx <davidhu0903ex3@gmail.com>
+yzzyx <yzzyx@yzzyx.network> yzzyx <yzzyx@cock.li>
 Dan Kaplun <dbkaplun@gmail.com>
 Aryan Ebrahimpour <aryanebrahimpour@gmail.com>
 Paduct <paduct@list.ru> Bro <paduct@list.ru>
@@ -56,8 +60,12 @@ Bryan Ross <bryan@liquidstate.net>
 Nicholas Christopoulos <nereusx@users.noreply.github.com>
 Sina <sina6002@gmail.com>
 Ross Smith II <ross@smithii.com>
-Dante Falzone <48266179+DanteFalzone0@users.noreply.github.com>
 Hunter Peavey <vrywjvgviuotxeioqipx@disroot.org>
+Oïleurre <66210874+oileurre@users.noreply.github.com>
+Yvan Satyawan <y_satyawan@hotmail.com>
+Paulo S. Costa <pauloscosta5@gmail.com>
+Mlendea, Horațiu <Mlendea.Horatiu@GMail.com>
+Ryan Westlund <rlwestlund@gmail.com>
 Dan Pasanen <invisiblek@cyanogenmod.org>
 Marcus Willock <crazcalm@gmail.com> Crazcalm <crazcalm@gmail.com>
 Dario Ostuni <another.code.996@gmail.com>
@@ -124,3 +132,13 @@ John S Long <john@128.io>
 Ghost-NULL <maatpeter@hotmail.com>
 PN Wu (小平) <PingNote@users.noreply.github.com>
 CryptoDragonLady <celeste.weingartner@gmail.com>
+Joerg Stoever <stoever@dtv-verkehrsconsult.de>
+emidiostani <emidiostani@gmail.com>
+Justin P <Jpartain89@gmail.com>
+czechuuu <czechuuu@users.noreply.github.com>
+msuska <Martin.Suska@dhl.com>
+Exonorid <exonorid@gmail.com>
+Aiden Gall <aidentvgall@gmail.com>
+Rashil Gandhi <rashil2000@gmail.com>
+Serhiy Zahoriya <serhiy.int@gmail.com>
+Bart Hanssens <bart.hanssens@bosa.fgov.be>

AUTHORS.rst

@@ -4,13 +4,15 @@ Authors are sorted by number of commits.
 * Anthony Scopatz
 * Elof
 * Simon Volpert
+* Harsh Shandilya
 * Andrea Dejan Grande
 * Alex Taber
-* Harsh Shandilya
+* Gareth Jones
+* Zach DeCook
 * Mariusz Smykuła
+* Dante Falzone
 * Michael Straube
 * CoffeeTableEnnui
-* Zach DeCook
 * Daniel Kaplun
 * Philipp
 * Tiago Almeida
@@ -19,6 +21,7 @@ Authors are sorted by number of commits.
 * Thomas Rosenau
 * Matthew Cox
 * Ritiek Malhotra
+* hdquemada
 * Birger Jarl
 * divinity76
 * CirKu17
@@ -29,7 +32,8 @@ Authors are sorted by number of commits.
 * Mikael O. Bonnier
 * Jeppe Fihl-Pearson
 * Ondřej Ešler
-* Gareth Jones
+* davidhcefx
+* yzzyx
 * Dan Kaplun
 * Aryan Ebrahimpour
 * Paduct
@@ -48,8 +52,12 @@ Authors are sorted by number of commits.
 * Nicholas Christopoulos
 * Sina
 * Ross Smith II
-* Dante Falzone
 * Hunter Peavey
+* Oïleurre
+* Yvan Satyawan
+* Paulo S. Costa
+* Mlendea, Horațiu
+* Ryan Westlund
 * Dan Pasanen
 * Marcus Willock
 * Dario Ostuni
@@ -116,3 +124,13 @@ Authors are sorted by number of commits.
 * Ghost-NULL
 * PN Wu (小平)
 * CryptoDragonLady
+* Joerg Stoever
+* emidiostani
+* Justin P
+* czechuuu
+* msuska
+* Exonorid
+* Aiden Gall
+* Rashil Gandhi
+* Serhiy Zahoriya
+* Bart Hanssens

batch.nanorc

@@ -0,0 +1,34 @@
+## Here is an example for Batch file shell script.
+## Author: davidhcefx (https://github.com/davidhcefx), based on Mitch Bumgarner's version.
+## License: MIT License
+
+syntax "batch" "\.(bat|cmd)$"
+header "^@[eE](cho|CHO) (on|off|ON|OFF)"
+comment "::"
+
+# 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)\>"
+icolor green "\<(EQU|NEQ|LSS|LEQ|GTR|GEQ|DEFINED|EXIST|NOT)\>"
+color  green "[:|<>=&@\\^]"
+
+# Options.
+color brightmagenta "[[:blank:]]/[A-Za-z]+\>"
+
+# Common commands. (with Sublime and Github highlighting as a reference)
+icolor brightblue "\<(APPEND|ARP|AT|ATTRIB|AUTOFAIL|BACKUP|BCDBOOT|BCDEDIT|BITSADMIN|BREAK|CACLS|CERTREQ|CERTUTIL|CHANGE|CHCP|CHDIR|CHKDSK|CHKNTFS|CHOICE|CIPHER|CleanMgr|CLIP|CMD|CMDKEY|COMP|COMPACT|CONVERT|CSVDE|DEFRAG|DELTREE|DevCon|DIRQUOTA|DISKCOMP|DISKCOPY|DISKPART|DISKSHADOW|DNSCMD|DOSKEY|DriverQuery|DSACLs|DSAdd|DSGet|DSQuery|DSMod|DSMove|DSRM|Dsmgmt|EVENTCREATE|EXPAND|EXPLORER|EXTRACT|FC|FIND|FINDSTR|FORFILES|FORMAT|FREEDISK|FSUTIL|FTP|GETMAC|GPRESULT|GPUPDATE|GRAFTABL|HELP|HOSTNAME|iCACLS|IEXPRESS|IPCONFIG|INUSE|KEYB|LABEL|LODCTR|LOGMAN|LOGOFF|MAKECAB|MKDIR|MODE|MORE|MOUNTVOL|MSG|MSIEXEC|MSINFO32|MSTSC|NET|NETDOM|NETSH|NBTSTAT|NETSTAT|NLTEST|NSLOOKUP|NTBACKUP|NTDSUtil|OPENFILES|PATHPING|PING|POWERCFG|PRINT|PRNCNFG|PRNMNGR|Query|RASDIAL|RASPHONE|RECOVER|REG|REGEDIT|REGSVR32|REGINI|RENAME|REPLACE|Reset|RESTORE|RMDIR|ROBOCOPY|ROUTE|RUNAS|RUNDLL32|SC|SCHTASKS|SetSPN|SETX|SFC|SHUTDOWN|SORT|SSH|SUBINACL|SUBST|SYSTEMINFO|TAKEOWN|TASKLIST|TASKKILL|TELNET|TIMEOUT|TRACERT|TREE|TSDISCON|TSKILL|TypePerf|TZUTIL|VSSADMIN|W32TM|WAITFOR|WBADMIN|WECUTIL|WEVTUTIL|WHERE|WHOAMI|WINRM|WINRS|WMIC|XCACLS|XCOPY)\>"
+
+# Variable names. (spaces not allowed)
+color brightred "%([[:alpha:]`~@#$*(){}:',.?+=_-]|\[|\])([[:alnum:]`~@#$*(){}:',.?+=_-]|\[|\])*%"
+color brightred "!([[:alnum:]`~@#$%*(){}:',.?+=_-]|\[|\])([[:alnum:]`~@#$%*(){}:',.?+=_-]|\[|\])*!"
+
+# Parameter names for arguments and loop.
+color brightred "%(~[[:alpha:]$]*)?[0-9*]\>" "%%(~[[:alpha:]$]*)?[[:alpha:]]\>"
+
+# Comments.
+icolor cyan "^[[:space:]]*(\<rem\>|::).*"
+
+# Strings.
+icolor brightyellow ""(\^.|[^"])*""
+
+# Trailling whitespace
+color ,green "[[:space:]]+$"

c.nanorc

@@ -3,7 +3,7 @@
 syntax "C" "\.(c(c|pp|xx)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$" "\.(def)$" "\.ino"
 magic "^(C|C\+\+) (source|program)"
 comment "//"
-color brightred "\<[A-Z_][0-9A-Z_]+\>" 
+color brightred "\<[A-Z_][0-9A-Z_]+\>"
 color green "\<(float|double|bool|char|wchar_t|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
 color green "\<((s?size)|(char(16|32))|((u_?)?int(_fast|_least)?(8|16|32|64))|u?int(max|ptr))_t\>"
 color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
@@ -21,7 +21,7 @@ color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\
 color green "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
 
 #Operator Color
-color yellow "[.:;,+*|=!\%]" "<" ">" "/" "-" "&" 
+color yellow "[.:;,+*|=!\%]" "<" ">" "/" "-" "&"
 
 #Parenthetical Color
 color magenta "[(){}]" "\[" "\]"
@@ -36,8 +36,11 @@ color cyan "<[^= 	]*>" ""(\\.|[^"])*""
 ## This string is VERY resource intensive!
 #color cyan start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
+## printf-family format specifiers
+color yellow "%(\#|(0-+))?(hh|h|l|ll|q|L|j|z|Z|t)?[A-Za-z]" "%%"
+
 ## Comment highlighting
-color brightblue "^\s*//.*"
+color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
 
 # Highlighting for documentation comments

html.nanorc

@@ -28,7 +28,7 @@ color yellow ""(\\.|[^"])*""
 color red "&#?[[:alnum:]]*;"
 
 ## Template strings (not in the HTML spec, but very commonly used)
-color magenta "\{[^\}]*\}"
+color magenta "\{[^\}]*\}\}?"
 color brightgreen "[[:space:]]((end)?if|(end)?for|in|not|(end)?block)[[:space:]]"
 
 ## Comments

ini.nanorc

@@ -6,6 +6,6 @@ color cyan "^[[:space:]]*[^=]*="
 color brightmagenta "^[[:space:]]*\[.*\]$"
 color red "[=;]"
 color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])(#([^{].*)?|;.*)$"
+color brightblue "(^|[[:space:]])(#([^{].*)?|;.*)$"
 color ,green "[[:space:]]+$"
 color ,red "	+ +| +	+"

java.nanorc

@@ -10,7 +10,7 @@ color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interfa
 color red ""[^"]*""
 color yellow "\<(true|false|null)\>"
 icolor yellow "\b(([1-9][0-9]+)|0+)\.[0-9]+\b" "\b[1-9][0-9]*\b" "\b0[0-7]*\b" "\b0x[1-9a-f][0-9a-f]*\b"
-color blue "^\s*//.*"
+color blue "//.*"
 color blue start="^\s*/\*" end="\*/"
 color brightblue start="/\*\*" end="\*/"
 

javascript.nanorc

@@ -1,4 +1,4 @@
-syntax "JavaScript" "\.js$"
+syntax "JavaScript" "\.(js|ts)$"
 comment "//"
 color blue   "\<[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\>"
 color blue   "\<[-+]?([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
@@ -17,7 +17,7 @@ color green     "\<(Number|Object|RegExp|String)\>"
 color red "[-+/*=<>!~%?:&|]"
 color magenta   "/[^*]([^/]|(\\/))*[^\\]/[gim]*"
 color magenta   "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
-color brightblack "(^|[[:space:]])//.*"
+color brightblack "//.*"
 color brightblack "/\*.+\*/"
 color brightwhite,cyan "TODO:?"
 color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'|(`|\})(\\.|[^`$]|$[^{])*(\$\{|`)"

kotlin.nanorc

@@ -8,7 +8,7 @@
 syntax "kotlin" "\.kt$" "\.kts$"
 color magenta "\b(([1-9][0-9]+)|0+)\.[0-9]+\b" "\b[1-9][0-9]*\b" "\b0[0-7]*\b" "\b0x[1-9a-f][0-9a-f]*\b"
 color yellow "[.:;,+*|=!\%@]" "<" ">" "/" "-" "&"
-color green "\<(namespace|as|type|class|this|super|val|var|fun|is|in|object|when|trait|import|where|by|get|set|abstract|enum|open|annotation|override|private|public|internal|protected|out|vararg|inline|final|package|lateinit|constructor|companion|const|suspend)\>"
+color green "\<(namespace|as|type|class|this|super|val|var|fun|is|in|object|when|trait|import|where|by|get|set|abstract|enum|open|annotation|override|private|public|internal|protected|out|vararg|inline|final|package|lateinit|constructor|companion|const|suspend|sealed)\>"
 color yellow "\<(true|false|null)\>"
 color cyan "\<(break|catch|continue|do|else|finally|for|if|return|throw|try|while|repeat)\>"
 color brightred "\<(inner|outer)\>"

php.nanorc

@@ -3,35 +3,52 @@ syntax "PHP" "\.php[2345s~]?$|\.module$"
 magic "PHP script"
 comment "//"
 color white start="<\?(php|=)?" end="\?>"
-# Functions
-color brightblue "([a-zA-Z0-9_-]*)\("
 # Constructs
 color brightblue "(class|extends|goto) ([a-zA-Z0-9_]*)"
-color green "[^a-z0-9_-]{1}(var|class|function|echo|case|break|default|exit|switch|if|else|elseif|endif|foreach|endforeach|@|while|public|private|protected|return|true|false|null|TRUE|FALSE|NULL|const|static|extends|as|array|require|include|require_once|include_once|define|do|continue|declare|goto|print|in|namespace|use)[^a-z0-9_-]{1}"
+color brightblue "[^a-z0-9_-]{1}(var|class|function|echo|case|break|default|exit|switch|if|else|elseif|endif|foreach|endforeach|@|while|public|private|protected|return|true|false|null|TRUE|FALSE|NULL|const|static|extends|as|array|require|include|require_once|include_once|define|do|continue|declare|goto|print|in|namespace|use)[^a-z0-9_-]{1}"
 color brightblue "[a-zA-Z0-9_]+:"
 # Variables
-color white "\$[a-zA-Z_0-9$]*|[=!<>]"
+color green "\$[a-zA-Z_0-9$]*|[=!<>]"
-color white "\->[a-zA-Z_0-9$]*|[=!<>]"
+color green "\->[a-zA-Z_0-9$]*|[=!<>]"
+# Functions
+color brightblue "([a-zA-Z0-9_-]*)\("
+# Special values
+color brightmagenta "[^a-z0-9_-]{1}(true|false|null|TRUE|FALSE|NULL)$"
+color brightmagenta "[^a-z0-9_-]{1}(true|false|null|TRUE|FALSE|NULL)[^a-z0-9_-]{1}"
 # Special Characters
 color yellow "[.,{}();]"
-color yellow "\["
+color cyan "\["
-color yellow "\]"
+color cyan "\]"
-color yellow "[=][^>]"
 # Numbers
 color magenta "[+-]*([0-9]\.)*[0-9]+([eE][+-]?([0-9]\.)*[0-9])*"
 color magenta "0x[0-9a-zA-Z]*"
 # Special Variables
 color brightblue "(\$this|parent::|self::|\$this->)"
+color magenta ";"
+# Comparison operators
+color yellow "(<|>)"
+# Assignment operator
+color brightblue "="
 # Bitwise Operations
-color magenta "(\;|\||\^){1}"
+color magenta "(&|\||\^)"
+color magenta "(<<|>>)"
+# Comparison operators
+color yellow "(==|===|!=|<>|!==|<=|>=|<=>)"
+# Logical Operators
+color yellow "( and | or | xor |!|&&|\|\|)"
 # And/Or/SRO/etc
-color green "(\;\;|\|\||::|=>|->)"
+color cyan "(\;\;|\|\||::|=>|->)"
-# Online Comments
+# Double quoted STRINGS!
-color brightyellow "(#.*|//.*)$"
+color red "(\"[^\"]*\")"
-# STRINGS!
+# Heredoc (typically ends with a semicolon).
-color red "('[^']*')|(\"[^\"]*\")"
+color red start="<<<['\"]?[A-Z][A-Z0-9_]*['\"]?" end="^[A-Z][A-Z0-9_]*;"
 # Inline Variables
 color white "\{\$[^}]*\}"
+# Single quoted string
+color red "('[^']*')"
+# Online Comments
+color brightyellow "^(#.*|//.*)$"
+color brightyellow "[	| ](#.*|//.*)$"
 # PHP Tags
 color red "(<\?(php)?|\?>)"
 # General HTML
@@ -40,3 +57,5 @@ color red start="\?>" end="<\?(php|=)?"
 color ,green "[[:space:]]+$"
 # multi-line comments
 color brightyellow start="/\*" end="\*/"
+# Nowdoc
+color red start="<<<'[A-Z][A-Z0-9_]*'" end="^[A-Z][A-Z0-9_]*;"

python.nanorc

@@ -12,11 +12,11 @@ color cyan "\<(None|self|True|False)\>"
 ## built-in attributes
 color cyan "\<(__builtin__|__dict__|__methods__|__members__|__class__|__bases__|__import__|__name__|__doc__|__self__|__debug__)\>"
 ## built-in functions
-color cyan "\<(abs|append|apply|buffer|callable|chr|clear|close|closed|cmp|coerce|compile|complex|conjugate|copy|count|delattr|dir|divmod|eval|execfile|exec|extend|fileno|filter|float|flush|get|getattr|globals|has_key|hasattr|hash|hex|id|index|input|insert|int|intern|isatty|isinstance|issubclass|items|keys|len|list|locals|long|map|max|min|mode|name|oct|open|ord|pop|pow|print|range|raw_input|read|readline|readlines|reduce|reload|remove|repr|reverse|round|seek|setattr|slice|softspace|sort|str|tell|truncate|tuple|type|unichr|unicode|update|values|vars|write|writelines|xrange|zip)\>"
+color cyan "\<(abs|append|apply|buffer|callable|chr|clear|close|closed|cmp|coerce|compile|complex|conjugate|copy|count|delattr|dir|divmod|eval|execfile|exec|extend|fileno|filter|float|flush|get|getattr|globals|has_key|hasattr|hash|hex|id|index|input|insert|int|intern|isatty|isinstance|issubclass|items|keys|len|list|locals|long|map|max|min|mode|name|oct|open|ord|pop|pow|print|range|raw_input|read|readline|readlines|reduce|reload|remove|repr|reverse|round|seek|setattr|slice|softspace|sort|str|tell|truncate|tuple|type|unichr|unicode|update|values|vars|write|writelines|xrange|zip|bool)\>"
 ## built-in functions that were previously keywords
 color brightblue "\<(print|exec)\>([[:space:]]|$)"
 ## special method names
-color cyan "\<(__abs__|__add__|__and__|__call__|__cmp__|__coerce__|__complex__|__concat__|__contains__|__del__|__delattr__|__delitem__|__delslice__|__div__|__divmod__|__float__|__getattr__|__getitem__|__getslice__|__hash__|__hex__|__init__|__int__|__inv__|__invert__|__len__|__long__|__lshift__|__mod__|__mul__|__neg__|__nonzero__|__oct__|__or__|__pos__|__pow__|__radd__|__rand__|__rcmp__|__rdiv__|__rdivmod__|__repeat__|__repr__|__rlshift__|__rmod__|__rmul__|__ror__|__rpow__|__rrshift__|__rshift__|__rsub__|__rxor__|__setattr__|__setitem__|__setslice__|__str__|__sub__|__xor__)\>"
+color cyan "\<(__abs__|__add__|__and__|__call__|__cmp__|__coerce__|__complex__|__concat__|__contains__|__del__|__delattr__|__delitem__|__delslice__|__div__|__divmod__|__float__|__getattr__|__getitem__|__getslice__|__hash__|__hex__|__init__|__int__|__inv__|__invert__|__len__|__long__|__lshift__|__mod__|__mul__|__neg__|__nonzero__|__oct__|__or__|__pos__|__pow__|__radd__|__rand__|__rcmp__|__rdiv__|__rdivmod__|__repeat__|__repr__|__rlshift__|__rmod__|__rmul__|__ror__|__rpow__|__rrshift__|__rshift__|__rsub__|__rxor__|__setattr__|__setitem__|__setslice__|__str__|__sub__|__xor__|__bool__)\>"
 ## exception classes
 color cyan "\<(Exception|StandardError|ArithmeticError|LookupError|EnvironmentError|AssertionError|AttributeError|EOFError|FloatingPointError|IOError|ImportError|IndexError|KeyError|KeyboardInterrupt|MemoryError|NameError|NotImplementedError|OSError|OverflowError|RuntimeError|SyntaxError|SystemError|SystemExit|TypeError|UnboundLocalError|UnicodeError|ValueError|WindowsError|ZeroDivisionError)\>"
 ## types

rego.nanorc

@@ -0,0 +1,22 @@
+# Syntax highlighting for Rego (https://www.openpolicyagent.org/)
+
+syntax "Rego" "\.rego"
+comment "#"
+
+## Reserved words
+color cyan "\<(as|default|else|import|package|not|some|with)\>"
+color brightblue "\<(false|null|true)\>"
+
+## Built-ins
+### Generated from `cat v0.25.2.json | jq -r .builtins[].name | tr '\n' '|'`
+color yellow "\<(abs|all|and|any|array.concat|array.slice|assign|base64.decode|base64.encode|base64.is_valid|base64url.decode|base64url.encode|base64url.encode_no_pad|bits.and|bits.lsh|bits.negate|bits.or|bits.rsh|bits.xor|cast_array|cast_boolean|cast_null|cast_object|cast_set|cast_string|concat|contains|count|crypto.md5|crypto.sha1|crypto.sha256|crypto.x509.parse_certificate_request|crypto.x509.parse_certificates|div|endswith|eq|equal|format_int|glob.match|glob.quote_meta|graph.reachable|gt|gte|hex.decode|hex.encode|http.send|indexof|intersection|io.jwt.decode|io.jwt.decode_verify|io.jwt.encode_sign|io.jwt.encode_sign_raw|io.jwt.verify_es256|io.jwt.verify_es384|io.jwt.verify_es512|io.jwt.verify_hs256|io.jwt.verify_hs384|io.jwt.verify_hs512|io.jwt.verify_ps256|io.jwt.verify_ps384|io.jwt.verify_ps512|io.jwt.verify_rs256|io.jwt.verify_rs384|io.jwt.verify_rs512|is_array|is_boolean|is_null|is_number|is_object|is_set|is_string|json.filter|json.is_valid|json.marshal|json.patch|json.remove|json.unmarshal|lower|lt|lte|max|min|minus|mul|neq|net.cidr_contains|net.cidr_contains_matches|net.cidr_expand|net.cidr_intersects|net.cidr_merge|net.cidr_overlap|numbers.range|object.filter|object.get|object.remove|object.union|opa.runtime|or|plus|product|re_match|regex.find_all_string_submatch_n|regex.find_n|regex.globs_match|regex.is_valid|regex.match|regex.split|regex.template_match|rego.parse_module|rem|replace|round|semver.compare|semver.is_valid|set_diff|sort|split|sprintf|startswith|strings.replace_n|substring|sum|time.add_date|time.clock|time.date|time.now_ns|time.parse_duration_ns|time.parse_ns|time.parse_rfc3339_ns|time.weekday|to_number|trace|trim|trim_left|trim_prefix|trim_right|trim_space|trim_suffix|type_name|union|units.parse_bytes|upper|urlquery.decode|urlquery.decode_object|urlquery.encode|urlquery.encode_object|uuid.rfc4122|walk|yaml.is_valid|yaml.marshal|yaml.unmarshal)\>"
+
+# Numbers
+color purple "\<([0-9]+)\>"
+
+# Strings
+color green ""(\\.|[^"])*""
+color green "`(\\.|[^\\`])*`"
+
+## Comments
+color brightblack "^\s*#.*"

sparql.nanorc

@@ -0,0 +1,49 @@
+## SPARQL 1.1 and SPARQL 1.1 UPDATE
+#
+syntax "SPARQL" ".*\.(rq|sparql)$"
+
+icolor brightcyan "\<(ADD|AS|ASK)\>"
+icolor brightcyan "\<(BIND|BY)\>"
+icolor brightcyan "\<(CLEAR|CONSTRUCT|CREATE)\>"
+icolor brightcyan "\<(DATA|DEFAULT|DELETE|DESCRIBE|DISTINCT|DROP)\>"
+icolor brightcyan "\<(FILTER|FROM)\>"
+icolor brightcyan "\<(GRAPH|GROUP)\>"
+icolor brightcyan "\<(HAVING)\>"
+icolor brightcyan "\<(INSERT)\>"
+icolor brightcyan "\<(LIMIT|LOAD)\>"
+icolor brightcyan "\<(MINUS|MOVE)\>"
+icolor brightcyan "\<(NAMED|NOT)\>"
+icolor brightcyan "\<(OFFSET|OPTIONAL|ORDER)\>"
+icolor brightcyan "\<(PREFIX)\>"
+icolor brightcyan "\<(REDUCED)\>"
+icolor brightcyan "\<(SELECT|SERVICE|SILENT)\>"
+icolor brightcyan "\<(TO)\>"
+icolor brightcyan "\<(UPDATE|USING)\>"
+icolor brightcyan "\<(VALUES)\>"
+icolor brightcyan "\<(WHERE|WITH)\>"
+
+# functions
+icolor brightmagenta "\<(ABS|AVG)\>"
+icolor brightmagenta "\<(BNODE|BOUND)\>"
+icolor brightmagenta "\<(CEIL|COALESCE|CONCAT|CONTAINS|COUNT)\>"
+icolor brightmagenta "\<(DATATYPE|DAY)\>"
+icolor brightmagenta "\<(ENCODE_FOR_URI|EXISTS)\>"
+icolor brightmagenta "\<(FLOOR)\>"
+icolor brightmagenta "\<(GROUP_CONCAT)\>"
+icolor brightmagenta "\<(HOURS)\>"
+icolor brightmagenta "\<(IF|IN|IRI|ISBLANK|ISIRI|ISLITERAL|ISNUMERIC)\>"
+icolor brightmagenta "\<(LANG|LANGMATCHES|LCASE)\>"
+icolor brightmagenta "\<(MAX|MD5|MIN|MINUTES|MONTH)\>"
+icolor brightmagenta "\<(NOW)\>"
+icolor brightmagenta "\<(RAND|REGEX|REPLACE|ROUND)\>"
+icolor brightmagenta "\<(SAMETERM|SECONDS|SHA1|SHA256|SHA384|SHA512|STR|STRAFTER|STRBEFORE|STRDT|STRLANG|STRLEN|STRSTARTS|STRUUID|SUBSTR|SUM)\>"
+icolor brightmagenta "\<(TIMEZONE|TZ)\>"
+icolor brightmagenta "\<(UCASE|UUID)\>"
+icolor brightmagenta "\<(YEAR)\>"
+
+# variables, IRI
+#
+icolor cyan "\?\w+"
+icolor brightgreen "<.+:[^ >]+>"
+icolor green " \w+:"
+

systemd.nanorc

@@ -1,12 +1,12 @@
-syntax "Systemd" "\.(service|socket)$"
+syntax "Systemd" "\.(service|socket|timer)$"
 header "^\[Unit\]$"
 
 color cyan  "^(Accept|After|Alias|AllowIsolate|Also|AmbientCapabilities|ANSI_COLOR|_AUDIT_LOGINUID|_AUDIT_SESSION|Backlog|Before|BindIPv6Only|BindsTo|BindToDevice|BlockIOReadBandwidth|BlockIOWeight|BlockIOWriteBandwidth|_BOOT_ID|Broadcast|BUG_REPORT_URL|BusName|Capabilities|CapabilityBoundingSet|CHASSIS|cipher|class|_CMDLINE|CODE_FILE|CODE_FUNC|CODE_LINE|_COMM|Compress|ConditionACPower|ConditionCapability|ConditionDirectoryNotEmpty|ConditionFileIsExecutable|ConditionFileNotEmpty|ConditionHost|ConditionKernelCommandLine|ConditionNull|ConditionPathExists|ConditionPathExistsGlob|ConditionPathIsDirectory|ConditionPathIsMountPoint|ConditionPathIsReadWrite|ConditionPathIsSymbolicLink|ConditionSecurity|ConditionVirtualization|Conflicts|ControlGroup|ControlGroupAttribute|ControlGroupModify|ControlGroupPersistent|controllers|Controllers|CPE_NAME|CPUAffinity|CPUSchedulingPolicy|CPUSchedulingPriority|CPUSchedulingResetOnFork|CPUShares|CrashChVT|CrashShell|__CURSOR|debug|DefaultControllers|DefaultDependencies|DefaultLimitAS|DefaultLimitCORE|DefaultLimitCPU|DefaultLimitDATA|DefaultLimitFSIZE|DefaultLimitLOCKS|DefaultLimitMEMLOCK|DefaultLimitMSGQUEUE|DefaultLimitNICE|DefaultLimitNOFILE|DefaultLimitNPROC|DefaultLimitRSS|DefaultLimitRTPRIO|DefaultLimitRTTIME|DefaultLimitSIGPENDING|DefaultLimitSTACK|DefaultStandardError|DefaultStandardOutput|Description|DeviceAllow|DeviceDeny|DirectoryMode|DirectoryNotEmpty|Documentation|DumpCore|entropy|Environment|EnvironmentFile|ERRNO|event_timeout|_EXE|ExecReload|ExecStart|ExecStartPost|ExecStartPre|ExecStop|ExecStopPost|ExecStopPre|filter|FONT|FONT_MAP|FONT_UNIMAP|ForwardToConsole|ForwardToKMsg|ForwardToSyslog|FreeBind|freq|FsckPassNo|fstab|_GID|Group|GuessMainPID|HandleHibernateKey|HandleLidSwitch|HandlePowerKey|HandleSuspendKey|hash|HibernateKeyIgnoreInhibited|HOME_URL|_HOSTNAME|ICON_NAME|ID|IdleAction|IdleActionSec|ID_LIKE|ID_MODEL|ID_MODEL_FROM_DATABASE|IgnoreOnIsolate|IgnoreOnSnapshot|IgnoreSIGPIPE|InaccessibleDirectories|InhibitDelayMaxSec|init|IOSchedulingClass|IOSchedulingPriority|IPTOS|IPTTL|JobTimeoutSec|JoinControllers|KeepAlive|KEYMAP|KEYMAP_TOGGLE|KillExcludeUsers|KillMode|KillOnlyUsers|KillSignal|KillUserProcesses|LidSwitchIgnoreInhibited|LimitAS|LimitCORE|LimitCPU|LimitDATA|LimitFSIZE|LimitLOCKS|LimitMEMLOCK|LimitMSGQUEUE|LimitNICE|LimitNOFILE|LimitNPROC|LimitRSS|LimitRTPRIO|LimitRTTIME|LimitSIGPENDING|LimitSTACK|link_priority|valueListenDatagram|ListenFIFO|ListenMessageQueue|ListenNetlink|ListenSequentialPacket|ListenSpecial|ListenStream|LogColor|LogLevel|LogLocation|LogTarget|luks|_MACHINE_ID|MakeDirectory|Mark|MaxConnections|MaxFileSec|MaxLevelConsole|MaxLevelKMsg|MaxLevelStore|MaxLevelSyslog|MaxRetentionSec|MemoryLimit|MemorySoftLimit|MESSAGE|MESSAGE_ID|MessageQueueMaxMessages|MessageQueueMessageSize|__MONOTONIC_TIMESTAMP|MountFlags|NAME|NAutoVTs|Nice|NonBlocking|NoNewPrivileges|NotifyAccess|OnActiveSec|OnBootSec|OnCalendar|OnFailure|OnFailureIsolate|OnStartupSec|OnUnitActiveSec|OnUnitInactiveSec|OOMScoreAdjust|Options|output|PAMName|PartOf|PassCredentials|PassSecurity|PathChanged|PathExists|PathExistsGlob|PathModified|PermissionsStartOnly|_PID|PIDFile|PipeSize|PowerKeyIgnoreInhibited|PRETTY_HOSTNAME|PRETTY_NAME|Priority|PRIORITY|PrivateDevices|PrivateNetwork|PrivateTmp|PropagatesReloadTo|ProtectControlGroups|ProtectHome|ProtectKernelModules|ProtectKernelTunables|ProtectSystem|pss|RateLimitBurst|RateLimitInterval|ReadOnlyDirectories|ReadWriteDirectories|__REALTIME_TIMESTAMP|ReceiveBuffer|RefuseManualStart|RefuseManualStop|rel|ReloadPropagatedFrom|RemainAfterExit|RestrictAddressFamilies|RestrictNamespaces|RestrictRealtime|RequiredBy|Requires|RequiresMountsFor|RequiresOverridable|Requisite|RequisiteOverridable|ReserveVT|ResetControllers|Restart|RestartPreventExitStatus|RestartSec|RootDirectory|RootDirectoryStartOnly|RuntimeKeepFree|RuntimeMaxFileSize|RuntimeMaxUse|RuntimeWatchdogSec|samples|scale_x|scale_y|Seal|SecureBits|_SELINUX_CONTEXT|SendBuffer|SendSIGKILL|Service|ShowStatus|ShutdownWatchdogSec|size|SmackLabel|SmackLabelIPIn|SmackLabelIPOut|SocketMode|Sockets|SourcePath|_SOURCE_REALTIME_TIMESTAMP|SplitMode|StandardError|StandardInput|StandardOutput|StartLimitAction|StartLimitBurst|StartLimitInterval|static_node|StopWhenUnneeded|Storage|string_escape|none|replaceSuccessExitStatus|SupplementaryGroups|SUPPORT_URL|SuspendKeyIgnoreInhibited|SyslogFacility|SYSLOG_FACILITY|SyslogIdentifier|SYSLOG_IDENTIFIER|SyslogLevel|SyslogLevelPrefix|SYSLOG_PID|SystemCallArchitectures|SystemCallFilter|SYSTEMD_ALIAS|_SYSTEMD_CGROUP|_SYSTEMD_OWNER_UID|SYSTEMD_READY|_SYSTEMD_SESSION|_SYSTEMD_UNIT|_SYSTEMD_USER_UNIT|SYSTEMD_WANTS|SystemKeepFree|SystemMaxFileSize|SystemMaxUse|SysVStartPriority|TCPCongestion|TCPWrapName|timeout|TimeoutSec|TimeoutStartSec|TimeoutStopSec|TimerSlackNSec|Transparent|_TRANSPORT|tries|TTYPath|TTYReset|TTYVHangup|TTYVTDisallocate|Type|_UID|UMask|Unit|User|UtmpIdentifier|VERSION|VERSION_ID|WantedBy|Wants|WatchdogSec|What|Where|WorkingDirectory)="
-color brightblue "^\.include\>"
+color green "^\.include\>"
 color red "="
 color brightmagenta  "^\[(Unit|Install|Service|Socket)\]"
 color brightyellow "\$MAINPID"
 color brightcyan "\<(true|false)\>"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
+color brightblue "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
 color ,red "	+ +| +	+"

ts.nanorc

@@ -4,7 +4,7 @@ header "^#!.*\/(env +)ts-node"
 ## Default
 color white "^.+$"
 
-## Decimal, cotal and hexadecimal numbers
+## Decimal, octal and hexadecimal numbers
 color yellow "\<[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\>"
 
 ## Floating point number with at least one digit before decimal point

yaml.nanorc

@@ -19,3 +19,6 @@ color brightwhite ":(\s|\t|$)"
 
 # Comments
 color brightblue "(^|[[:space:]])#.*$"
+
+# Trailing whitespace
+color ,red "[[:space:]]+$"

zig.nanorc

@@ -0,0 +1,9 @@
+syntax "Zig" "\.zig$$"
+color latte       "\<(align|allowzero|and|anyframe|anytype|asm|async|await|break|catch|comptime|const|continue|defer|else|enum|errdefer|error|export|extern|fn|for|if|inline|noalias|nosuspend|or|orelse|packed|pub|resume|return|linksection|struct|suspend|switch|test|threadlocal|try|union|unreachable|usingnamespace|var|volatile|while)\>"
+color brightcyan  "@[a-zA-Z]+[0-9]{0,2}"
+color cyan        "(true|false|null|undefined)"
+color cyan        "\<(0[xob])?([0-9]_?)+\>"
+color blue        "\<([iu][0-9]{1,5}|f16|f32|f64|f128)\>"
+color magenta     "\"[^"]*\""
+comment "//"
+tabgives "    "