Skip to content

Commit 38e02fc

Browse files
Version 1.3.0
1 parent 8ee04f9 commit 38e02fc

File tree

8 files changed

+254
-22
lines changed

8 files changed

+254
-22
lines changed

.vscodeignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.vscode/*
2+
hello.kt
3+
*.vsix

Kotlin-1.2.0.vsix

14.2 KB
Binary file not shown.

README.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Syntax highlighter for Kotlin language
1818
## Sourc7
1919

2020
[Github](https://github.com/mathiasfrohlich/vscode-kotlin)
21-
21+
2222
## Change Log
2323

2424
### Version 0.0.1
@@ -37,13 +37,21 @@ This version happened thanks to a community contribution.
3737
Thanks to https://github.com/Jonatino
3838
* Added const and typealias syntax highlighting
3939

40+
### Version 1.3.0
41+
This version happened thanks to a community contribution.
42+
Thanks to https://github.com/sommd, http://github.com/vkostyukov
43+
* Update Kotlin language file to the latest one from https://github.com/vkostyukov/kotlin-sublime-package
44+
* Add highlighting for `companion`, `interface`, `dynamic`, `===`, `!===`, `+=`, `-=`, `*=`, `/=` and `..`
45+
* Remove highlighting for `trait`, `then` and `<>`
46+
* Remove `.jetl` and `.jet` file extensions
47+
4048
## Credits
4149

4250
* [Visual Studio Code](https://code.visualstudio.com/)
4351
* [vscode-docs on GitHub](https://github.com/Microsoft/vscode-docs)
4452
* [Kotlin.org](https://kotlinlang.org/)
4553
* [Sublime Text - Kotlin Package](https://github.com/vkostyukov/kotlin-sublime-package)
46-
54+
4755
## License
4856

49-
[Apache License](https://raw.githubusercontent.com/mathiasfrohlich/vscode-kotlin/master/LICENSE)
57+
[Apache License](https://raw.githubusercontent.com/mathiasfrohlich/vscode-kotlin/master/LICENSE)

hello.kt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
package hello
22

3+
interface IGreeter {
4+
fun greet()
5+
}
6+
7+
open class Greeter: IGreeter {
8+
companion object {
9+
private const val GREETING = "Hello, World!"
10+
}
11+
12+
override fun greet() {
13+
println(GREETING)
14+
}
15+
}
16+
317
fun main(args: Array<String>) {
4-
println("Hello World!")
18+
Greeter().greet()
519
}

kotlin.configuration.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"brackets": [
1010
["{", "}"],
1111
["[", "]"],
12-
["(", ")"]
12+
["(", ")"],
13+
["<", ">"]
1314
]
1415
}

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@
2424
"Kotlin",
2525
"kotlin",
2626
"kt",
27-
"jetl",
28-
"jet"
27+
"kts"
2928
],
3029
"contributes": {
3130
"languages": [{
3231
"id": "kotlin",
3332
"aliases": ["Kotlin", "kotlin"],
34-
"extensions": [".kt",".jetl",".jet"],
33+
"extensions": [".kt",".kts"],
3534
"configuration": "./kotlin.configuration.json"
3635
}],
3736
"grammars": [{

syntaxes/Kotlin.tmLanguage

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
<key>fileTypes</key>
66
<array>
77
<string>kt</string>
8-
<string>jetl</string>
9-
<string>jet</string>
8+
<string>kts</string>
109
</array>
1110
<key>name</key>
1211
<string>Kotlin</string>
@@ -47,14 +46,14 @@
4746
<key>classes</key>
4847
<dict>
4948
<key>begin</key>
50-
<string>(?=\s*(?:class|object|trait))</string>
49+
<string>(?=\s*(?:companion|class|object|interface))</string>
5150
<key>end</key>
5251
<string>}|(?=$)</string>
5352
<key>patterns</key>
5453
<array>
5554
<dict>
5655
<key>begin</key>
57-
<string>\b(class|object|trait)\b</string>
56+
<string>\b(class|(companion\s*)?object|interface)\b</string>
5857
<key>beginCaptures</key>
5958
<dict>
6059
<key>1</key>
@@ -567,7 +566,7 @@
567566
<array>
568567
<dict>
569568
<key>match</key>
570-
<string>\b(const|typealias|var|val|public|private|protected|abstract|final|enum|open|attribute|annotation|override|inline|var|val|vararg|lazy|in|out|ref|internal|data|lateinit|dynamic)\b</string>
569+
<string>\b(var|val|public|private|protected|abstract|final|enum|open|attribute|annotation|override|inline|var|val|vararg|lazy|in|out|internal|data|tailrec|operator|infix|const|yield|typealias|typeof)\b</string>
571570
<key>name</key>
572571
<string>storage.modifier.kotlin</string>
573572
</dict>
@@ -579,7 +578,7 @@
579578
</dict>
580579
<dict>
581580
<key>match</key>
582-
<string>\b(if|then|else|while|for|do|return|when|where|break|continue)\b</string>
581+
<string>\b(if|else|while|for|do|return|when|where|break|continue)\b</string>
583582
<key>name</key>
584583
<string>keyword.control.kotlin</string>
585584
</dict>
@@ -591,7 +590,7 @@
591590
</dict>
592591
<dict>
593592
<key>match</key>
594-
<string>(==|!=|&lt;=|&gt;=|&lt;&gt;|&lt;|&gt;)</string>
593+
<string>(==|!=|===|!==|&lt;=|&gt;=|&lt;|&gt;)</string>
595594
<key>name</key>
596595
<string>keyword.operator.comparison.kotlin</string>
597596
</dict>
@@ -625,18 +624,24 @@
625624
<key>name</key>
626625
<string>keyword.operator.arithmetic.kotlin</string>
627626
</dict>
627+
<dict>
628+
<key>match</key>
629+
<string>(\+=|\-=|\*=|\/=)</string>
630+
<key>name</key>
631+
<string>keyword.operator.arithmetic.assign.kotlin</string>
632+
</dict>
628633
<dict>
629634
<key>match</key>
630635
<string>(!|&amp;&amp;|\|\|)</string>
631636
<key>name</key>
632637
<string>keyword.operator.logical.kotlin</string>
633638
</dict>
634-
<dict>
635-
<key>match</key>
636-
<string>(#)</string>
637-
<key>name</key>
638-
<string>keyword.operator.tuple.kotlin</string>
639-
</dict>
639+
<dict>
640+
<key>match</key>
641+
<string>(\.\.)</string>
642+
<key>name</key>
643+
<string>keyword.operator.range.kotlin</string>
644+
</dict>
640645
<dict>
641646
<key>match</key>
642647
<string>(;)</string>
@@ -942,7 +947,7 @@
942947
<array>
943948
<dict>
944949
<key>match</key>
945-
<string>\b(Any|Unit|String|Int|Boolean|Char|Long|Double|Float|Short|Byte)\b</string>
950+
<string>\b(Any|Unit|String|Int|Boolean|Char|Long|Double|Float|Short|Byte|dynamic)\b</string>
946951
<key>name</key>
947952
<string>storage.type.buildin.kotlin</string>
948953
</dict>

syntaxes/LICENSE

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright 2012-2014 Vladimir Kostyukov
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

0 commit comments

Comments
 (0)