Merge pull request #2554 from github/mcandre-master

DNS Zone files

.gitmodules

@@ -668,3 +668,6 @@
 [submodule "vendor/grammars/vue-syntax-highlight"]
 	path = vendor/grammars/vue-syntax-highlight
 	url = https://github.com/vuejs/vue-syntax-highlight
+[submodule "vendor/grammars/st2-zonefile"]
+	path = vendor/grammars/st2-zonefile
+	url = https://github.com/sixty4k/st2-zonefile

grammars.yml

@@ -470,6 +470,8 @@ vendor/grammars/smalltalk-tmbundle:
 - source.smalltalk
 vendor/grammars/sql.tmbundle:
 - source.sql
+vendor/grammars/st2-zonefile:
+- text.zone_file
 vendor/grammars/standard-ml.tmbundle:
 - source.cm
 - source.ml

lib/linguist/languages.yml

@@ -750,6 +750,13 @@ DM:
   tm_scope: source.c++
   ace_mode: c_cpp
 
+DNS Zone:
+  type: data
+  extensions:
+  - .zone
+  tm_scope: text.zone_file
+  ace_mode: text
+
 DTrace:
   type: programming
   aliases:

samples/DNS Zone/sneaky.net.zone

@@ -0,0 +1,12 @@
+$TTL 3d
+@ IN SOA root.localhost. root.sneaky.net. (
+    2015042907 ; serial
+    3d         ; refresh
+    1h         ; retry
+    12d        ; expire
+    2h         ; negative response TTL
+  )
+  IN NS root.localhost.
+  IN NS localhost. ; secondary name server is preferably externally maintained
+
+www IN A 3.141.59.26