Merge branch 'master' into dot-typescript-javascript

Author: galenguyer

Brewfile.nanorc

@@ -0,0 +1,28 @@
+# Brewfile.nanorc
+## Syntax highlighting for Homebrew Brewfiles
+## Author: tomkyle (https://github.com/tomkyle)
+
+syntax "Brewfile" "Brewfile$"
+
+## Keywords
+icolor red      "^(tap)[[:space:]]"
+icolor green    "^(brew)[[:space:]]"
+icolor blue     "^(cask)[[:space:]]"
+icolor brightblue "^(cask_args)[[:space:]]"
+icolor magenta  "^(mas)[[:space:]]"
+
+
+## Brackets & parenthesis
+color brightblack "(\(|\)|\[|\]|\{|\})"
+
+
+## Strings and quotes
+color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+color yellow "('|\")"
+
+
+## comments
+color brightblack "^#.*"
+color white       "^##.*"
+color cyan        "^###.*"
+

godot.nanorc

@@ -0,0 +1,39 @@
+## Syntax highlighting for Godot.
+
+syntax gdscript "\.gd$"
+header ""
+magic "Godot script"
+comment "#"
+
+# Function definitions.
+color brightblue "func [0-9A-Za-z_]+"
+# Keywords.
+color brightred "\<(and|as|assert|async|await|break|class|continue)\>"
+color brightred "\<(func|del|elif|else|except|finally|for|from)\>"
+color brightred "\<(global|if|import|in|is|lambda|nonlocal|not|or)\>"
+color brightred "\<(pass|raise|return|try|while|with|yield|extends)\>"
+
+color brightcyan "\<(inline|Input|Array|inline)\>"
+color brightcyan "\<(exec|print|call)\>"
+
+# Special values.
+color brightmagenta "\<(False|None|True)\>"
+
+# Mono-quoted strings.
+color brightyellow "'([^'\]|\\.)*'|"([^"\]|\\.)*"|'''|""""
+color normal "'''|""""
+# Comments.
+color brightred "(^|[[:blank:]])#.*"
+# variable
+color brightgreen "\<(var|export|export_category)\>"
+
+
+# Backslash escapes.
+color lime "\\($|[\'"abfnrtv]|[0-3]?[0-7]?[0-7]|x[[:xdigit:]]{2})"
+color lime "\\(N\{[[:alpha:]]+\}|u[[:xdigit:]]{4}|U[[:xdigit:]]{8})"
+
+# Reminders.
+color brightwhite,yellow "\<(FIXME|TODO|XXX)\>"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"

ini.nanorc

@@ -1,4 +1,4 @@
-syntax "INI" "\.(ini|desktop|lfl|override|cfg)$" "(mimeapps\.list|pinforc|setup\.cfg)$" "weechat/.+\.conf$"
+syntax "INI" "\.(ini|desktop|lfl|override|cfg|npmrc)$" "(mimeapps\.list|pinforc|setup\.cfg)$" "weechat/.+\.conf$"
 header "^\[[A-Za-z]+\]$"
 
 color brightcyan "\<(true|false)\>"

install.sh

@@ -18,8 +18,8 @@ _fetch_sources(){
 }
 
 _update_nanorc(){
-  touch ~/.nanorc
-      
+  touch $NANORC_FILE
+
   # add all includes from ~/.nano/nanorc if they're not already there
   while read -r inc; do
       if ! grep -q "$inc" "${NANORC_FILE}"; then
@@ -45,7 +45,7 @@ case "$1" in
 esac
 
 _fetch_sources;
-if [ $UPDATE_LITE ];
+if [ "$UPDATE_LITE" ];
 then
   _update_nanorc_lite
 else

javascript.nanorc

@@ -1,4 +1,5 @@
-syntax "JavaScript" "\.(js|ts|javascript|typescript)$"
+syntax "JavaScript" "\.(m?js|ts|javascript|typescript)$"
+
 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]?"

js.nanorc

@@ -1,4 +1,4 @@
-### all *js files  ( e.g. Firefox user.js, prefs.js )
+### all *js and *mjs files  ( e.g. Firefox user.js, prefs.js )
 
 ## Old version
 
@@ -12,7 +12,7 @@
 
 ## New updated taken from http://wiki.linuxhelp.net/index.php/Nano_Syntax_Highlighting
 
-syntax "JavaScript" "\.(js)$"
+syntax "JavaScript" "\.(m?js)$"
 header "^#!.*\/(env +)node"
 comment "//"
 

powershell.nanorc

@@ -24,10 +24,9 @@ icolor brightcyan "\<(class|enum|function|using|assembly|command|module|namespac
 ## Types
 icolor green "\<(string|char|byte|int|long|bool|decimal|single|double|DateTime|xml|array|hashtable|void)\>"
 
-# TODO: This logic seems a bit off... look into this
 ## Comments
 color cyan start="<#" end="#>"
-color cyan "(^|[[:space:]])#[^>].*$"
+color cyan "(^|[[:space:]])#[^>]([^#]|#[^>])*$"
 
 ## Quoted text
 color brightyellow "\"[^\"]*\""

v.nanorc

@@ -0,0 +1,42 @@
+# The syntax highlight for V
+
+# Author : HARXI
+# Version: 1.0.0
+# License: MIT
+
+syntax v "\.(v|c.v|.vsh|.vv)$"
+
+# Operators
+color brightred "(\+|-|\*|/|%|~|&|(\|)|^|!|<|>|:=|=|\?|\.)"
+
+# Keywords
+color bold,pink "\<(as|asm|assert|atomic|break|const|continue|defer|else|enum|false|fn|for|go|goto|if|import|in|interface|is|isreftype|lock|match|module|mut|none|or|pub|return|rlock|select|shared|sizeof|spawn|static|struct|true|type|typeof|union|unsafe|volatile|__global|__offsetof)\>"
+
+# Literals
+color rosy "\<([0-9]+|0[oO][0-7]+|0[xX][[:xdigit:]]+)\>"
+color rosy "\<[0-9]+\.[0-9]*([eE][+-]?[0-9]+)?\>"
+color rosy "\<[0-9]+[eE][+-]?[0-9]+\>"
+color rosy "\<[0-9]+\>"
+
+# Types
+color bold,pink "\<(bool|string|int|i(8|16|32|64|128)|u(8|16|32|64|128)|rune|f(32|64)|isize|usize|voidptr|any)\>"
+
+# Compile time
+color brightblue "\$([a-zA-Z._0-9])+"
+
+# Flags
+color brightblue "\#([a-zA-Z._0-9])+"
+
+# Upper case words
+color rosy "[A-Z][A-Za-z0-9_]+"
+
+# Compile time constants
+color pink "\@([a-zA-Z._0-9])+"
+
+# String and char
+color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
+color brightgreen "`([^`\]|\\.)*`"
+
+# Comments
+color brightblue start="/\*" end="\*/"
+color brightblue "(^|[[:blank:]])//.*"