Merge pull request #463 from etiennebarrie/endless-operators

AndrewRadev · web-flow · commit 9139741a9d78 · 2024-12-21T11:54:16.000+01:00
Support endless operator methods
diff --git a/indent/ruby.vim b/indent/ruby.vim
@@ -91,7 +91,14 @@ let s:ruby_indent_keywords =
       \    '\<\%(if\|for\|while\|until\|case\|unless\|begin\):\@!\>'
 
 " Def without an end clause: def method_call(...) = <expression>
-let s:ruby_endless_def = '\<def\s\+\%(\k\+\.\)\=\k\+[!?]\=\%((.*)\|\s\)\s*='
+let s:ruby_endless_def =
+      \ '\<def\s\+\%(\k\+\.\)\=\%(\k\+[=!?]\=\|' .
+      \ '[-+*/%&^<>~!]\|' .
+      \ '\*\*\|>>\|<<\|' .
+      \ '===\?\|\!=\|=\~\|\!\~\|' .
+      \ '<=>\|<=\|>=\|' .
+      \ '[-+!\~]@\|\[\]' .
+      \ '\)\%((.*)\|\s\)\s*='
 
 " Regex used for words that, at the start of a line, remove a level of indent.
 let s:ruby_deindent_keywords =
diff --git a/spec/indent/method_definitions_spec.rb b/spec/indent/method_definitions_spec.rb
@@ -74,6 +74,49 @@ def foo(
         # Reference: https://github.com/vim-ruby/vim-ruby/issues/450
         def self.foo = puts(bar)
         def bar.foo = puts(baz)
+
+        def +(other) = to_r + other
+        def -(other) = to_r - other
+        def *(other) = to_r * other
+        def **(other) = to_r ** other
+        def /(other) = to_r / other
+        def %(other) = to_i % other
+        def &(other) = to_i & other
+        def ^(other) = to_i ^ other
+        def >>(other) = to_i >> other
+        def <<(other) = to_i << other
+        def ==(other) = to_r == other
+        def !=(other) = to_r != other
+
+        def ===(other) = to_r === other
+        def foo.===(other) = other
+
+        def =~(other) = to_s =~ other
+        def foo.=~(other) = other
+
+        def !~(other) = to_s !~ other
+        def foo.!~(other) = other
+
+        def <=>(other) = to_r <=> other
+        def foo.<=>(other) = other
+
+        def <(other) = to_r < other
+        def >(other) = to_r > other
+
+        def <=(other) = to_r <= other
+        def foo.<=(other) = other
+        def >=(other) = to_r >= other
+        def foo.>=(other) = other
+
+        def ! = false
+        def ~ = ~to_i
+
+        def -@ = -to_r
+        def +@ = to_r
+        def !@ = false
+        def ~@ = ~to_i
+
+        def [](i) = @array[i]
       end
     EOF
   end
