Skip to content

Experimental Vim9 support #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrewRadev wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Experimental Vim9 support #443

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
335282e
WIP Initial work on Vim 9 rewrite
AndrewRadev Dec 19, 2021
94d0e10
Fix vim9 issues
AndrewRadev Dec 22, 2021
9f49c88
Extract vim9 logic to a separate file
AndrewRadev Dec 22, 2021
68bf954
Leftover vim9 fixes to pass the test suite
AndrewRadev Dec 22, 2021
2555e4e
Merge branch 'master' into vim9-support
AndrewRadev Dec 31, 2021
bd3aaa2
Fix Vim9 features
AndrewRadev Jun 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into vim9-support 
* master:
  Add a spec for case-in pattern matching
  Only consider `in` at the beginning of a line
  Fix indentation for `in` keyword
  Fix tag maps
  Include "" and "." in 'path'
  Avoid recursively triggering in tag/file maps
  Prevent endless defs from starting a method region
  Add highlighting for shareable_constant_value
  • Loading branch information
@AndrewRadev
AndrewRadev committed Dec 31, 2021
commit 2555e4ead517eb1a99d9aff565833fde7287e1e9
6 changes: 3 additions & 3 deletions autoload/ruby_vim9.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var skip_expr =
# Regex used for words that, at the start of a line, add a level of indent.
var ruby_indent_keywords =
\ '^\s*\zs\<\%(module\|class\|if\|for' ..
\ '\|while\|until\|else\|elsif\|case\|when\|unless\|begin\|ensure\|rescue' ..
\ '\|while\|until\|else\|elsif\|case\|when\|in\|unless\|begin\|ensure\|rescue' ..
\ '\|\%(\K\k*[!?]\?\s\+\)\=def\):\@!\>' ..
\ '\|\%([=,*/%+-]\|<<\|>>\|:\s\)\s*\zs' ..
\ '\<\%(if\|for\|while\|until\|case\|unless\|begin\):\@!\>'
Expand All @@ -44,7 +44,7 @@ var ruby_endless_def = '\<def\s\+\k\+[!?]\=\%((.*)\|\s\)\s*='

# Regex used for words that, at the start of a line, remove a level of indent.
var ruby_deindent_keywords =
\ '^\s*\zs\<\%(ensure\|else\|rescue\|elsif\|when\|end\):\@!\>'
\ '^\s*\zs\<\%(ensure\|else\|rescue\|elsif\|when\|in\|end\):\@!\>'

# Regex that defines the start-match for the 'end' keyword.
# let end_start_regex = '\%(^\|[^.]\)\<\%(module\|class\|def\|if\|for\|while\|until\|case\|unless\|begin\|do\)\>'
Expand All @@ -56,7 +56,7 @@ var end_start_regex =
\ '\|\%(^\|[^.:@$]\)\@<=\<do:\@!\>'

# Regex that defines the middle-match for the 'end' keyword.
var end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue:\@!\>\|when\|elsif\):\@!\>'
var end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue:\@!\>\|when\|\%(\%(^\|;\)\s*\)\@<=\<in\|elsif\):\@!\>'

# Regex that defines the end-match for the 'end' keyword.
var end_end_regex = '\%(^\|[^.:@$]\)\@<=\<end:\@!\>'
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.