From 26d52538051f72ba9e6e34a0a43db2cc3d12dcff Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Thu, 11 Jul 2024 22:55:26 +0200 Subject: [PATCH] vim-patch:fc533c9: runtime(mojo): include mojo ftplugin and indent script Taken from excerpts of the Python ftplugin and adapted, indent script simply sources the python indent script. closes: vim/vim#15171 https://github.com/vim/vim/commit/fc533c9f06aff579437f9f2348a21241a72c7967 Co-authored-by: Riley Bruins --- runtime/ftplugin/mojo.vim | 41 +++++++++++++++++++++++++++++++++++++++ runtime/indent/mojo.vim | 6 ++++++ 2 files changed, 47 insertions(+) create mode 100644 runtime/ftplugin/mojo.vim create mode 100644 runtime/indent/mojo.vim diff --git a/runtime/ftplugin/mojo.vim b/runtime/ftplugin/mojo.vim new file mode 100644 index 0000000000..ff50229934 --- /dev/null +++ b/runtime/ftplugin/mojo.vim @@ -0,0 +1,41 @@ +" Vim filetype plugin +" Language: Mojo +" Maintainer: Riley Bruins +" Last Change: 2024 Jul 07 + +if exists('b:did_ftplugin') + finish +endif +let b:did_ftplugin = 1 + +setlocal include=^\\s*\\(from\\\|import\\) +setlocal define=^\\s*\\(\\(async\\s\\+\\)\\?def\\\|class\\) + +" For imports with leading .., append / and replace additional .s with ../ +let b:grandparent_match = '^\(.\.\)\(\.*\)' +let b:grandparent_sub = '\=submatch(1)."/".repeat("../",strlen(submatch(2)))' + +" For imports with a single leading ., replace it with ./ +let b:parent_match = '^\.\(\.\)\@!' +let b:parent_sub = './' + +" Replace any . sandwiched between word characters with / +let b:child_match = '\(\w\)\.\(\w\)' +let b:child_sub = '\1/\2' + +setlocal includeexpr=substitute(substitute(substitute( + \v:fname, + \b:grandparent_match,b:grandparent_sub,''), + \b:parent_match,b:parent_sub,''), + \b:child_match,b:child_sub,'g') + +setlocal suffixesadd=.mojo +setlocal comments=b:#,fb:- +setlocal commentstring=#\ %s + +let b:undo_ftplugin = 'setlocal include<' + \ . '|setlocal define<' + \ . '|setlocal includeexpr<' + \ . '|setlocal suffixesadd<' + \ . '|setlocal comments<' + \ . '|setlocal commentstring<' diff --git a/runtime/indent/mojo.vim b/runtime/indent/mojo.vim new file mode 100644 index 0000000000..9b6a7d4c58 --- /dev/null +++ b/runtime/indent/mojo.vim @@ -0,0 +1,6 @@ +" Vim indent file +" Language: Mojo +" Maintainer: Riley Bruins +" Last Change: 2024 Jul 07 + +runtime! indent/python.vim