KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace Kotlin language grammar (#4065)

Browse Source
This commit is contained in:
Nish Tahir
2018-03-28 11:57:17 -04:00
committed by Colin Seymour
parent 03f394626d
commit ba1cf12776
7 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/README.md vendored
View File

@@ -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)

1
vendor/grammars/kotlin-sublime-package vendored

Submodule vendor/grammars/kotlin-sublime-package deleted from 4612f71e74

1
vendor/grammars/language-kotlin vendored Submodule

Submodule vendor/grammars/language-kotlin added at 0dc5185fc8

28
vendor/licenses/grammar/kotlin-sublime-package.txt → vendor/licenses/grammar/language-kotlin.txt vendored
View File

@@ -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.