Mercurial > vim
view runtime/indent/mma.vim @ 32960:d5c05e15cf81 v9.0.1780
patch 9.0.1780: Vim9 type not defined during object creation
Commit: https://github.com/vim/vim/commit/618e47d1cd93954bad26d47e5353b4f1432daa5e
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Tue Aug 22 21:29:28 2023 +0200
patch 9.0.1780: Vim9 type not defined during object creation
Problem: Vim9 type not defined during object creation
Solution: Define type during object creation and not during class
definition, parse mulit-line member initializers, fix lock
initialization
If type is not specified for a member, set it during object creation
instead of during class definition. Add a runtime type check for the
object member initialization expression
Also, while at it, when copying an object or class, make sure the lock
is correctly initialized.
And finally, parse multi-line member initializers correctly.
closes: #11957
closes: #12868
closes: #12869
closes: #12881
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Co-authored-by: LemonBoy <thatlemon@gmail.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 22 Aug 2023 21:45:02 +0200 |
parents | 6dd88e45d47d |
children |
line wrap: on
line source
" Vim indent file " Language: Mathematica " Maintainer: Steve Layland <layland@wolfram.com> (Invalid email address) " Doug Kearns <dougkearns@gmail.com> " Last Change: Sat May 10 18:56:22 CDT 2005 " 2022 April: b:undo_indent added by Doug Kearns " Source: http://vim.sourceforge.net/scripts/script.php?script_id=1274 " http://members.wolfram.com/layland/vim/indent/mma.vim " " NOTE: " Empty .m files will automatically be presumed to be Matlab files " unless you have the following in your .vimrc: " " let filetype_m="mma" " " Credits: " o steve hacked this out of a random indent file in the Vim 6.1 " distribution that he no longer remembers...sh.vim? Thanks! " Only load this indent file when no other was loaded. if exists("b:did_indent") finish endif let b:did_indent = 1 setlocal indentexpr=GetMmaIndent() setlocal indentkeys+=0[,0],0(,0) setlocal nosi "turn off smart indent so we don't over analyze } blocks let b:undo_indent = "setl inde< indk< si<" if exists("*GetMmaIndent") finish endif function GetMmaIndent() " Hit the start of the file, use zero indent. if v:lnum == 0 return 0 endif " Find a non-blank line above the current line. let lnum = prevnonblank(v:lnum - 1) " use indenting as a base let ind = indent(v:lnum) let lnum = v:lnum " if previous line has an unmatched bracket, or ( indent. " doesn't do multiple parens/blocks/etc... " also, indent only if this line if this line isn't starting a new " block... TODO - fix this with indentkeys? if getline(v:lnum-1) =~ '\\\@<!\%(\[[^\]]*\|([^)]*\|{[^}]*\)$' && getline(v:lnum) !~ '\s\+[\[({]' let ind = ind+shiftwidth() endif " if this line had unmatched closing block, " indent to the matching opening block if getline(v:lnum) =~ '[^[]*]\s*$' " move to the closing bracket call search(']','bW') " and find its partner's indent let ind = indent(searchpair('\[','',']','bWn')) " same for ( blocks elseif getline(v:lnum) =~ '[^(]*)$' call search(')','bW') let ind = indent(searchpair('(','',')','bWn')) " and finally, close { blocks if si ain't already set elseif getline(v:lnum) =~ '[^{]*}' call search('}','bW') let ind = indent(searchpair('{','','}','bWn')) endif return ind endfunction