Skip to content

Commit

Permalink
Merge pull request #2 from chocolateboy/fix_comments
Browse files Browse the repository at this point in the history
Fix nested comments, add Vundle/Pathogen installation instructions
  • Loading branch information
udalov committed Jul 16, 2014
2 parents 47fe798 + ecd2393 commit 4dffb1c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

## Installation

### [Vundle](https://github.com/gmarik/Vundle.vim)

Add `Plugin 'udalov/kotlin-vim'` to your `~/.vimrc` and run `PluginInstall`.

### [Pathogen](https://github.com/tpope/vim-pathogen)

$ git clone https://github.com/udalov/kotlin-vim ~/.vim/bundle/

### Manual

0. `mkdir -p ~/.vim/{syntax,indent,ftdetect}`
1. `cp syntax/kotlin.vim ~/.vim/syntax/kotlin.vim`
2. `cp indent/kotlin.vim ~/.vim/indent/kotlin.vim`
Expand Down
7 changes: 4 additions & 3 deletions syntax/kotlin.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Kotlin
" Maintainer: Alexander Udalov
" Latest Revision: 6 July 2014
" Latest Revision: 15 July 2014

if exists("b:current_syntax")
finish
Expand All @@ -28,9 +28,9 @@ syn keyword ktConstant null

syn keyword ktModifier data inline volatile

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

syn match ktSpecialCharError "\v\\." contained
syn match ktSpecialChar "\v\\([tbnr'"$\\]|u\x{4})" contained
Expand Down Expand Up @@ -77,6 +77,7 @@ hi link ktConstant Constant
hi link ktTodo Todo
hi link ktLineComment Comment
hi link ktComment Comment
hi link ktCommentMatchGroup Comment

hi link ktSpecialChar SpecialChar
hi link ktSpecialCharError Error
Expand Down

0 comments on commit 4dffb1c

Please sign in to comment.