Update Scala syntax grammar (#4044)

* Add vscode-scala

* Use vscode-scala template for scala sources

* Add grammar licence for vscode-scala

* Fix vendor in README

* Sort vendors in grammars.yml

* Fix license file name

.gitmodules

@@ -148,6 +148,9 @@
 [submodule "vendor/grammars/opa.tmbundle"]
 	path = vendor/grammars/opa.tmbundle
 	url = https://github.com/mads379/opa.tmbundle
+[submodule "vendor/grammars/vscode-scala-syntax"]
+	path = vendor/grammars/vscode-scala-syntax
+	url = https://github.com/scala/vscode-scala-syntax
 [submodule "vendor/grammars/scala.tmbundle"]
 	path = vendor/grammars/scala.tmbundle
 	url = https://github.com/mads379/scala.tmbundle

grammars.yml

@@ -622,7 +622,6 @@ vendor/grammars/sass-textmate-bundle:
 - source.sass
 vendor/grammars/scala.tmbundle:
 - source.sbt
-- source.scala
 vendor/grammars/scheme.tmbundle:
 - source.scheme
 vendor/grammars/scilab.tmbundle:
@@ -729,6 +728,8 @@ vendor/grammars/verilog.tmbundle:
 - source.verilog
 vendor/grammars/vhdl:
 - source.vhdl
+vendor/grammars/vscode-scala-syntax:
+- source.scala
 vendor/grammars/vue-syntax-highlight:
 - text.html.vue
 vendor/grammars/wdl-sublime-syntax-highlighter:

vendor/README.md

@@ -323,7 +323,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **SaltStack:** [saltstack/atom-salt](https://github.com/saltstack/atom-salt)
 - **SAS:** [rpardee/sas.tmbundle](https://github.com/rpardee/sas.tmbundle)
 - **Sass:** [nathos/sass-textmate-bundle](https://github.com/nathos/sass-textmate-bundle)
-- **Scala:** [mads379/scala.tmbundle](https://github.com/mads379/scala.tmbundle)
+- **Scala:** [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax)
 - **Scaml:** [scalate/Scalate.tmbundle](https://github.com/scalate/Scalate.tmbundle)
 - **Scheme:** [textmate/scheme.tmbundle](https://github.com/textmate/scheme.tmbundle)
 - **Scilab:** [textmate/scilab.tmbundle](https://github.com/textmate/scilab.tmbundle)

vendor/licenses/grammar/vscode-scala-syntax.txt

@@ -0,0 +1,26 @@
+---
+type: grammar
+name: vscode-scala-syntax
+license: mit
+---
+MIT License
+
+Copyright (c)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.