Replace Kotlin language grammar (#4065)

.gitmodules

@@ -433,9 +433,6 @@
 [submodule "vendor/grammars/json.tmbundle"]
 	path = vendor/grammars/json.tmbundle
 	url = https://github.com/textmate/json.tmbundle
-[submodule "vendor/grammars/kotlin-sublime-package"]
-	path = vendor/grammars/kotlin-sublime-package
-	url = https://github.com/vkostyukov/kotlin-sublime-package
 [submodule "vendor/grammars/language-agc"]
 	path = vendor/grammars/language-agc
 	url = https://github.com/Alhadis/language-agc
@@ -520,6 +517,9 @@
 [submodule "vendor/grammars/language-jsoniq"]
 	path = vendor/grammars/language-jsoniq
 	url = https://github.com/wcandillon/language-jsoniq
+[submodule "vendor/grammars/language-kotlin"]
+	path = vendor/grammars/language-kotlin
+	url = https://github.com/nishtahir/language-kotlin
 [submodule "vendor/grammars/language-less"]
 	path = vendor/grammars/language-less
 	url = https://github.com/atom/language-less.git

grammars.yml

@@ -358,8 +358,6 @@ vendor/grammars/jflex.tmbundle:
 - source.jflex
 vendor/grammars/json.tmbundle:
 - source.json
-vendor/grammars/kotlin-sublime-package:
-- source.Kotlin
 vendor/grammars/language-agc:
 - source.agc
 vendor/grammars/language-apl:
@@ -442,6 +440,8 @@ vendor/grammars/language-jolie:
 vendor/grammars/language-jsoniq:
 - source.jq
 - source.xq
+vendor/grammars/language-kotlin:
+- source.kotlin
 vendor/grammars/language-less:
 - source.css.less
 vendor/grammars/language-maxscript:

lib/linguist/languages.yml

@@ -2268,7 +2268,7 @@ Kotlin:
   - ".kt"
   - ".ktm"
   - ".kts"
-  tm_scope: source.Kotlin
+  tm_scope: source.kotlin
   ace_mode: text
   codemirror_mode: clike
   codemirror_mime_type: text/x-kotlin

vendor/README.md

@@ -189,7 +189,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **KiCad Legacy Layout:** [Alhadis/language-pcb](https://github.com/Alhadis/language-pcb)
 - **KiCad Schematic:** [Alhadis/language-pcb](https://github.com/Alhadis/language-pcb)
 - **Kit:** [textmate/html.tmbundle](https://github.com/textmate/html.tmbundle)
-- **Kotlin:** [vkostyukov/kotlin-sublime-package](https://github.com/vkostyukov/kotlin-sublime-package)
+- **Kotlin:** [nishtahir/language-kotlin](https://github.com/nishtahir/language-kotlin)
 - **LabVIEW:** [textmate/xml.tmbundle](https://github.com/textmate/xml.tmbundle)
 - **Lasso:** [bfad/Sublime-Lasso](https://github.com/bfad/Sublime-Lasso)
 - **Latte:** [textmate/php-smarty.tmbundle](https://github.com/textmate/php-smarty.tmbundle)

vendor/licenses/grammar/language-kotlin.txt

@@ -1,9 +1,8 @@
 ---
 type: grammar
-name: kotlin-sublime-package
+name: language-kotlin
 license: apache-2.0
 ---
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -184,7 +183,7 @@ license: apache-2.0
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -192,7 +191,7 @@ license: apache-2.0
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2012-2014 Vladimir Kostyukov
+   Copyright 2018 Nish Tahir
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -205,3 +204,24 @@ license: apache-2.0
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+--------------------------------------------------------------------------------
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                     ==
+   ==  the Apache License, Version 2.0,                                   ==
+   =========================================================================
+
+This product includes software developed as part of: 
+Kotlin Sublime Text 2 Package (https://github.com/vkostyukov/kotlin-sublime-package).
+
+This product includes software developed as part of: 
+VSCode Kotlin project (https://github.com/mathiasfrohlich/vscode-kotlin).
+
+
+Copyright for portions of project `language-kotlin` are held by 
+
+1. Vladimir Kostyukov, 2017 as part of project `vkostyukov/kotlin-sublime-package`
+2. Mathias Frøhlich, 2018 as part of project `mathiasfrohlich/vscode-kotlin`
+
+All other copyright for project `language-kotlin` are held by Nish Tahir 2018.