ruby-lsp-refactor 0.1.0 → 0.1.1

data/test/ruby_lsp_refactor/logical_operator_listener_test.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "ruby_lsp/test_helper"
+
+module RubyLsp
+  module Refactor
+    class LogicalOperatorListenerTest < Minitest::Test
+      include RubyLsp::Refactor::TestHelper
+
+      def find_action(actions, title_pattern)
+        actions.find { |a| a.title.match?(title_pattern) }
+      end
+
+      def single_edit(action)
+        edits = action.edit.changes.values.flatten
+        assert_equal 1, edits.size
+        edits.first
+      end
+
+      def test_converts_double_ampersand_to_and
+        source = "user.valid? && user.save\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, /&&.*and/)
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal "user.valid? and user.save", edit.new_text.strip
+      end
+
+      def test_converts_and_to_double_ampersand
+        source = "user.valid? and user.save\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, /and.*&&/)
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal "user.valid? && user.save", edit.new_text.strip
+      end
+
+      def test_converts_double_pipe_to_or
+        source = "a || b\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, /\|\|.*or/)
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal "a or b", edit.new_text.strip
+      end
+
+      def test_converts_or_to_double_pipe
+        source = "a or b\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, /or.*\|\|/)
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal "a || b", edit.new_text.strip
+      end
+
+      def test_does_not_raise_on_empty_source
+        assert_silent { code_actions_for("", line: 0) }
+      end
+    end
+  end
+end

data/test/ruby_lsp_refactor/raise_listener_test.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "ruby_lsp/test_helper"
+
+module RubyLsp
+  module Refactor
+    class RaiseListenerTest < Minitest::Test
+      include RubyLsp::Refactor::TestHelper
+
+      def find_action(actions, title)
+        actions.find { |a| a.title == title }
+      end
+
+      def single_edit(action)
+        edits = action.edit.changes.values.flatten
+        assert_equal 1, edits.size
+        edits.first
+      end
+
+      def test_simplifies_raise_runtime_error
+        source = "raise RuntimeError, \"something went wrong\"\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Simplify raise (remove redundant RuntimeError)")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal 'raise "something went wrong"', edit.new_text.strip
+      end
+
+      def test_simplifies_fail_runtime_error
+        source = "fail RuntimeError, \"oops\"\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Simplify raise (remove redundant RuntimeError)")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal 'fail "oops"', edit.new_text.strip
+      end
+
+      def test_does_not_offer_for_other_exception_classes
+        source = "raise ArgumentError, \"bad arg\"\n"
+        actions = code_actions_for(source, line: 0)
+        assert_nil find_action(actions, "Simplify raise (remove redundant RuntimeError)")
+      end
+
+      def test_does_not_offer_for_raise_with_string_only
+        source = "raise \"already simple\"\n"
+        actions = code_actions_for(source, line: 0)
+        assert_nil find_action(actions, "Simplify raise (remove redundant RuntimeError)")
+      end
+
+      def test_does_not_offer_for_runtime_error_new
+        source = "raise RuntimeError.new(\"msg\")\n"
+        actions = code_actions_for(source, line: 0)
+        assert_nil find_action(actions, "Simplify raise (remove redundant RuntimeError)")
+      end
+
+      def test_does_not_raise_on_empty_source
+        assert_silent { code_actions_for("", line: 0) }
+      end
+    end
+  end
+end

data/test/ruby_lsp_refactor/rescue_listener_test.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "ruby_lsp/test_helper"
+
+module RubyLsp
+  module Refactor
+    class RescueListenerTest < Minitest::Test
+      include RubyLsp::Refactor::TestHelper
+
+      def find_action(actions, title)
+        actions.find { |a| a.title == title }
+      end
+
+      def single_edit(action)
+        edits = action.edit.changes.values.flatten
+        assert_equal 1, edits.size
+        edits.first
+      end
+
+      def test_wraps_method_body_in_rescue
+        source = <<~RUBY
+          def call
+            do_thing
+          end
+        RUBY
+
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Wrap body in rescue")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_match(/rescue StandardError => e/, edit.new_text)
+        assert_match(/do_thing/, edit.new_text)
+        assert_match(/raise/, edit.new_text)
+      end
+
+      def test_preserves_all_body_statements
+        source = <<~RUBY
+          def process
+            step_one
+            step_two
+            step_three
+          end
+        RUBY
+
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Wrap body in rescue")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_match(/step_one/, edit.new_text)
+        assert_match(/step_two/, edit.new_text)
+        assert_match(/step_three/, edit.new_text)
+      end
+
+      def test_does_not_offer_on_empty_method
+        source = <<~RUBY
+          def noop
+          end
+        RUBY
+
+        actions = code_actions_for(source, line: 0)
+        assert_nil find_action(actions, "Wrap body in rescue")
+      end
+
+      def test_does_not_raise_on_empty_source
+        assert_silent { code_actions_for("", line: 0) }
+      end
+    end
+  end
+end

data/test/ruby_lsp_refactor/rspec_let_listener_test.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "ruby_lsp/test_helper"
+
+module RubyLsp
+  module Refactor
+    class RspecLetListenerTest < Minitest::Test
+      include RubyLsp::Refactor::TestHelper
+
+      def find_action(actions, title)
+        actions.find { |a| a.title == title }
+      end
+
+      def single_edit(action)
+        edits = action.edit.changes.values.flatten
+        assert_equal 1, edits.size
+        edits.first
+      end
+
+      def test_converts_let_to_let_bang
+        source = "let(:user) { User.new }\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Convert let to let!")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_match(/let!\(:user\)/, edit.new_text)
+      end
+
+      def test_converts_let_bang_to_let
+        source = "let!(:user) { User.new }\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Convert let! to let")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_match(/\blet\(:user\)/, edit.new_text)
+        refute_match(/let!/, edit.new_text)
+      end
+
+      def test_does_not_offer_for_non_let_calls
+        source = "subject { User.new }\n"
+        actions = code_actions_for(source, line: 0)
+        assert_nil find_action(actions, "Convert let to let!")
+        assert_nil find_action(actions, "Convert let! to let")
+      end
+
+      def test_does_not_raise_on_empty_source
+        assert_silent { code_actions_for("", line: 0) }
+      end
+    end
+  end
+end

data/test/ruby_lsp_refactor/string_array_listener_test.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "ruby_lsp/test_helper"
+
+module RubyLsp
+  module Refactor
+    class StringArrayListenerTest < Minitest::Test
+      include RubyLsp::Refactor::TestHelper
+
+      def find_action(actions, title)
+        actions.find { |a| a.title == title }
+      end
+
+      def single_edit(action)
+        edits = action.edit.changes.values.flatten
+        assert_equal 1, edits.size
+        edits.first
+      end
+
+      def test_converts_bracket_string_array_to_percent_w
+        source = "[\"foo\", \"bar\", \"baz\"]\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Convert to string array (%w[])")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal "%w[foo bar baz]", edit.new_text
+      end
+
+      def test_converts_percent_w_to_bracket_array
+        source = "%w[foo bar baz]\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Convert to bracket array")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal '["foo", "bar", "baz"]', edit.new_text
+      end
+
+      def test_does_not_offer_percent_w_for_strings_with_spaces
+        source = "[\"hello world\", \"foo\"]\n"
+        actions = code_actions_for(source, line: 0)
+        assert_nil find_action(actions, "Convert to string array (%w[])")
+      end
+
+      def test_does_not_offer_percent_w_for_mixed_array
+        source = "[\"foo\", 42]\n"
+        actions = code_actions_for(source, line: 0)
+        assert_nil find_action(actions, "Convert to string array (%w[])")
+      end
+
+      def test_does_not_offer_percent_w_for_empty_array
+        source = "[]\n"
+        actions = code_actions_for(source, line: 0)
+        assert_nil find_action(actions, "Convert to string array (%w[])")
+      end
+
+      def test_does_not_raise_on_empty_source
+        assert_silent { code_actions_for("", line: 0) }
+      end
+    end
+  end
+end

data/test/ruby_lsp_refactor/string_freeze_listener_test.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "ruby_lsp/test_helper"
+
+module RubyLsp
+  module Refactor
+    class StringFreezeListenerTest < Minitest::Test
+      include RubyLsp::Refactor::TestHelper
+
+      def find_action(actions, title)
+        actions.find { |a| a.title == title }
+      end
+
+      def single_edit(action)
+        edits = action.edit.changes.values.flatten
+        assert_equal 1, edits.size
+        edits.first
+      end
+
+      def test_wraps_string_in_freeze
+        source = "\"hello world\"\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Wrap in freeze")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal '"hello world".freeze', edit.new_text
+      end
+
+      def test_removes_freeze_from_frozen_string
+        source = "\"hello world\".freeze\n"
+        actions = code_actions_for(source, line: 0)
+        action  = find_action(actions, "Remove freeze")
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal '"hello world"', edit.new_text
+      end
+
+      def test_does_not_offer_wrap_when_already_frozen
+        source = "\"hello\".freeze\n"
+        actions = code_actions_for(source, line: 0)
+        assert_nil find_action(actions, "Wrap in freeze")
+      end
+
+      def test_does_not_raise_on_empty_source
+        assert_silent { code_actions_for("", line: 0) }
+      end
+    end
+  end
+end

data/test/ruby_lsp_refactor/string_listener_test.rb

@@ -47,13 +47,13 @@ module RubyLsp
       # ---------------------------------------------------------------------------
 
       def test_does_not_offer_action_for_already_double_quoted_string
-        source = '"hello world"' + "\n"
+        source = "\"hello world\"\n"
         actions = code_actions_for(source, line: 0)
         assert_nil find_action(actions, "Convert to interpolated string")
       end
 
       def test_does_not_offer_action_for_interpolated_string
-        source = '"hello #{name}"' + "\n"
+        source = "\"hello #{name}\"\n"
         actions = code_actions_for(source, line: 0)
         assert_nil find_action(actions, "Convert to interpolated string")
       end

data/test/ruby_lsp_refactor/super_listener_test.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "ruby_lsp/test_helper"
+
+module RubyLsp
+  module Refactor
+    class SuperListenerTest < Minitest::Test
+      include RubyLsp::Refactor::TestHelper
+
+      def find_action(actions, title_pattern)
+        actions.find { |a| a.title.match?(title_pattern) }
+      end
+
+      def single_edit(action)
+        edits = action.edit.changes.values.flatten
+        assert_equal 1, edits.size
+        edits.first
+      end
+
+      def test_converts_bare_super_to_explicit
+        source = <<~RUBY
+          def initialize(name, age)
+            super
+          end
+        RUBY
+
+        actions = code_actions_for(source, line: 1)
+        action  = find_action(actions, /explicit super/)
+        refute_nil action
+
+        edit = single_edit(action)
+        assert_equal "super(name, age)", edit.new_text.strip
+      end
+
+      def test_title_includes_param_names
+        source = <<~RUBY
+          def initialize(name, age)
+            super
+          end
+        RUBY
+
+        actions = code_actions_for(source, line: 1)
+        action  = find_action(actions, /explicit super/)
+        refute_nil action
+        assert_match(/name, age/, action.title)
+      end
+
+      def test_does_not_offer_when_no_params
+        source = <<~RUBY
+          def initialize
+            super
+          end
+        RUBY
+
+        actions = code_actions_for(source, line: 1)
+        assert_nil find_action(actions, /explicit super/)
+      end
+
+      def test_does_not_raise_on_empty_source
+        assert_silent { code_actions_for("", line: 0) }
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-refactor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aboobacker MK
@@ -10,39 +10,39 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-lsp
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.29'
 - !ruby/object:Gem::Dependency
-  name: prism
+  name: ruby-lsp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
@@ -101,20 +102,42 @@ files:
 - lib/ruby/lsp/refactor.rb
 - lib/ruby/lsp/refactor/version.rb
 - lib/ruby_lsp/ruby_lsp_refactor/addon.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/accessor_listener.rb
 - lib/ruby_lsp/ruby_lsp_refactor/listeners/array_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/block_style_listener.rb
 - lib/ruby_lsp/ruby_lsp_refactor/listeners/conditional_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/constant_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/enumerable_listener.rb
 - lib/ruby_lsp/ruby_lsp_refactor/listeners/hash_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/logical_operator_listener.rb
 - lib/ruby_lsp/ruby_lsp_refactor/listeners/method_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/raise_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/rescue_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/rspec_let_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/string_array_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/string_freeze_listener.rb
 - lib/ruby_lsp/ruby_lsp_refactor/listeners/string_listener.rb
+- lib/ruby_lsp/ruby_lsp_refactor/listeners/super_listener.rb
 - lib/ruby_lsp/ruby_lsp_refactor/listeners/variable_listener.rb
 - lib/ruby_lsp/ruby_lsp_refactor/support/node_helpers.rb
 - lib/ruby_lsp/test_helper.rb
 - sig/ruby/lsp/refactor.rbs
+- test/ruby_lsp_refactor/accessor_listener_test.rb
 - test/ruby_lsp_refactor/array_listener_test.rb
+- test/ruby_lsp_refactor/block_style_listener_test.rb
 - test/ruby_lsp_refactor/conditional_listener_test.rb
+- test/ruby_lsp_refactor/constant_listener_test.rb
+- test/ruby_lsp_refactor/enumerable_listener_test.rb
 - test/ruby_lsp_refactor/hash_listener_test.rb
+- test/ruby_lsp_refactor/logical_operator_listener_test.rb
 - test/ruby_lsp_refactor/method_listener_test.rb
+- test/ruby_lsp_refactor/raise_listener_test.rb
+- test/ruby_lsp_refactor/rescue_listener_test.rb
+- test/ruby_lsp_refactor/rspec_let_listener_test.rb
+- test/ruby_lsp_refactor/string_array_listener_test.rb
+- test/ruby_lsp_refactor/string_freeze_listener_test.rb
 - test/ruby_lsp_refactor/string_listener_test.rb
+- test/ruby_lsp_refactor/super_listener_test.rb
 - test/ruby_lsp_refactor/variable_listener_test.rb
 homepage: https://github.com/tachyons/ruby-lsp-refactor
 licenses: