GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 01:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:11d5992: runtime(rust): use shiftwidth() in indent script

Browse Source 
closes: vim/vim#15138

11d5992573

Co-authored-by: novenary <novenary@kwak.zip>
This commit is contained in:
Christian Clason
2024-07-04 19:27:46 +02:00
parent 4b3be56a03
commit c49bcde927
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/indent/rust.vim
View File

@ -2,7 +2,10 @@
" Language: Rust " Language: Rust
" Author: Chris Morgan <me@chrismorgan.info> " Author: Chris Morgan <me@chrismorgan.info>
" Last Change: 2023-09-11 " Last Change: 2023-09-11
" 2024 Jul 04 by Vim Project: use shiftwidth() instead of hard-coding shifted values (#15138)
" For bugs, patches and license go to https://github.com/rust-lang/rust.vim " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
" Note: upstream seems umaintained: https://github.com/rust-lang/rust.vim/issues/502
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists("b:did_indent") if exists("b:did_indent")
@ -179,7 +182,7 @@ function GetRustIndent(lnum)
" A standalone 'where' adds a shift. " A standalone 'where' adds a shift.
let l:standalone_prevline_where = prevline =~# '\V\^\s\*where\s\*\$' let l:standalone_prevline_where = prevline =~# '\V\^\s\*where\s\*\$'
if l:standalone_prevline_where if l:standalone_prevline_where
return indent(prevlinenum) + 4 return indent(prevlinenum) + shiftwidth()
endif endif
" Handle where clauses nicely: subsequent values should line up nicely. " Handle where clauses nicely: subsequent values should line up nicely.
@ -197,7 +200,7 @@ function GetRustIndent(lnum)
let l:scope_start = searchpair('{\|(', '', '}\|)', 'nbW', let l:scope_start = searchpair('{\|(', '', '}\|)', 'nbW',
\ 's:is_string_comment(line("."), col("."))') \ 's:is_string_comment(line("."), col("."))')
if l:scope_start != 0 && l:scope_start < a:lnum if l:scope_start != 0 && l:scope_start < a:lnum
return indent(l:scope_start) + 4 return indent(l:scope_start) + shiftwidth()
endif endif
endif endif
@ -268,7 +271,7 @@ function GetRustIndent(lnum)
" It's the closing line, dedent it " It's the closing line, dedent it
return 0 return 0
else else
return &shiftwidth return shiftwidth()
endif endif
endif endif
endif endif