Move parsing as a top level concern of Spoom

Signed-off-by: Alexandre Terrasa <[email protected]>

lib/spoom/cli/deadcode.rb

@@ -87,9 +87,9 @@ def deadcode(*paths)
           content = File.read(file)
           content = ERB.new(content).src if file.end_with?(".erb")
 
-          tree = Spoom::Deadcode.parse_ruby(content, file: file)
+          tree = Spoom.parse_ruby(content, file: file)
           Spoom::Deadcode.index_node(index, tree, content, file: file, plugins: plugins)
-        rescue Spoom::Deadcode::ParserError => e
+        rescue ParseError => e
           say_error("Error parsing #{file}: #{e.message}")
           next
         rescue Spoom::Deadcode::IndexerError => e

lib/spoom/deadcode.rb

@@ -6,6 +6,7 @@
 
 require_relative "visitor"
 require_relative "location"
+require_relative "parse"
 
 require_relative "deadcode/erb"
 require_relative "deadcode/index"
@@ -25,8 +26,6 @@ class Error < Spoom::Error
       abstract!
     end
 
-    class ParserError < Error; end
-
     class IndexerError < Error
       extend T::Sig
 
@@ -40,22 +39,6 @@ def initialize(message, parent:)
     class << self
       extend T::Sig
 
-      sig { params(ruby: String, file: String).returns(Prism::Node) }
-      def parse_ruby(ruby, file:)
-        result = Prism.parse(ruby)
-        unless result.success?
-          message = +"Error while parsing #{file}:\n"
-
-          result.errors.each do |e|
-            message << "- #{e.message} (at #{e.location.start_line}:#{e.location.start_column})\n"
-          end
-
-          raise ParserError, message
-        end
-
-        result.value
-      end
-
       sig do
         params(
           index: Index,
@@ -74,7 +57,7 @@ def index_node(index, node, ruby, file:, plugins: [])
 
       sig { params(index: Index, ruby: String, file: String, plugins: T::Array[Deadcode::Plugins::Base]).void }
       def index_ruby(index, ruby, file:, plugins: [])
-        node = parse_ruby(ruby, file: file)
+        node = Spoom.parse_ruby(ruby, file: file)
         index_node(index, node, ruby, file: file, plugins: plugins)
       end
 

lib/spoom/deadcode/remover.rb

@@ -561,7 +561,7 @@ def find(source, location, kind)
                 "#{e.message} (at #{e.location.start_line}:#{e.location.start_column})."
               end.join(" ")
 
-              raise ParserError, "Error while parsing #{location.file}: #{message}"
+              raise ParseError, "Error while parsing #{location.file}: #{message}"
             end
 
             visitor = new(location)

lib/spoom/parse.rb

@@ -0,0 +1,28 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "spoom/visitor"
+
+module Spoom
+  class ParseError < Error; end
+
+  class << self
+    extend T::Sig
+
+    sig { params(ruby: String, file: String).returns(Prism::Node) }
+    def parse_ruby(ruby, file:)
+      result = Prism.parse(ruby)
+      unless result.success?
+        message = +"Error while parsing #{file}:\n"
+
+        result.errors.each do |e|
+          message << "- #{e.message} (at #{e.location.start_line}:#{e.location.start_column})\n"
+        end
+
+        raise ParseError, message
+      end
+
+      result.value
+    end
+  end
+end

test/spoom/deadcode/index_definitions_test.rb

@@ -14,7 +14,7 @@ def test_index_rescue_parser_error
           def foo(
         RB
 
-        exception = assert_raises(ParserError) do
+        exception = assert_raises(ParseError) do
           deadcode_index
         end