summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-31 22:57:59 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-31 22:57:59 +0100
commitab067a21b9622513ed75f4801b001606eeaf2474 (patch)
treebbbb6bf407704a351d2d1fc79a02b975c5312a9e
parent7cc96923c44bbcc541cbd211b6308d87a965f0c3 (diff)
patch 8.2.0190: Kotlin files are not recognizedv8.2.0190
Problem: Kotlin files are not recognized. Solution: Detect Kotlin files. (Alkeryn, closes #5560)
-rw-r--r--runtime/filetype.vim5
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 1347c42b2b..e2e48c9976 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -384,7 +384,7 @@ au BufNewFile,BufRead configure.in,configure.ac setf config
" CUDA Cumpute Unified Device Architecture
au BufNewFile,BufRead *.cu,*.cuh setf cuda
-" Dockerfilb; Podman uses the same syntax with name Containerfile
+" Dockerfile; Podman uses the same syntax with name Containerfile
au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile setf dockerfile
" WildPackets EtherPeek Decoder
@@ -833,6 +833,9 @@ au BufNewFile,BufRead *.k setf kwt
" Kivy
au BufNewFile,BufRead *.kv setf kivy
+" Kotlin
+au BufNewFile,BufRead *.kt,*.ktm,*.kts setf kotlin
+
" KDE script
au BufNewFile,BufRead *.ks setf kscript
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 2bd85344b7..3868e73c5d 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -234,6 +234,7 @@ let s:filename_checks = {
\ 'kconfig': ['Kconfig', 'Kconfig.debug'],
\ 'kivy': ['file.kv'],
\ 'kix': ['file.kix'],
+ \ 'kotlin': ['file.kt', 'file.ktm', 'file.kts'],
\ 'kscript': ['file.ks'],
\ 'kwt': ['file.k'],
\ 'lace': ['file.ace', 'file.ACE'],
diff --git a/src/version.c b/src/version.c
index 5f090c332c..f351d35b32 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 190,
+/**/
189,
/**/
188,