Merge branch 'master' into master

syntax_files/README.md

@@ -1,34 +1,5 @@
-# Micro Syntax Highlighting Files v2.0
-These are the new and improved syntax highlighting files for micro. They no longer follow a format similar to nano.
-These files should be written in yaml, and can easily be converted from .nanorc or .micro to yaml.  
+# Syntax Files
 
-# Using with colorschemes
-
-Not all of these files have been converted to use micro's colorscheme feature. Most of them just hardcode the colors, which
-can be problematic depending on the colorscheme you use.
-
-Here is a list of the files that have been converted to properly use colorschemes:
-
-* vi
-* go
-* c
-* d
-* markdown
-* html
-* lua
-* swift
-* rust
-* java
-* javascript
-* pascal
-* python
-* ruby
-* sh
-* git
-* tex
-* solidity
-
-# License
-
-Because the nano syntax files I have modified are distributed under the GNU GPLv3 license, these files are also distributed
-under that license. See [LICENSE](LICENSE).
+Here are highlight's syntax files. If you would like to make a new syntax file, you should first check it
+with the `syntax_checker.go` program. Just place it in this directory and run the program (`go run syntax_checker.go`)
+and it will let you know if there are issues with any of the files in the directory.

syntax_files/c.yaml

@@ -1,7 +1,7 @@
 filetype: c
 
 detect:
-    filename: "\\.(c|C)$"
+    filename: "(\\.(c|C)$|\\.(h|H)$|\\.ii?$|\\.(def)$)"
 
 rules:
     - identifier: "\\b[A-Z_][0-9A-Z_]+\\b" 

syntax_files/yaml.yaml

@@ -0,0 +1,32 @@
+filetype: yaml
+
+detect:
+    filename: "\\.ya?ml$"
+    header: "%YAML"
+
+rules:
+    - type: "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) "
+    - constant:  "\\b(YES|yes|Y|y|ON|on|NO|no|N|n|OFF|off)\\b"
+    - constant: "\\b(true|false)\\b"
+    - statement: "(:[[:space:]]|\\[|\\]|:[[:space:]]+[|>]|^[[:space:]]*- )"
+    - identifier: "[[:space:]][\\*&][A-Za-z0-9]+"
+    - type: "([-\\w]+:\\s+)|([-\\w]+:$)"
+    - special:  "(^---|^\\.\\.\\.|^%YAML|^%TAG)"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+