patch 9.2.0287: filetype: not all ObjectScript routines are recognized
Commit:
https://github.com/vim/vim/commit/863e85e00ad45f3e1f939cf9774c33b0570b9948
Author: Hannah <[email protected]>
Date: Fri Apr 3 09:10:09 2026 +0000
patch 9.2.0287: filetype: not all ObjectScript routines are recognized
Problem: filetype: not all ObjectScript routines are recognized
Solution: Also detect "%RO" and "iris" patterns inside *.rtn files
(Hannah Kimura)
closes: #19873
Signed-off-by: Hannah Kimura <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 20495866b..b1c209400 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -3,7 +3,7 @@ vim9script
# Vim functions for file type detection
#
# Maintainer: The Vim Project <https://github.com/vim/vim>
-# Last Change: 2026 Mar 24
+# Last Change: 2026 Apr 03
# Former Maintainer: Bram Moolenaar <[email protected]>
# These functions are moved here from runtime/filetype.vim to make startup
@@ -14,7 +14,13 @@ var prolog_pattern = '^\s*\(:-\|%\+\(\s\|$\)\|\/\*\)\|\.\s*$'
def IsObjectScriptRoutine(): bool
var line1 = getline(1)
line1 = substitute(line1, '^\ufeff', '', '')
- return line1 =~?
'^\s*routine\>\s\+[%A-Za-z][%A-Za-z0-9_.]*\%(\s*\[\|\s*;\|$\)'
+ if line1 =~? '^\s*routine\>'
+ return true
+ endif
+ if line1 =~? '\<iris\>'
+ return true
+ endif
+ return join(getline(1, 3), '') =~# '%RO'
enddef
export def Check_inp()
@@ -2669,6 +2675,8 @@ const ft_from_ext = {
"rst": "rst",
# RTF
"rtf": "rtf",
+ # ObjectScript Routine
+ "rtn": "objectscript_routine",
# Ruby
"rb": "ruby",
"rbw": "ruby",
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index e24471b6f..6bd96aed3 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -600,6 +600,7 @@ def s:GetFilenameChecks(): dict<list<string>>
numbat: ['file.nbt'],
obj: ['file.obj'],
objdump: ['file.objdump', 'file.cppobjdump'],
+ objectscript_routine: ['file.rtn'],
obse: ['file.obl', 'file.obse', 'file.oblivion', 'file.obscript'],
ocaml: ['file.ml', 'file.mli', 'file.mll', 'file.mly', '.ocamlinit',
'file.mlt', 'file.mlp', 'file.mlip', 'file.mli.cppo', 'file.ml.cppo'],
occam: ['file.occ'],
@@ -2885,6 +2886,24 @@ func Test_int_file()
call assert_equal('objectscript_routine', &filetype)
bwipe!
+ " ObjectScript routine by IRIS marker in first line
+ call writefile(['Exported from IRIS source control'], 'Xfile.int', 'D')
+ split Xfile.int
+ call assert_equal('objectscript_routine', &filetype)
+ bwipe!
+
+ " Not ObjectScript routine by partial IRIS match in first line
+ call writefile(['Exported from IRISation source control'], 'Xfile.int', 'D')
+ split Xfile.int
+ call assert_equal('hex', &filetype)
+ bwipe!
+
+ " ObjectScript routine by %RO marker in first three lines
+ call writefile(['; generated file', '%RO routine metadata'], 'Xfile.int',
'D')
+ split Xfile.int
+ call assert_equal('objectscript_routine', &filetype)
+ bwipe!
+
let g:filetype_int = 'foo'
split Xfile.int
call assert_equal('foo', &filetype)
diff --git a/src/version.c b/src/version.c
index 65518999e..a3f4f24a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 287,
/**/
286,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1w8acK-001suZ-AZ%40256bit.org.
