From 610b3ef3c3972ca905f811aec7df03d702de167f Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Tue, 6 Feb 2018 10:17:40 -0800
Subject: [PATCH] Use Vetur for Vue grammar. Fix #4011

---
 .gitmodules                                          |  6 +++---
 grammars.yml                                         |  5 +++--
 lib/linguist/languages.yml                           | 12 +++++++++---
 vendor/README.md                                     |  3 ++-
 vendor/grammars/vetur                                |  1 +
 vendor/grammars/vue-syntax-highlight                 |  1 -
 .../grammar/{vue-syntax-highlight.txt => vetur.txt}  |  0
 7 files changed, 18 insertions(+), 10 deletions(-)
 create mode 160000 vendor/grammars/vetur
 delete mode 160000 vendor/grammars/vue-syntax-highlight
 rename vendor/licenses/grammar/{vue-syntax-highlight.txt => vetur.txt} (100%)

diff --git a/.gitmodules b/.gitmodules
index b7211d57d1..7aabf44082 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -541,9 +541,6 @@
 [submodule "vendor/grammars/atom-language-purescript"]
 	path = vendor/grammars/atom-language-purescript
 	url = https://github.com/purescript-contrib/atom-language-purescript
-[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
@@ -898,3 +895,6 @@
 [submodule "vendor/grammars/atom-language-nextflow"]
 	path = vendor/grammars/atom-language-nextflow
 	url = https://github.com/nextflow-io/atom-language-nextflow
+[submodule "vendor/grammars/vetur"]
+	path = vendor/grammars/vetur
+	url = https://github.com/vuejs/vetur
diff --git a/grammars.yml b/grammars.yml
index d38eeee886..c9f0f4682f 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -726,10 +726,11 @@ vendor/grammars/turtle.tmbundle:
 - source.turtle
 vendor/grammars/verilog.tmbundle:
 - source.verilog
+vendor/grammars/vetur:
+- source.vue
+- text.html.vue-html
 vendor/grammars/vhdl:
 - source.vhdl
-vendor/grammars/vue-syntax-highlight:
-- text.html.vue
 vendor/grammars/wdl-sublime-syntax-highlighter:
 - source.wdl
 vendor/grammars/xc.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 24796ac44f..560f35c856 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2906,7 +2906,7 @@ Nextflow:
   extensions:
   - ".nf"
   filenames:
-  - "nextflow.config"  
+  - nextflow.config
   interpreters:
   - nextflow
   language_id: 506780613
@@ -4188,7 +4188,7 @@ Scala:
   color: "#c22d40"
   extensions:
   - ".scala"
-  - ".kojo"  
+  - ".kojo"
   - ".sbt"
   - ".sc"
   interpreters:
@@ -4860,9 +4860,15 @@ Vue:
   color: "#2c3e50"
   extensions:
   - ".vue"
-  tm_scope: text.html.vue
+  tm_scope: source.vue
   ace_mode: html
   language_id: 391
+Vue Template:
+  type: markup
+  color: "#2c3e50"
+  tm_scope: text.html.vue-html
+  ace_mode: html
+  language_id: 8536085
 Wavefront Material:
   type: data
   extensions:
diff --git a/vendor/README.md b/vendor/README.md
index b5b7401aaa..8e45e17b7e 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -385,7 +385,8 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Vim script:** [Alhadis/language-viml](https://github.com/Alhadis/language-viml)
 - **Visual Basic:** [angryant0007/VBDotNetSyntax](https://github.com/angryant0007/VBDotNetSyntax)
 - **Volt:** [textmate/d.tmbundle](https://github.com/textmate/d.tmbundle)
-- **Vue:** [vuejs/vue-syntax-highlight](https://github.com/vuejs/vue-syntax-highlight)
+- **Vue:** [vuejs/vetur](https://github.com/vuejs/vetur)
+- **Vue Template:** [vuejs/vetur](https://github.com/vuejs/vetur)
 - **Wavefront Material:** [Alhadis/language-wavefront](https://github.com/Alhadis/language-wavefront)
 - **Wavefront Object:** [Alhadis/language-wavefront](https://github.com/Alhadis/language-wavefront)
 - **wdl:** [broadinstitute/wdl-sublime-syntax-highlighter](https://github.com/broadinstitute/wdl-sublime-syntax-highlighter)
diff --git a/vendor/grammars/vetur b/vendor/grammars/vetur
new file mode 160000
index 0000000000..f209686ad1
--- /dev/null
+++ b/vendor/grammars/vetur
@@ -0,0 +1 @@
+Subproject commit f209686ad143c61ca35d14766247b10cee4db6d5
diff --git a/vendor/grammars/vue-syntax-highlight b/vendor/grammars/vue-syntax-highlight
deleted file mode 160000
index 5c2b5afbb3..0000000000
--- a/vendor/grammars/vue-syntax-highlight
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5c2b5afbb3e71c87aca1eda626edbb4506571072
diff --git a/vendor/licenses/grammar/vue-syntax-highlight.txt b/vendor/licenses/grammar/vetur.txt
similarity index 100%
rename from vendor/licenses/grammar/vue-syntax-highlight.txt
rename to vendor/licenses/grammar/vetur.txt