Fix indent after a word ending in or/and · vim-ruby/vim-ruby@abfe860 · GitHub

vim-ruby / vim-ruby Public

• Notifications You must be signed in to change notification settings
• Fork 285
• Star 2k

• Code
• Issues 57
• Pull requests 6
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit abfe860

Browse filesBrowse the repository at this point in the historyBrowse files

tpope

committed

Fix indent after a word ending in or/and

1 parent d1cd15d commit abfe860
Copy full SHA for abfe860

1 file changed

+2-2Lines changed: 2 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• indent
  • ruby.vim

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎indent/ruby.vim‎

Copy file name to clipboardExpand all lines: indent/ruby.vim

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -81,12 +81,12 @@ let s:end_skip_expr = s:skip_expr .
81	81	\ ' && getline(".") =~ "^\\s*\\<\\(while\\|until\\|for\\):\\@!\\>")'
82	82
83	83	" Regex that defines continuation lines, not including (, {, or [.
84		- let s:non_bracket_continuation_regex = '\%([\\.,:*/%+]\|and\|or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
	84	+ let s:non_bracket_continuation_regex = '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
85	85
86	86	" Regex that defines continuation lines.
87	87	" TODO: this needs to deal with if ...: and so on
88	88	let s:continuation_regex =
89		- \ '\%([({[\\.,:*/%+]\|and\|or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
	89	+ \ '\%([({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
90	90
91	91	" Regex that defines bracket continuations
92	92	let s:bracket_continuation_regex = '\%([({[]\)\s*\%(#.*\)\=$'

0 commit comments

Comments

0 (0)