Merge branch 'scopatz:master' into master

.authors.yml

@@ -252,9 +252,11 @@
   github: hawk93
 - name: Harsh Shandilya
   email: [email protected]
-  num_commits: 10
+  num_commits: 13
   first_commit: 2019-09-19 15:52:44
   github: msfjarvis
+  alternate_emails:
+  - [email protected]
 - name: DesertPunk
   email: [email protected]
   num_commits: 2
@@ -335,7 +337,7 @@
   github: TJProgrammer
 - name: Anthony Scopatz
   email: [email protected]
-  num_commits: 50
+  num_commits: 52
   first_commit: 2010-07-28 18:15:43
   github: astronautlevel
 - name: PhilipRoman
@@ -556,16 +558,16 @@
   email: [email protected]
   alternate_emails:
   - [email protected]
-  num_commits: 6
+  num_commits: 10
   first_commit: 2019-12-18 09:34:49
   github: earboxer
 - name: Gareth Jones
   email: [email protected]
-  num_commits: 3
+  num_commits: 11
   first_commit: 2019-11-01 23:57:35
 - name: Dante Falzone
   email: [email protected]
-  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: [email protected]
+  num_commits: 4
+  first_commit: 2020-04-26 23:09:25
+  github: hdquemada
+- name: Oïleurre
+  email: [email protected]
+  num_commits: 2
+  first_commit: 2020-06-07 07:20:21
+  github: oileurre
+- name: Joerg Stoever
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-08-14 06:04:10
+  github: Gaibhne
+- name: emidiostani
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-02-05 05:48:21
+  github: EmidioStani
+- name: Justin P
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-01-30 23:28:08
+  github: jpartain89
+- name: Yvan Satyawan
+  email: [email protected]
+  num_commits: 2
+  first_commit: 2020-03-16 08:40:58
+  github: yvan674
+- name: Paulo S. Costa
+  email: [email protected]
+  num_commits: 2
+  first_commit: 2020-01-27 17:18:02
+  github: pscosta5
+- name: czechuuu
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-08-26 12:13:33
+  github: czechuuu
+- name: msuska
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-03-21 10:18:26
+  github: Betlista
+- name: davidhcefx
+  email: [email protected]
+  num_commits: 3
+  first_commit: 2020-08-30 21:21:54
+  github: davidhcefx
+- name: Mlendea, Horațiu
+  email: [email protected]
+  num_commits: 2
+  first_commit: 2020-02-09 03:50:20
+  github: hmlendea
+- name: Exonorid
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-10-02 02:46:00
+  github: Exonorid
+- name: yzzyx
+  email: [email protected]
+  alternate_emails:
+  - [email protected]
+  num_commits: 3
+  first_commit: 2020-04-24 09:22:09
+- name: Aiden Gall
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-03-14 18:09:11
+  github: Wasby
+- name: Rashil Gandhi
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-08-10 08:12:56
+  github: rashil2000
+- name: Ryan Westlund
+  email: [email protected]
+  num_commits: 2
+  first_commit: 2020-04-08 08:16:57
+  github: yujiri8
+- name: Serhiy Zahoriya
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-10-08 10:43:13
+- name: Bart Hanssens
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2020-10-07 11:30:35
+  github: Fedict

.mailmap

@@ -12,13 +12,15 @@
 Anthony Scopatz <[email protected]>
 Elof <[email protected]>
 Simon Volpert <[email protected]>
+Harsh Shandilya <[email protected]> Harsh Shandilya <[email protected]>
 Andrea Dejan Grande <[email protected]>
 Alex Taber <[email protected]>
-Harsh Shandilya <[email protected]>
+Gareth Jones <[email protected]>
+Zach DeCook <[email protected]> Zach DeCook <[email protected]>
 Mariusz Smykuła <[email protected]>
+Dante Falzone <[email protected]>
 Michael Straube <[email protected]> Michael Straube <[email protected]>
 CoffeeTableEnnui <[email protected]>
-Zach DeCook <[email protected]> Zach DeCook <[email protected]>
 Daniel Kaplun <[email protected]>
 Philipp <[email protected]>
 Tiago Almeida <[email protected]>
@@ -27,6 +29,7 @@ nl6720 <[email protected]>
 Thomas Rosenau <[email protected]> ThomasR <[email protected]>
 Matthew Cox <[email protected]>
 Ritiek Malhotra <[email protected]>
+hdquemada <[email protected]>
 Birger Jarl <[email protected]>
 divinity76 <[email protected]>
 CirKu17 <[email protected]> CirKu17 <[email protected]>
@@ -37,7 +40,8 @@ Huub de Beer <[email protected]>
 Mikael O. Bonnier <[email protected]>
 Jeppe Fihl-Pearson <[email protected]>
 Ondřej Ešler <[email protected]>
-Gareth Jones <[email protected]>
+davidhcefx <[email protected]>
+yzzyx <[email protected]> yzzyx <[email protected]>
 Dan Kaplun <[email protected]>
 Aryan Ebrahimpour <[email protected]>
 Paduct <[email protected]> Bro <[email protected]>
@@ -56,8 +60,12 @@ Bryan Ross <[email protected]>
 Nicholas Christopoulos <[email protected]>
 Sina <[email protected]>
 Ross Smith II <[email protected]>
-Dante Falzone <[email protected]>
 Hunter Peavey <[email protected]>
+Oïleurre <[email protected]>
+Yvan Satyawan <[email protected]>
+Paulo S. Costa <[email protected]>
+Mlendea, Horațiu <[email protected]>
+Ryan Westlund <[email protected]>
 Dan Pasanen <[email protected]>
 Marcus Willock <[email protected]> Crazcalm <[email protected]>
 Dario Ostuni <[email protected]>
@@ -124,3 +132,13 @@ John S Long <[email protected]>
 Ghost-NULL <[email protected]>
 PN Wu (小平) <[email protected]>
 CryptoDragonLady <[email protected]>
+Joerg Stoever <[email protected]>
+emidiostani <[email protected]>
+Justin P <[email protected]>
+czechuuu <[email protected]>
+msuska <[email protected]>
+Exonorid <[email protected]>
+Aiden Gall <[email protected]>
+Rashil Gandhi <[email protected]>
+Serhiy Zahoriya <[email protected]>
+Bart Hanssens <[email protected]>

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)\>"