summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-22 22:10:54 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-22 22:10:54 +0100
commit0d76683e094c6cac2e879601aff3acf1163cbe0b (patch)
treecdaf6f71208d8744a37381d9240d9774b70cd201
parentade0d39468014fd55d30f7647a1ac104baff4bc5 (diff)
patch 8.2.0141: no swift filetype detectionv8.2.0141
Problem: No swift filetype detection. Solution: Add swift, swiftgyb and sil. (Emir Sarı, closes #5517)
-rw-r--r--runtime/filetype.vim7
-rw-r--r--src/testdir/test_filetype.vim3
-rw-r--r--src/version.c2
3 files changed, 12 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index bee65a65bd..53f6708315 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1627,6 +1627,13 @@ au BufNewFile,BufRead *.sml setf sml
" Sratus VOS command macro
au BufNewFile,BufRead *.cm setf voscm
+" Swift
+au BufNewFile,BufRead *.swift setf swift
+au BufNewFile,BufRead *.swift.gyb setf swiftgyb
+
+" Swift Intermediate Language
+au BufNewFile,BufRead *.sil setf sil
+
" Sysctl
au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf setf sysctl
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 50f370ff41..0916f5cffe 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -432,6 +432,9 @@ let s:filename_checks = {
\ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp'],
\ 'svg': ['file.svg'],
\ 'svn': ['svn-commitfile.tmp'],
+ \ 'swift': ['file.swift'],
+ \ 'swiftgyb': ['file.swift.gyb'],
+ \ 'sil': ['file.sil'],
\ 'sysctl': ['/etc/sysctl.conf', '/etc/sysctl.d/file.conf'],
\ 'systemd': ['any/systemd/file.automount', 'any/systemd/file.mount', 'any/systemd/file.path', 'any/systemd/file.service', 'any/systemd/file.socket', 'any/systemd/file.swap', 'any/systemd/file.target', 'any/systemd/file.timer', '/etc/systemd/system/some.d/file.conf', '/etc/systemd/system/some.d/.#file'],
\ 'systemverilog': ['file.sv', 'file.svh'],
diff --git a/src/version.c b/src/version.c
index 97483925ae..3f4eb806eb 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 */
/**/
+ 141,
+/**/
140,
/**/
139,