Bef pull

5 files changed, 66 insertions, 8 deletions

diff --git a/aptsrclist.nanorc b/aptsrclist.nanorc
index 379cb36..406b49d 100644
--- a/aptsrclist.nanorc
+++ b/aptsrclist.nanorc
@@ -1,12 +1,12 @@
 syntax "apt/sources.list" "sources\.list(\.old|~)?$"
 ## Component
-color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/) [^ ]+ .+$"
+color brightmagenta "^deb(-src)? ((https?|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/) [^ ]+ .+$"
 
 ## Distribution
-color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/) [^ ]+"
+color brightred "^deb(-src)? ((https?|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/) [^ ]+"
 
 ## URI
-color brightgreen "(http|file|ftp):/[^ ]+"
+color brightgreen "(https?|file|ftp):/[^ ]+"
 
 ## CD-ROMs
 # FIXME: [^\]] does not work.
diff --git a/editorconfig.nanorc b/editorconfig.nanorc
new file mode 100644
index 0000000..c475df3
--- /dev/null
+++ b/editorconfig.nanorc
@@ -0,0 +1,16 @@
+syntax "editorconfig" "/\.editorconfig(\.old|\.bak|~)?$"
+
+## Values
+color brightred "=.*$"
+
+## Equal sign
+color yellow "="
+
+## Sections
+color brightgreen "^\s*\[.*\]"
+
+## Keys
+color cyan "^\s*[a-zA-Z0-9_\.]+"
+
+## Comments
+color brightblack ";.*$"
diff --git a/gen-nanorc.sh b/gen-nanorc.sh
new file mode 100644
index 0000000..84b1cc7
--- /dev/null
+++ b/gen-nanorc.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+## Generating correct `.nanorc` file.
+## You should to set right path starts from $HOME, ends with slash.
+## Also it needs blank (or not) ~/.nanorc file
+
+nano_highlight_path="$HOME/nano-highlight/"
+nanorc_path="$HOME/"
+
+if [[ ! -e "$nanorc_path".nanorc ]]; then
+    echo "You don't have .nanorc file."
+    echo -n "Do you wish to create it in '$nanorc_path' folder? (Y/n) "
+    read use_home
+    if echo "$use_home" | grep -iq "^[Nn]"; then
+        while [[ ! -n "$path" || ! -d "$path" ]]; do
+            echo -n "Please set the valid path. '$path' is not valid path. "
+            read path
+        done
+        nanorc_path=$path
+    fi
+    touch "$nanorc_path".nanorc
+    echo "'$nanorc_path.nanorc' file created."
+fi
+
+if [[ ! -d $nano_highlight_path ]]; then
+    while [[ ! -n "$folder" || ! -d "$HOME/$folder" ]]; do
+        echo "'$nano_highlight_path' is not a valid folder."
+        echo -n "Please set your nano-highlight path. $HOME/"
+        read folder
+    done
+    nano_highlight_path="$HOME/$folder/"
+fi
+
+> "$nanorc_path".nanorc
+for syntax in $(ls $nano_highlight_path*.nanorc); do
+    echo "include \"$syntax\"" >> "$nanorc_path".nanorc
+done
diff --git a/js.nanorc b/js.nanorc
index 08460de..879672e 100644
--- a/js.nanorc
+++ b/js.nanorc
@@ -11,9 +11,14 @@ color yellow "\<[-+]?([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
 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 "\<(abstract|await|boolean|break|byte|case|catch|char)\>"
+color green "\<(class|const|continue|debugger|default|delete|double)\>"
+color green "\<(do|else|enum|export|extends|finally|final|float|for)\>"
+color green "\<(function|goto|if|implements|import|instanceof|interface)\>"
+color green "\<(int|in|let|long|native|new|package|private|protected)\>"
+color green "\<(public|return|short|static|super|switch|synchronized)\>"
+color green "\<(this|throws|throw|transient|try|typeof|var|void)\>"
+color green "\<(volatile|while|with|yield)\>"
 
 ## Type specifiers
 color red "\<(Array|Boolean|Date|Enumerator|Error|Function|Math)\>"
@@ -24,7 +29,7 @@ color red "\<(true|false)\>"
 color brightyellow "L?\"(\\"|[^"])*\""
 color brightyellow "L?'(\'|[^'])*'"
 color brightcyan "L?`(\`|[^`])*`"
-color ,magenta "\$\{(.+)\}"
+color brightwhite,blue start="\$\{" end="\}"
 
 ## Escapes
 color red "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
@@ -32,3 +37,4 @@ color red "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
 ## Comments
 color magenta start="/\*" end="\*/"
 color magenta "//.*$"
+
diff --git a/xml.nanorc b/xml.nanorc
index 20c3ef0..0809717 100644
--- a/xml.nanorc
+++ b/xml.nanorc
@@ -1,4 +1,4 @@
-syntax "ml" ".*\.([jrs]?html?|xml|sgml?|lhtml|opml|kdevelop|vcproj|glade|xsd|plist|gcs|dtd|dcl)$" "catalog$" "docbook$"
+syntax "ml" ".*\.([jrs]?html?|xml|sgml?|lhtml|opml|kdevelop|vcproj|glade|xsd|plist|gcs|dtd|dcl|tmLanguage)$" "catalog$" "docbook$"
 color white "^.+$"
 color green  start="<" end=">"
 color cyan   "<[^> ]+"