vim: runtime/indent/rust.vim annotate

annotate runtime/indent/rust.vim @ 33096:828bcb1a37e7 v9.0.1833

patch 9.0.1833: [security] runtime file fixes Commit: https://github.com/vim/vim/commit/816fbcc262687b81fc46f82f7bbeb1453addfe0c Author: Christian Brabandt <cb@256bit.org> Date: Thu Aug 31 23:52:30 2023 +0200 patch 9.0.1833: [security] runtime file fixes Problem: runtime files may execute code in current dir Solution: only execute, if not run from current directory The perl, zig and ruby filetype plugins and the zip and gzip autoload plugins may try to load malicious executable files from the current working directory. This is especially a problem on windows, where the current directory is implicitly in your $PATH and windows may even run a file with the extension `.bat` because of $PATHEXT. So make sure that we are not trying to execute a file from the current directory. If this would be the case, error out (for the zip and gzip) plugins or silently do not run those commands (for the ftplugins). This assumes, that only the current working directory is bad. For all other directories, it is assumed that those directories were intentionally set to the $PATH by the user. Signed-off-by: Christian Brabandt <cb@256bit.org>

author	Christian Brabandt <cb@256bit.org>
date	Fri, 01 Sep 2023 00:00:02 +0200
parents	5c220cf30f1f
children	555fede66c30

rev	line source
11229 146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	1 " Vim indent file
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	2 " Language: Rust
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	3 " Author: Chris Morgan <me@chrismorgan.info>
11518 63b0b7b79b25 Update runtime files. Christian Brabandt <cb@256bit.org> parents: 11229 diff changeset	4 " Last Change: 2017 Jun 13
33052 5c220cf30f1f runtime: Set b:undo_indent where missing (#12944) Christian Brabandt <cb@256bit.org> parents: 32930 diff changeset	5 " 2023 Aug 28 by Vim Project (undo_indent)
11229 146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	6 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	7
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	8 " Only load this indent file when no other was loaded.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	9 if exists("b:did_indent")
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	10 finish
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	11 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	12 let b:did_indent = 1
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	13
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	14 setlocal cindent
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	15 setlocal cinoptions=L0,(0,Ws,J1,j1
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	16 setlocal cinkeys=0{,0},!^F,o,O,0[,0]
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	17 " Don't think cinwords will actually do anything at all... never mind
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	18 setlocal cinwords=for,if,else,while,loop,impl,mod,unsafe,trait,struct,enum,fn,extern
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	19
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	20 " Some preliminary settings
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	21 setlocal nolisp " Make sure lisp indenting doesn't supersede us
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	22 setlocal autoindent " indentexpr isn't much help otherwise
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	23 " Also do indentkeys, otherwise # gets shoved to column 0 :-/
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	24 setlocal indentkeys=0{,0},!^F,o,O,0[,0]
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	25
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	26 setlocal indentexpr=GetRustIndent(v:lnum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	27
33052 5c220cf30f1f runtime: Set b:undo_indent where missing (#12944) Christian Brabandt <cb@256bit.org> parents: 32930 diff changeset	28 let b:undo_indent = "setlocal cindent< cinoptions< cinkeys< cinwords< lisp< autoindent< indentkeys< indentexpr<"
5c220cf30f1f runtime: Set b:undo_indent where missing (#12944) Christian Brabandt <cb@256bit.org> parents: 32930 diff changeset	29
11229 146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	30 " Only define the function once.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	31 if exists("*GetRustIndent")
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	32 finish
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	33 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	34
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	35 let s:save_cpo = &cpo
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	36 set cpo&vim
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	37
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	38 " Come here when loading the script the first time.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	39
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	40 function! s:get_line_trimmed(lnum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	41 " Get the line and remove a trailing comment.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	42 " Use syntax highlighting attributes when possible.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	43 " NOTE: this is not accurate; /* */ or a line continuation could trick it
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	44 let line = getline(a:lnum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	45 let line_len = strlen(line)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	46 if has('syntax_items')
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	47 " If the last character in the line is a comment, do a binary search for
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	48 " the start of the comment. synID() is slow, a linear search would take
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	49 " too long on a long line.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	50 if synIDattr(synID(a:lnum, line_len, 1), "name") =~ 'Comment\\|Todo'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	51 let min = 1
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	52 let max = line_len
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	53 while min < max
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	54 let col = (min + max) / 2
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	55 if synIDattr(synID(a:lnum, col, 1), "name") =~ 'Comment\\|Todo'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	56 let max = col
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	57 else
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	58 let min = col + 1
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	59 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	60 endwhile
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	61 let line = strpart(line, 0, min - 1)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	62 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	63 return substitute(line, "\s*$", "", "")
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	64 else
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	65 " Sorry, this is not complete, nor fully correct (e.g. string "//").
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	66 " Such is life.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	67 return substitute(line, "\s//.$", "", "")
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	68 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	69 endfunction
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	70
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	71 function! s:is_string_comment(lnum, col)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	72 if has('syntax_items')
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	73 for id in synstack(a:lnum, a:col)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	74 let synname = synIDattr(id, "name")
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	75 if synname == "rustString" \|\| synname =~ "^rustComment"
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	76 return 1
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	77 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	78 endfor
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	79 else
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	80 " without syntax, let's not even try
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	81 return 0
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	82 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	83 endfunction
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	84
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	85 function GetRustIndent(lnum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	86
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	87 " Starting assumption: cindent (called at the end) will do it right
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	88 " normally. We just want to fix up a few cases.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	89
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	90 let line = getline(a:lnum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	91
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	92 if has('syntax_items')
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	93 let synname = synIDattr(synID(a:lnum, 1, 1), "name")
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	94 if synname == "rustString"
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	95 " If the start of the line is in a string, don't change the indent
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	96 return -1
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	97 elseif synname =~ '$Comment\\|Todo$'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	98 \ && line !~ '^\s/\' " not /* opening line
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	99 if synname =~ "CommentML" " multi-line
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	100 if line !~ '^\s\' && getline(a:lnum - 1) =~ '^\s/\'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	101 " This is (hopefully) the line after a /*, and it has no
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	102 " leader, so the correct indentation is that of the
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	103 " previous line.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	104 return GetRustIndent(a:lnum - 1)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	105 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	106 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	107 " If it's in a comment, let cindent take care of it now. This is
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	108 " for cases like "/" where the next line should start " ", not
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	109 " "* " as the code below would otherwise cause for module scope
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	110 " Fun fact: " /\n\n*/" takes two calls to get right!
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	111 return cindent(a:lnum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	112 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	113 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	114
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	115 " cindent gets second and subsequent match patterns/struct members wrong,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	116 " as it treats the comma as indicating an unfinished statement::
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	117 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	118 " match a {
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	119 " b => c,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	120 " d => e,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	121 " f => g,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	122 " };
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	123
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	124 " Search backwards for the previous non-empty line.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	125 let prevlinenum = prevnonblank(a:lnum - 1)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	126 let prevline = s:get_line_trimmed(prevlinenum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	127 while prevlinenum > 1 && prevline !~ '[^[:blank:]]'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	128 let prevlinenum = prevnonblank(prevlinenum - 1)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	129 let prevline = s:get_line_trimmed(prevlinenum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	130 endwhile
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	131
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	132 " Handle where clauses nicely: subsequent values should line up nicely.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	133 if prevline[len(prevline) - 1] == ","
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	134 \ && prevline =~# '^\s*where\s'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	135 return indent(prevlinenum) + 6
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	136 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	137
32930 2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	138 "match newline after struct with generic bound like
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	139 "struct SomeThing<T>
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	140 "\| <-- newline indent should same as prevline
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	141 if prevline[len(prevline) - 1] == ">"
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	142 \ && prevline =~# "\sstruct.>$"
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	143 return indent(prevlinenum)
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	144 endif
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	145
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	146 "match newline after where like:
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	147 "struct SomeThing<T>
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	148 "where
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	149 " T: Display,
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	150 if prevline =~# '^\s*where$'
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	151 return indent(prevlinenum) + 4
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	152 endif
2ff007677dba runtime(rust): fix rust indent (#12542) Christian Brabandt <cb@256bit.org> parents: 11518 diff changeset	153
11229 146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	154 if prevline[len(prevline) - 1] == ","
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	155 \ && s:get_line_trimmed(a:lnum) !~ '^\s*[\[\]{}]'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	156 \ && prevline !~ '^\s*fn\s'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	157 \ && prevline !~ '([^()]\+,$'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	158 \ && s:get_line_trimmed(a:lnum) !~ '^\s\S\+\s=>'
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	159 " Oh ho! The previous line ended in a comma! I bet cindent will try to
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	160 " take this too far... For now, let's normally use the previous line's
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	161 " indent.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	162
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	163 " One case where this doesn't work out is where this line contains
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	164 " square or curly brackets; then we normally do want to be indenting
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	165 " further.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	166 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	167 " Another case where we don't want to is one like a function
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	168 " definition with arguments spread over multiple lines:
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	169 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	170 " fn foo(baz: Baz,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	171 " baz: Baz) // <-- cindent gets this right by itself
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	172 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	173 " Another case is similar to the previous, except calling a function
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	174 " instead of defining it, or any conditional expression that leaves
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	175 " an open paren:
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	176 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	177 " foo(baz,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	178 " baz);
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	179 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	180 " if baz && (foo \|\|
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	181 " bar) {
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	182 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	183 " Another case is when the current line is a new match arm.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	184 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	185 " There are probably other cases where we don't want to do this as
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	186 " well. Add them as needed.
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	187 return indent(prevlinenum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	188 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	189
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	190 if !has("patch-7.4.355")
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	191 " cindent before 7.4.355 doesn't do the module scope well at all; e.g.::
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	192 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	193 " static FOO : &'static [bool] = [
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	194 " true,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	195 " false,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	196 " false,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	197 " true,
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	198 " ];
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	199 "
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	200 " uh oh, next statement is indented further!
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	201
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	202 " Note that this does not apply the line continuation pattern properly;
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	203 " that's too hard to do correctly for my liking at present, so I'll just
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	204 " start with these two main cases (square brackets and not returning to
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	205 " column zero)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	206
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	207 call cursor(a:lnum, 1)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	208 if searchpair('{\\|(', '', '}\\|)', 'nbW',
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	209 \ 's:is_string_comment(line("."), col("."))') == 0
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	210 if searchpair('\[', '', '\]', 'nbW',
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	211 \ 's:is_string_comment(line("."), col("."))') == 0
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	212 " Global scope, should be zero
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	213 return 0
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	214 else
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	215 " At the module scope, inside square brackets only
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	216 "if getline(a:lnum)[0] == ']' \|\| search('\[', '', '\]', 'nW') == a:lnum
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	217 if line =~ "^\\s*]"
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	218 " It's the closing line, dedent it
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	219 return 0
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	220 else
11518 63b0b7b79b25 Update runtime files. Christian Brabandt <cb@256bit.org> parents: 11229 diff changeset	221 return shiftwidth()
11229 146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	222 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	223 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	224 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	225 endif
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	226
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	227 " Fall back on cindent, which does it mostly right
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	228 return cindent(a:lnum)
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	229 endfunction
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	230
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	231 let &cpo = s:save_cpo
146a1e213b60 Update runtime files. Add Rust support. Christian Brabandt <cb@256bit.org> parents: diff changeset	232 unlet s:save_cpo

Mercurial > vim

annotate runtime/indent/rust.vim @ 33096:828bcb1a37e7 v9.0.1833