Skip to content

Commit 4dffb1c

Browse files
committed
Merge pull request #2 from chocolateboy/fix_comments
Fix nested comments, add Vundle/Pathogen installation instructions
2 parents 47fe798 + ecd2393 commit 4dffb1c

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
## Installation
44

5+
### [Vundle](https://github.com/gmarik/Vundle.vim)
6+
7+
Add `Plugin 'udalov/kotlin-vim'` to your `~/.vimrc` and run `PluginInstall`.
8+
9+
### [Pathogen](https://github.com/tpope/vim-pathogen)
10+
11+
$ git clone https://github.com/udalov/kotlin-vim ~/.vim/bundle/
12+
13+
### Manual
14+
515
0. `mkdir -p ~/.vim/{syntax,indent,ftdetect}`
616
1. `cp syntax/kotlin.vim ~/.vim/syntax/kotlin.vim`
717
2. `cp indent/kotlin.vim ~/.vim/indent/kotlin.vim`

syntax/kotlin.vim

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim syntax file
22
" Language: Kotlin
33
" Maintainer: Alexander Udalov
4-
" Latest Revision: 6 July 2014
4+
" Latest Revision: 15 July 2014
55

66
if exists("b:current_syntax")
77
finish
@@ -28,9 +28,9 @@ syn keyword ktConstant null
2828

2929
syn keyword ktModifier data inline volatile
3030

31-
syn keyword ktTodo contained TODO FIXME XXX
31+
syn keyword ktTodo TODO FIXME XXX contained
3232
syn match ktLineComment "//.*$" contains=ktTodo,@Spell
33-
syn region ktComment start="/\*" end="\*/" contains=ktComment,ktTodo,@Spell
33+
syn region ktComment matchgroup=ktCommentMatchGroup start="/\*" end="\*/" contains=ktComment,ktTodo,@Spell
3434

3535
syn match ktSpecialCharError "\v\\." contained
3636
syn match ktSpecialChar "\v\\([tbnr'"$\\]|u\x{4})" contained
@@ -77,6 +77,7 @@ hi link ktConstant Constant
7777
hi link ktTodo Todo
7878
hi link ktLineComment Comment
7979
hi link ktComment Comment
80+
hi link ktCommentMatchGroup Comment
8081

8182
hi link ktSpecialChar SpecialChar
8283
hi link ktSpecialCharError Error

0 commit comments

Comments
 (0)