Merge pull request #211 from gsamokovarov/join-ruby-methods-without-a…

…rguments

Fix joining single line Ruby methods without arguments

autoload/sj/ruby.vim

@@ -1113,7 +1113,7 @@ endfunction
 
 function! sj#ruby#JoinOnelineDef()
   " adapted from vim-ruby
-  if search('\<def\s\+\%(\k\+\.\)\=\k\+[!?]\=\%((.*)\)\s*\%(#.*\)\=$', 'Wbc', line('.')) <= 0
+  if search('\<def\s\+\%(\k\+\.\)\=\k\+[!?]\=\s*\%((.*)\)\=\s*\%(#.*\)\=$', 'Wbc', line('.')) <= 0
     return 0
   endif
 

spec/plugin/ruby_spec.rb

@@ -1901,5 +1901,47 @@ def foo(one, two)
         def foo(one, two) = bar
       EOF
     end
+
+    specify "with the cursor on a definition without arguments" do
+      set_file_contents <<~EOF
+        def foo = bar
+      EOF
+
+      vim.search 'def'
+      split
+
+      assert_file_contents <<~EOF
+        def foo
+          bar
+        end
+      EOF
+
+      join
+
+      assert_file_contents <<~EOF
+        def foo = bar
+      EOF
+    end
+
+    specify "with the cursor on a definition arguments defaults" do
+      set_file_contents <<~EOF
+        def self.foo(bar = quux(42), ...) = bar
+      EOF
+
+      vim.search 'def'
+      split
+
+      assert_file_contents <<~EOF
+        def self.foo(bar = quux(42), ...)
+          bar
+        end
+      EOF
+
+      join
+
+      assert_file_contents <<~EOF
+        def self.foo(bar = quux(42), ...) = bar
+      EOF
+    end
   end
 end