rubocop-erb 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86c8fbdd2a736df8e8e9918ebf2b3f0f4fbb8748ed1b7784cd8c9106b1829b32
-  data.tar.gz: 71423e3dede6f71b48c49a6abe1acc70f19a8967fadb108bd91aeed0e3ff8fd8
+  metadata.gz: d829909cc60a55799ce1976340a7e82e7cb40f82e379de1ef8fd1b8cc3395ee0
+  data.tar.gz: 7712047a8cf2e03e4da145dd477f197a0697dbf300adc9728ab5d5fab26756cc
 SHA512:
-  metadata.gz: 7dc7177af96198f2606fe8ce95f3ccf83f770ca066b97cea9552b60e992686ce0cb65fdda8ef44d2fc97d7925b03c2040d14fd8515cc04eda8179298adc2817b
-  data.tar.gz: 350648cb7aff2ebe6100811c5d120effaa4d6a3d092f82c66ffe596ac646f31f5462bbea93ddbc354c8ff7076fa716ecd4208f76d2cb24d788b34b2988dd18a9
+  metadata.gz: 5a653d659c624405db7226d3501bab436656eeca3ed31d84e6cad8838141d6c9dd384af376e6bfe30307da0b8365dee24ee70d376f47e2da1ae44a2e160dd7cb
+  data.tar.gz: deb517d509c2e611f04a1555db766d076793a4e01f42c42697b95a5ed5a222ff6e6824711c6b613fc02a53149aafb487819378e39841ffeb1b0385662c097899

data/.rubocop.yml

@@ -14,7 +14,7 @@ AllCops:
   Exclude:
     - spec/**/*.erb
   NewCops: enable
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.3
 
 Gemspec/RequireMFA:
   Enabled: false
@@ -28,6 +28,9 @@ RSpec/ExampleLength:
 RSpec/MultipleExpectations:
   Enabled: false
 
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
 RSpec/NamedSubject:
   Enabled: false
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    rubocop-erb (0.7.2)
-      herb (~> 0.7)
+    rubocop-erb (0.8.0)
+      herb (~> 0.9, >= 0.9.3)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.84)
 
 GEM
   remote: https://rubygems.org/
@@ -30,21 +30,21 @@ GEM
     connection_pool (2.5.0)
     diff-lcs (1.6.0)
     drb (2.2.1)
-    herb (0.9.2)
-    herb (0.9.2-x86_64-linux-gnu)
+    herb (0.10.1)
+    herb (0.10.1-x86_64-linux-gnu)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     json (2.10.1)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     logger (1.6.6)
-    minitest (5.25.4)
+    minitest (5.27.0)
     mutex_m (0.3.0)
     parallel (1.26.3)
-    parser (3.3.7.1)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    prism (1.3.0)
+    prism (1.9.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
@@ -62,19 +62,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.72.2)
+    rubocop (1.87.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
@@ -90,7 +91,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-emoji (4.3.0)
 
 PLATFORMS
   ruby

data/config/default.yml

@@ -27,10 +27,19 @@ Layout/CommentIndentation:
   Exclude:
     - '**/*.erb'
 
+# Indentation follows the containing ERB tag, not the file as a whole.
 Layout/InitialIndentation:
   Exclude:
     - '**/*.erb'
 
+Layout/ElseAlignment:
+  Exclude:
+    - '**/*.erb'
+
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - '**/*.erb'
+
 Layout/EmptyLineAfterGuardClause:
   Exclude:
     - '**/*.erb'
@@ -39,6 +48,10 @@ Layout/EndAlignment:
   Exclude:
     - '**/*.erb'
 
+Layout/ExtraSpacing:
+  Exclude:
+    - '**/*.erb'
+
 Layout/FirstArgumentIndentation:
   Exclude:
     - '**/*.erb'
@@ -79,6 +92,7 @@ Layout/IndentationWidth:
   Exclude:
     - '**/*.erb'
 
+# Non-Ruby content gives false positives for this cop.
 Layout/LeadingEmptyLines:
   Exclude:
     - '**/*.erb'
@@ -123,46 +137,49 @@ Layout/ParameterAlignment:
   Exclude:
     - '**/*.erb'
 
-Layout/TrailingEmptyLines:
+Layout/SpaceBeforeSemicolon:
   Exclude:
     - '**/*.erb'
 
-Layout/TrailingWhitespace:
+# Non-Ruby content gives false positives for this cop.
+Layout/TrailingEmptyLines:
   Exclude:
     - '**/*.erb'
 
-Lint/EmptyFile:
+Layout/TrailingWhitespace:
   Exclude:
     - '**/*.erb'
 
-Lint/OutOfRangeRegexpRef:
+Lint/DuplicateBranch:
   Exclude:
     - '**/*.erb'
 
-Lint/Syntax:
+Lint/EmptyBlock:
   Exclude:
     - '**/*.erb'
 
-Lint/UselessAssignment:
+Lint/EmptyConditionalBody:
   Exclude:
     - '**/*.erb'
 
-Lint/Void:
+# Non-Ruby content gives false positives for this cop.
+Lint/EmptyFile:
   Exclude:
     - '**/*.erb'
 
-Metrics/BlockLength:
+Lint/EmptyWhen:
   Exclude:
     - '**/*.erb'
 
-Metrics/BlockNesting:
+Lint/Void:
   Exclude:
     - '**/*.erb'
 
-Naming/FileName:
+Style/EmptyElse:
   Exclude:
     - '**/*.erb'
 
+# ERB doesn't support magic comments.
 Style/FrozenStringLiteralComment:
   Exclude:
     - '**/*.erb'
@@ -171,10 +188,18 @@ Style/IdenticalConditionalBranches:
   Exclude:
     - '**/*.erb'
 
+Style/IfInsideElse:
+  Exclude:
+    - '**/*.erb'
+
 Style/IfUnlessModifier:
   Exclude:
     - '**/*.erb'
 
+Style/IfWithSemicolon:
+  Exclude:
+    - '**/*.erb'
+
 Style/MultilineTernaryOperator:
   Exclude:
     - '**/*.erb'
@@ -191,14 +216,30 @@ Style/ParallelAssignment:
   Exclude:
     - '**/*.erb'
 
+Style/RedundantCondition:
+  Exclude:
+    - '**/*.erb'
+
 Style/RescueModifier:
   Exclude:
     - '**/*.erb'
 
+Style/SafeNavigation:
+  Exclude:
+    - '**/*.erb'
+
 Style/Semicolon:
   Exclude:
     - '**/*.erb'
 
+Style/SoleNestedConditional:
+  Exclude:
+    - '**/*.erb'
+
+Style/SymbolProc:
+  Exclude:
+    - '**/*.erb'
+
 Style/TrailingCommaInArguments:
   Exclude:
     - '**/*.erb'

data/lib/rubocop/erb/corrector.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Erb
+    module Corrector
+      def initialize(source)
+        @processed_source = source.processed_source if source.respond_to?(:processed_source)
+        @discard_non_ruby_corrections = @processed_source.is_a?(ERBSource)
+        super
+      end
+
+      # Every rewrite operation funnels through `combine`, which is the only place
+      # both the target range and the replacement text are available. We use it to
+      # recognize a benign re-indentation -- only adding or removing whitespace in
+      # the leading whitespace of a line that begins with an ERB tag -- so it is
+      # kept rather than discarded as a non-Ruby correction. When the correction
+      # reaches past the indentation into the opening tag itself (as
+      # `Layout/CaseIndentation` does), it is shrunk to cover only the leading
+      # whitespace so the tag is preserved.
+      def combine(
+        range,
+        attributes
+      )
+        if (adjustment = whitespace_indent_adjustment(range, attributes))
+          range, attributes = adjustment
+          @whitespace_only_indent = true
+        end
+        super
+      ensure
+        @whitespace_only_indent = false
+      end
+
+      # A correction that touches non-Ruby code can't be applied to the extracted
+      # Ruby without breaking the surrounding ERB. Rather than apply a broken fix,
+      # we discard the whole correction (every operation from the offense) by
+      # reporting the corrector as empty, leaving the offense flagged but not
+      # auto-correctable.
+      def empty?
+        return true if @intersects_non_ruby
+
+        super
+      end
+
+      def to_range(node_or_range)
+        node_or_range = @processed_source.to_range(node_or_range) if @processed_source.is_a?(ERBSource)
+        range = super
+        flag_non_ruby_intersection(range)
+        range
+      end
+
+      private
+
+      def flag_non_ruby_intersection(range)
+        return unless @discard_non_ruby_corrections
+        return unless @processed_source.is_a?(ERBSource)
+        return unless range.is_a?(::Parser::Source::Range)
+        return if @whitespace_only_indent
+        return if @processed_source.range_within_ruby_content?(range.begin_pos, range.end_pos)
+
+        @intersects_non_ruby = true
+      end
+
+      # @return [Array(Parser::Source::Range, Hash), nil] the (possibly rewritten)
+      #   range and attributes to apply when the operation only adjusts whitespace
+      #   in the leading indentation of an ERB-tag line, or nil when inapplicable
+      def whitespace_indent_adjustment(
+        range,
+        attributes
+      )
+        return unless @discard_non_ruby_corrections && @processed_source.is_a?(ERBSource)
+        return unless range.is_a?(::Parser::Source::Range)
+        return unless attributes.is_a?(Hash)
+
+        replacement = attributes[:replacement]
+        contents = attributes.values_at(:replacement, :insert_before, :insert_after).compact
+        # `attributes` comes from Parser's TreeRewriter internals. If none of the
+        # content keys we know about are present, the shape has changed from under
+        # us -- fail safe by treating this as a normal correction (discarded if it
+        # touches non-Ruby) rather than assuming it is whitespace-only.
+        return if contents.empty?
+        return unless contents.all? { |content| content.match?(/\A\s*\z/) }
+
+        source = @processed_source.template_source
+        line = @processed_source.buffer.line_range(@processed_source.buffer.line_for_position(range.begin_pos))
+        offset = source[line.begin_pos...line.end_pos].to_s.index(/\S/)
+        return unless offset
+
+        tag_start = line.begin_pos + offset
+        # Everything from the line start up to the range, and the first code on the
+        # line, must be whitespace then an ERB opening tag.
+        return unless source[tag_start, 2] == '<%'
+        return unless source[line.begin_pos...range.begin_pos].to_s.match?(/\A\s*\z/)
+        return unless range.begin_pos <= tag_start
+
+        # Wholly within the indentation: keep the operation untouched.
+        return [range, attributes] if range.end_pos <= tag_start
+
+        # The range crosses into the tag; only the opening delimiter and trailing
+        # whitespace may be swallowed, and only a replacement can be reshaped.
+        return unless replacement
+
+        preserved = source[tag_start...range.end_pos].to_s
+        return unless preserved.match?(/\A<%[-=]*\s*\z/)
+
+        new_length = replacement.length - preserved.length
+        return if new_length.negative?
+
+        new_range = ::Parser::Source::Range.new(range.source_buffer, range.begin_pos, tag_start)
+        [new_range, attributes.merge(replacement: ' ' * new_length)]
+      end
+    end
+    Cop::Corrector.prepend(Corrector)
+  end
+end

data/lib/rubocop/erb/erb_source.rb

@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Erb
+    class ERBSource < ProcessedSource
+      attr_reader :herb_parse_result, :template_source
+
+      def initialize(
+        template_source,
+        ...
+      ) # rubocop:disable Layout/SpaceInsideParens
+        @template_source = template_source
+        @herb_parse_result = Herb.parse(template_source)
+
+        super(...)
+      end
+
+      # @param [Integer] byte_offset offset into the (original) source in bytes
+      # @return [Integer] the equivalent character offset
+      def byte_to_char_offset(byte_offset)
+        template_source.byteslice(0, byte_offset).length
+      end
+
+      # @param [Integer] position full position in the buffer
+      # @return [Herb::AST::Node, nil] the ERB node whose tag contains the position
+      def erb_node_for_pos(position)
+        erb_node_offsets.bsearch do |(range, _node)|
+          next -1 if position < range.begin
+          next 1 if position >= range.end
+
+          0
+        end&.last
+      end
+
+      # Buffer ranges of every ERB tag (`<% … %>`), paired with their node.
+      #
+      # @return [Array<(Range, Herb::AST::Node)>]
+      def erb_node_offsets
+        @erb_node_offsets ||= [].tap { |offsets| ERBNodeOffsetVisitor.new(self, offsets).visit(erb_root) }
+      end
+
+      # @return [Herb::AST::DocumentNode]
+      def erb_root
+        herb_parse_result.value
+      end
+
+      # Prefer {#herb_range_to_parser_range}: Herb ranges are always byte offsets,
+      # while the unit of Herb position columns differs between herb versions
+      # (e.g. bytes in 0.9.x and characters in 0.11.x for multi-byte Ruby code).
+      #
+      # @param [Herb::Location] location
+      # @return [Parser::Source::Range]
+      def herb_location_to_parser_range(location)
+        Parser::Source::Range.new(buffer,
+                                  herb_position_to_buffer_pos(location.start),
+                                  herb_position_to_buffer_pos(location.end))
+      end
+
+      # @param [Herb::Position] position
+      # @return [Integer]
+      def herb_position_to_buffer_pos(position)
+        line_range = buffer.line_range(position.line)
+        # Herb reports columns as byte offsets, but the parser buffer uses
+        # character offsets; convert so multi-byte characters line up.
+        char_column = line_range.source.byteslice(0, position.column).length
+        line_range.begin.begin_pos + char_column
+      end
+
+      # @param [Herb::Position] position
+      # @return [Parser::Source::Range] zero-width range at the position
+      def herb_position_to_parser_range(position)
+        pos = herb_position_to_buffer_pos(position)
+        Parser::Source::Range.new(buffer, pos, pos)
+      end
+
+      # @param [Herb::Range] range
+      # @return [Parser::Source::Range]
+      def herb_range_to_parser_range(range)
+        # Herb ranges are byte offsets into the source; the parser buffer uses
+        # character offsets, so convert to keep multi-byte characters aligned.
+        Parser::Source::Range.new(buffer, byte_to_char_offset(range.from), byte_to_char_offset(range.to))
+      end
+
+      # @return [Boolean] whether the buffer range lies entirely within the Ruby
+      #   content (between the delimiters) of a single ERB tag
+      def range_within_ruby_content?(
+        begin_pos,
+        end_pos
+      )
+        return false unless (node = erb_node_for_pos(begin_pos)) && (content = node.content)
+
+        content_range = herb_range_to_parser_range(content.range)
+        begin_pos >= content_range.begin_pos && end_pos <= content_range.end_pos
+      end
+
+      # Convert various Herb node or range types to a Parser::Source::Range
+      # Unrecognized values are passed through
+      #
+      # @param [#range, #location, Herb::Location, Herb::Range, Object] node_or_range
+      # @return [Parser::Source::Range, Object, nil]
+      def to_range(node_or_range)
+        node_or_range = node_or_range.range if node_or_range.respond_to?(:range)
+        node_or_range = herb_node_range(node_or_range) || node_or_range.location if node_or_range.is_a?(Herb::AST::Node)
+        node_or_range = node_or_range.location if node_or_range.is_a?(Herb::Token)
+        node_or_range = herb_location_to_parser_range(node_or_range) if node_or_range.is_a?(Herb::Location)
+        node_or_range = herb_range_to_parser_range(node_or_range) if node_or_range.is_a?(Herb::Range)
+        node_or_range = herb_position_to_parser_range(node_or_range) if node_or_range.is_a?(Herb::Position)
+
+        node_or_range
+      end
+
+      private
+
+      # Herb AST nodes have no byte range of their own, so derive one from the
+      # tokens of an ERB node when possible.
+      #
+      # @param [Herb::AST::Node] node
+      # @return [Herb::Range, nil]
+      def herb_node_range(node)
+        return unless node.respond_to?(:tag_opening) && node.respond_to?(:tag_closing)
+        return unless node.tag_opening && node.tag_closing
+
+        Herb::Range.new(node.tag_opening.range.from, node.tag_closing.range.to)
+      end
+
+      # Collects the buffer range of every ERB tag, paired with its node.
+      class ERBNodeOffsetVisitor < Herb::Visitor
+        def initialize(
+          source,
+          offsets
+        )
+          @source = source
+          @offsets = offsets
+          super()
+        end
+
+        def visit_erb_node(node)
+          @offsets << [
+            Range.new(@source.byte_to_char_offset(node.tag_opening.range.from),
+                      @source.byte_to_char_offset(node.tag_closing.range.to),
+                      true),
+            node
+          ]
+          super
+        end
+      end
+      private_constant :ERBNodeOffsetVisitor
+    end
+  end
+end

data/lib/rubocop/erb/ruby_extractor.rb

@@ -5,7 +5,7 @@ require 'rubocop'
 
 module RuboCop
   module Erb
-    # Extract Ruby codes from Erb template.
+    # Extract Ruby codes from ERB template.
     class RubyExtractor
       class << self
         # @param [RuboCop::ProcessedSource] processed_source
@@ -24,54 +24,50 @@ module RuboCop
       def call
         return unless supported_file_path_pattern?
 
-        ruby_clips.map do |ruby_clip|
-          {
-            offset: ruby_clip.offset,
-            processed_source: ProcessedSourceBuilder.call(
-              code: ruby_clip.code,
-              processed_source: @processed_source
-            )
-          }
-        end
+        new_processed_source = ERBSource.new(template_source,
+                                             extracted_ruby,
+                                             @processed_source.ruby_version,
+                                             @processed_source.path,
+                                             parser_engine: @processed_source.parser_engine)
+        new_processed_source.config = @processed_source.config
+        new_processed_source.registry = @processed_source.registry
+        [{
+          offset: 0,
+          processed_source: new_processed_source
+        }]
       end
 
       private
 
+      # The extracted Ruby, character-aligned with the template.
+      #
+      # `Herb.extract_ruby` blanks non-Ruby bytes to spaces, which expands every
+      # multi-byte character (e.g. an emoji in the HTML) into several spaces and
+      # shifts the position of all following characters. Since corrections map
+      # extracted positions back to the template 1:1, re-collapse those runs so a
+      # multi-byte source character stays a single character.
+      #
+      # @return [String]
+      def extracted_ruby
+        extracted = Herb.extract_ruby(template_source)
+        return extracted if extracted.length == template_source.length
+
+        realigned = +''
+        byte_index = 0
+        template_source.each_char do |char|
+          size = char.bytesize
+          chunk = extracted.byteslice(byte_index, size)
+          realigned << (size == 1 || chunk == char ? chunk : ' ')
+          byte_index += size
+        end
+        realigned
+      end
+
       # @return [String, nil]
       def file_path
         @processed_source.path
       end
 
-      # @return [Array<Herb::AST::Node>]
-      def nodes
-        visitor = ErbNodeVisitor.new
-        visitor.visit(root)
-        visitor.erb_nodes
-      end
-
-      # @return [Herb::AST::DocumentNode]
-      def root
-        ::Herb.parse(template_source).value
-      end
-
-      # @return [Array<RuboCop::Erb::RubyClip>]
-      def ruby_clips
-        nodes.map do |node|
-          erb_start_location = node.content.location.start
-          line_range = @processed_source.buffer.line_range(erb_start_location.line)
-          RubyClip.new(
-            code: node.content.value,
-            offset: line_range.begin.begin_pos + erb_start_location.column
-          )
-        end.flat_map do |ruby_clip|
-          WhenDecomposer.call(@processed_source, ruby_clip)
-        end.map do |ruby_clip|
-          KeywordRemover.call(ruby_clip)
-        end.reject do |ruby_clip|
-          ruby_clip.code.match?(/\A\s*\z/)
-        end
-      end
-
       # @return [Boolean]
       def supported_file_path_pattern?
         file_path&.end_with?('.erb')
@@ -81,46 +77,6 @@ module RuboCop
       def template_source
         @processed_source.raw_source
       end
-
-      class ErbNodeVisitor < Herb::Visitor
-        # @return [Array<Symbol>]
-        def self.erb_visitor_methods
-          instance_methods.select { |method_name| method_name.to_s.start_with?('visit_erb_') }
-        end
-
-        attr_reader :erb_nodes
-
-        def initialize
-          @erb_nodes = []
-          super
-        end
-
-        # @return [Boolean]
-        def comment?(node)
-          node.tag_opening&.value == '<%#'
-        end
-
-        # @return [Boolean]
-        def escape?(node)
-          node.tag_opening&.value == '<%%'
-        end
-
-        erb_visitor_methods.each do |method_name|
-          class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-            def #{method_name}(node) # def visit_erb_content_node(node)
-              record_node(node)      #   record_node(node)
-              super                  #   super
-            end                      # end
-          RUBY
-        end
-
-        def record_node(node)
-          return unless node.respond_to?(:content) && node.content
-          return if comment?(node) || escape?(node)
-
-          @erb_nodes << node
-        end
-      end
     end
   end
 end

data/lib/rubocop/erb/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Erb
-    VERSION = '0.7.2'
+    VERSION = '0.8.0'
   end
 end

data/lib/rubocop/erb.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
+require 'herb'
+require 'rubocop'
+
 module RuboCop
   module Erb
-    autoload :KeywordRemover, 'rubocop/erb/keyword_remover'
-    autoload :ProcessedSourceBuilder, 'rubocop/erb/processed_source_builder'
-    autoload :RubyClip, 'rubocop/erb/ruby_clip'
+    autoload :ERBSource, 'rubocop/erb/erb_source'
     autoload :RubyExtractor, 'rubocop/erb/ruby_extractor'
-    autoload :WhenDecomposer, 'rubocop/erb/when_decomposer'
   end
 end
 
 require_relative 'erb/plugin'
 require_relative 'erb/version'
+require_relative 'erb/corrector'

data/rubocop-erb.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = 'RuboCop plugin for ERB template.'
   spec.homepage = 'https://github.com/r7kamura/rubocop-erb'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.3'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'herb', '~> 0.7'
+  spec.add_dependency 'herb', '~> 0.9', '>= 0.9.3'
   spec.add_dependency 'lint_roller', '~> 1.1'
-  spec.add_dependency 'rubocop', '~> 1.72', '>= 1.72.1'
+  spec.add_dependency 'rubocop', '~> 1.84'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-erb
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -15,14 +15,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: lint_roller
   requirement: !ruby/object:Gem::Requirement
@@ -43,20 +49,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.72'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: '1.84'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.72'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: '1.84'
 email:
 - r7kamura@gmail.com
 executables: []
@@ -73,13 +73,11 @@ files:
 - Rakefile
 - config/default.yml
 - lib/rubocop/erb.rb
-- lib/rubocop/erb/keyword_remover.rb
+- lib/rubocop/erb/corrector.rb
+- lib/rubocop/erb/erb_source.rb
 - lib/rubocop/erb/plugin.rb
-- lib/rubocop/erb/processed_source_builder.rb
-- lib/rubocop/erb/ruby_clip.rb
 - lib/rubocop/erb/ruby_extractor.rb
 - lib/rubocop/erb/version.rb
-- lib/rubocop/erb/when_decomposer.rb
 - rubocop-erb.gemspec
 homepage: https://github.com/r7kamura/rubocop-erb
 licenses:
@@ -96,14 +94,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: RuboCop plugin for ERB template.
 test_files: []

data/lib/rubocop/erb/keyword_remover.rb

@@ -1,160 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Erb
-    # Remove unnecessary keyword part (e.g. `if`, `unless`, `do`, ...) from Ruby-ish code.
-    class KeywordRemover
-      class << self
-        # @param [RuboCop::Erb::RubyClip] ruby_clip
-        # @return [RuboCop::Erb::RubyClip]
-        def call(ruby_clip)
-          new(ruby_clip).call
-        end
-      end
-
-      # @param [RuboCop::Erb::RubyClip] ruby_clip
-      def initialize(ruby_clip)
-        @ruby_clip = ruby_clip
-      end
-
-      # @return [RuboCop::Erb::RubyClip]
-      def call
-        [
-          PrecedingKeywordRemover,
-          PrecedingBraceRemover,
-          TrailingBraceRemover,
-          TrailingThenRemover,
-          TrailingDoRemover
-        ].reduce(@ruby_clip) do |previous, callable|
-          result = callable.call(previous.code)
-          RubyClip.new(
-            code: result.code,
-            offset: previous.offset + result.offset
-          )
-        end
-      end
-
-      class PrecedingSourceRemover
-        class << self
-          # @param [String] code
-          # @return [RubyClip]
-          def call(code)
-            new(code).call
-          end
-        end
-
-        # @param [String] code
-        def initialize(code)
-          @code = code
-        end
-
-        # @return [Hash]
-        def call
-          data = @code.match(self.class::REGEXP)
-          if data
-            offset = data[0].length
-            RubyClip.new(
-              code: @code[offset..],
-              offset: offset
-            )
-          else
-            RubyClip.new(
-              code: @code,
-              offset: 0
-            )
-          end
-        end
-      end
-
-      # Remove preceding keyword.
-      class PrecedingKeywordRemover < PrecedingSourceRemover
-        REGEXP = /
-          \A
-          \s*
-          (?:
-            begin
-            | case
-            | else
-            | elsif
-            | end
-            | ensure
-            | if
-            | rescue
-            | unless
-            | until
-            | when
-            | while
-            | for[ \t]+\w+[ \t]+in
-          )
-          \b[ \t]*
-        /x
-      end
-
-      # Remove preceding `}`.
-      class PrecedingBraceRemover < PrecedingSourceRemover
-        REGEXP = /
-          \A
-          \s*
-          }
-        /x
-      end
-
-      class TrailingSourceRemover
-        class << self
-          # @param [String] code
-          # @return [RubyClip]
-          def call(code)
-            new(code).call
-          end
-        end
-
-        # @param [String] code
-        def initialize(code)
-          @code = code
-        end
-
-        # @return [Hash]
-        def call
-          RubyClip.new(
-            code: @code.sub(self.class::REGEXP, ''),
-            offset: 0
-          )
-        end
-      end
-
-      # Remove trailing `{`.
-      class TrailingBraceRemover < TrailingSourceRemover
-        REGEXP = /
-          {
-          [ \t]*
-          (?:\|[^|]*\|)?
-          \s*
-          \z
-        /x
-      end
-
-      # Remove trailing `then`.
-      class TrailingThenRemover < TrailingSourceRemover
-        REGEXP = /
-          [ \t]*\b
-          then
-          \s*
-          \z
-        /x
-      end
-
-      # Remove trailing `do`.
-      class TrailingDoRemover < TrailingSourceRemover
-        REGEXP = /
-          (?:\b[ \t]*|[ \t])
-          do
-          [ \t]*
-          (?:\|[^|]*\|)?
-          \s*
-          (\#.*)?
-          \z
-        /x
-      end
-    end
-  end
-end

data/lib/rubocop/erb/processed_source_builder.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Erb
-    class ProcessedSourceBuilder
-      class << self
-        # Creates a new ProcessedSource, inheriting state from a donor.
-        #
-        # @param [String] code
-        # @param [RuboCop::ProcessedSource] processed_source
-        # @return [RuboCop::ProcessedSource]
-        def call(
-          code:,
-          processed_source:
-        )
-          new(
-            code: code,
-            processed_source: processed_source
-          ).call
-        end
-      end
-
-      def initialize(
-        code:,
-        processed_source:
-      )
-        @code = code
-        @processed_source = processed_source
-      end
-
-      def call
-        new_processed_source = ::RuboCop::ProcessedSource.new(
-          @code,
-          @processed_source.ruby_version,
-          @processed_source.path,
-          parser_engine: @processed_source.parser_engine
-        )
-        new_processed_source.config = @processed_source.config
-        new_processed_source.registry = @processed_source.registry
-        new_processed_source
-      end
-    end
-  end
-end

data/lib/rubocop/erb/ruby_clip.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Erb
-    RubyClip = ::Struct.new(
-      :code,
-      :offset,
-      keyword_init: true
-    )
-  end
-end

data/lib/rubocop/erb/when_decomposer.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Erb
-    class WhenDecomposer
-      REGEXP = /
-        \A
-        \s*
-        when[ \t]
-      /x
-
-      class << self
-        # @param [RuboCop::ProcessedSource] processed_source
-        # @param [RuboCop::Erb::RubyClip] ruby_clip
-        # @return [Array<RuboCop::Erb::RubyClip>]
-        def call(
-          processed_source,
-          ruby_clip
-        )
-          new(processed_source, ruby_clip).call
-        end
-      end
-
-      # @param [RuboCop::ProcessedSource] processed_source
-      # @param [RuboCop::Erb::RubyClip] ruby_clip
-      def initialize(
-        processed_source,
-        ruby_clip
-      )
-        @processed_source = processed_source
-        @ruby_clip = ruby_clip
-      end
-
-      # @return [Array<RuboCop::Erb::RubyClip>]
-      def call
-        match_data = @ruby_clip.code.match(REGEXP)
-        if match_data
-          offset = match_data[0].length
-          condition = @ruby_clip.code[offset..].sub(/[ \t]then(?:[ \t].*)?/, '')
-          nodes = parse(
-            <<~RUBY
-              [
-                #{condition}
-              ]
-            RUBY
-          )&.children || []
-
-          nodes.map do |child|
-            RubyClip.new(
-              code: child.location.expression.source,
-              offset: @ruby_clip.offset + offset + child.location.expression.begin_pos - 4
-            )
-          end
-        else
-          [@ruby_clip]
-        end
-      end
-
-      private
-
-      # @param [String] source
-      # @return [RuboCop::AST::Node]
-      def parse(source)
-        ProcessedSourceBuilder.call(
-          code: source,
-          processed_source: @processed_source
-        ).ast
-      end
-    end
-  end
-end