solargraph-rspec 0.1.1 → 0.2.1

data/lib/solargraph/rspec/walker.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-# Credits: This file is a copy of the original file from the solargraph-rails gem.
-
 module Solargraph
   module Rspec
     class Walker
+      class ParsingError < StandardError; end
+
       class Hook
         attr_reader :node_type
 
@@ -17,7 +17,7 @@ module Solargraph
           @proc = Proc.new(&block)
         end
 
-        # @param node [Parser::AST::Node]
+        # @param node [RubyVM::AbstractSyntaxTree::Node]
         # @return [void]
         def visit(node)
           return unless matches?(node)
@@ -33,15 +33,15 @@ module Solargraph
 
         private
 
-        # @param node [Parser::AST::Node]
+        # @param node [RubyVM::AbstractSyntaxTree::Node]
         # @return [Boolean]
         def matches?(node)
           return false unless node.type == node_type
           return false unless node.children
           return true if @args.empty?
 
-          a_child_matches = node.children.first.is_a?(::Parser::AST::Node) && node.children.any? do |child|
-            child.is_a?(::Parser::AST::Node) &&
+          a_child_matches = node.children.first.is_a?(RubyVM::AbstractSyntaxTree::Node) && node.children.any? do |child|
+            child.is_a?(RubyVM::AbstractSyntaxTree::Node) &&
               match_children(child.children, @args[1..])
           end
 
@@ -50,12 +50,12 @@ module Solargraph
           match_children(node.children)
         end
 
-        # @param children [Array<Parser::AST::Node>]
+        # @param children [Array<RubyVM::AbstractSyntaxTree::Node>]
         def match_children(children, args = @args)
           args.each_with_index.all? do |arg, i|
             if arg == :any
               true
-            elsif children[i].is_a?(::Parser::AST::Node) && arg.is_a?(Symbol)
+            elsif children[i].is_a?(RubyVM::AbstractSyntaxTree::Node) && arg.is_a?(Symbol)
               children[i].type == arg
             else
               children[i] == arg
@@ -64,28 +64,9 @@ module Solargraph
         end
       end
 
-      # https://github.com/castwide/solargraph/issues/522
-      def self.normalize_ast(source)
-        ast = source.node
-
-        if ast.is_a?(::Parser::AST::Node)
-          ast
-        else
-          NodeParser.parse_with_comments(source.code, source.filename)
-        end
-      end
-
-      # @param source [Solargraph::Source]
-      def self.from_source(source)
-        new(*normalize_ast(source))
-      end
-
-      # @return ast [Parser::AST::Node]
-      attr_reader :ast
-      # @return comments [Hash]
-      attr_reader :comments
+      attr_reader :ast, :comments
 
-      # @param ast [Parser::AST::Node]
+      # @param ast [RubyVM::AbstractSyntaxTree::Node]
       # @param comments [Hash]
       def initialize(ast, comments = {})
         @comments = comments
@@ -93,23 +74,18 @@ module Solargraph
         @hooks = Hash.new([])
       end
 
-      # @param node_type [Symbol]
-      # @param args [Array]
-      # @param block [Proc]
       def on(node_type, args = [], &block)
         @hooks[node_type] << Hook.new(node_type, args, &block)
       end
 
-      # @return [void]
       def walk
         @ast.is_a?(Array) ? @ast.each { |node| traverse(node) } : traverse(@ast)
       end
 
       private
 
-      # @param node [Parser::AST::Node]
       def traverse(node)
-        return unless node.is_a?(::Parser::AST::Node)
+        return unless node.is_a?(RubyVM::AbstractSyntaxTree::Node)
 
         @hooks[node.type].each { |hook| hook.visit(node) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Lekë Mula
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solargraph
@@ -45,6 +45,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- codecov.yml
 - lib/solargraph-rspec.rb
 - lib/solargraph/rspec/config.rb
 - lib/solargraph/rspec/convention.rb
@@ -54,12 +55,14 @@ files:
 - lib/solargraph/rspec/correctors/described_class_corrector.rb
 - lib/solargraph/rspec/correctors/dsl_methods_corrector.rb
 - lib/solargraph/rspec/correctors/example_and_hook_blocks_binding_corrector.rb
-- lib/solargraph/rspec/correctors/implicit_subject_method_corrector.rb
 - lib/solargraph/rspec/correctors/let_methods_corrector.rb
 - lib/solargraph/rspec/correctors/subject_method_corrector.rb
-- lib/solargraph/rspec/correctors/walker_base.rb
+- lib/solargraph/rspec/pin_factory.rb
 - lib/solargraph/rspec/spec_walker.rb
-- lib/solargraph/rspec/util.rb
+- lib/solargraph/rspec/spec_walker/fake_let_method.rb
+- lib/solargraph/rspec/spec_walker/full_constant_name.rb
+- lib/solargraph/rspec/spec_walker/node_types.rb
+- lib/solargraph/rspec/spec_walker/rspec_context_namespace.rb
 - lib/solargraph/rspec/version.rb
 - lib/solargraph/rspec/walker.rb
 - lib/solargraph_rspec.rb

data/lib/solargraph/rspec/correctors/implicit_subject_method_corrector.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'let_methods_corrector'
-
-module Solargraph
-  module Rspec
-    module Correctors
-      # Defines let-like methods in the example group block
-      class ImplicitSubjectMethodCorrector < Base
-        # @return [Pin::Method]
-        attr_reader :described_class_pin
-
-        # @param namespace_pins [Array<Pin::Namespace>]
-        # @param described_class_pin [Pin::Method]
-        def initialize(namespace_pins:, described_class_pin:)
-          super(namespace_pins: namespace_pins)
-
-          @described_class_pin = described_class_pin
-        end
-
-        # @param source_map [Solargraph::SourceMap]
-        # @return [void]
-        def correct(_source_map)
-          namespace_pin = closest_namespace_pin(namespace_pins, described_class_pin.location.range.start.line)
-
-          yield [implicit_subject_pin(described_class_pin, namespace_pin)] if block_given? && namespace_pin
-        end
-
-        private
-
-        # @param described_class_pin [Pin::Method]
-        # @param namespace_pin [Pin::Namespace]
-        # @return [Pin::Method]
-        def implicit_subject_pin(described_class_pin, namespace_pin)
-          described_class = described_class_pin.return_type.first.subtypes.first.name
-
-          Util.build_public_method(
-            namespace_pin,
-            'subject',
-            types: [described_class],
-            location: described_class_pin.location,
-            scope: :instance
-          )
-        end
-      end
-    end
-  end
-end

data/lib/solargraph/rspec/correctors/walker_base.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base'
-
-# A corrector that walks through RSpec AST nodes and corrects them
-module Solargraph
-  module Rspec
-    module Correctors
-      # A corrector of RSpec parsed pins by Solargraph
-      # @abstract
-      class WalkerBase < Base
-        # @return [Array<Solargraph::Pin::Namespace>]
-        attr_reader :namespace_pins
-
-        # @return [Solargraph::Rspec::SpecWalker]
-        attr_reader :rspec_walker
-
-        # @param namespace_pins [Array<Solargraph::Pin::Base>]
-        # @param rspec_walker [Solargraph::Rspec::SpecWalker]
-        def initialize(namespace_pins:, rspec_walker:)
-          super(namespace_pins: namespace_pins)
-          @rspec_walker = rspec_walker
-        end
-      end
-    end
-  end
-end

data/lib/solargraph/rspec/util.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-# Credits: This file is a copy of the file from the solargraph-rspec gem
-
-# rubocop:disable Naming/MethodParameterName
-module Solargraph
-  module Rspec
-    # Utility methods for building pins and references.
-    module Util
-      def self.build_public_method(
-        ns,
-        name,
-        types: nil,
-        location: nil,
-        comments: [],
-        attribute: false,
-        scope: :instance
-      )
-        opts = {
-          name: name,
-          location: location,
-          closure: ns,
-          scope: scope,
-          attribute: attribute,
-          comments: []
-        }
-
-        comments << "@return [#{types.join(",")}]" if types
-
-        opts[:comments] = comments.join("\n")
-
-        Solargraph::Pin::Method.new(**opts)
-      end
-
-      def self.build_module_include(ns, module_name, location)
-        Solargraph::Pin::Reference::Include.new(
-          closure: ns,
-          name: module_name,
-          location: location
-        )
-      end
-
-      def self.build_module_extend(ns, module_name, location)
-        Solargraph::Pin::Reference::Extend.new(
-          closure: ns,
-          name: module_name,
-          location: location
-        )
-      end
-
-      def self.dummy_location(path)
-        Solargraph::Location.new(
-          File.expand_path(path),
-          Solargraph::Range.from_to(0, 0, 0, 0)
-        )
-      end
-
-      # @param ast [Parser::AST::Node]
-      def self.build_location(ast, path)
-        Solargraph::Location.new(
-          File.expand_path(path),
-          Solargraph::Range.from_to(
-            ast.location.first_line,
-            ast.location.column,
-            ast.location.last_line,
-            ast.location.last_column
-          )
-        )
-      end
-
-      def self.method_return(path, type)
-        Solargraph::Pin::Reference::Override.method_return(path, type)
-      end
-    end
-  end
-end
-# rubocop:enable Naming/MethodParameterName