rubocop-slim 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd8c1d290c8711b0b4877edb6ec304359d7ad7c6fcfdc191001441d0a3125f6
-  data.tar.gz: 748d147c34bc080f1f2b944dfe61421d62395a0585103a1b665e75f05dcc5fa2
+  metadata.gz: 9947f37c94fc6e24e579dc86a7803631a5634f84de00542747d7704705567233
+  data.tar.gz: e807279fde8021198b37d5964903892aa3106d47b594a03bb1ed8a3ad7ce1c2a
 SHA512:
-  metadata.gz: f2fa7a6c42f0a089c8f2917c0dff4fc9087d7daebd855b277faeb59c345cdbb32f5805c74247f5d40065a88859757b57dbd0c3f5eb77747597ff19743aa2ba1a
-  data.tar.gz: add4a21478c6e0340436bfa84264f3e1b645a4da1ba1e0db5d60a7064340e34c328ec3d6e9d46ed0dd8e2f65d1c89c7949bbb3fba50e2374f06f1c17361e0899
+  metadata.gz: deae8bef3a1c84680ad008c42b5bf7ae299c0b1a21b7527eb6710b4c6bdd1e36d91f70ce30b053e510c0a4dfbe9e68e271e69f962da4a12288c0b2c026707984
+  data.tar.gz: eb7293ff3fc3954ad085af8687f642e7a60349bcb11ff2754af46d77e76083efd4025712a2234ec68d7ca3a8ff280dcf521b713e9a90d336094d9f2536568efb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-slim (0.2.5)
+    rubocop-slim (0.2.7)
       rubocop (~> 1.45)
       slimi (~> 0.7)
 
@@ -75,7 +75,7 @@ GEM
     sevencop (0.43.1)
       activesupport
       rubocop
-    slimi (0.7.4)
+    slimi (0.7.5)
       temple
       thor
       tilt

data/lib/rubocop/slim/keyword_remover.rb

@@ -86,7 +86,7 @@ module RuboCop
       # Remove trailing `do`.
       class TrailingDoRemover
         REGEXP = /
-          [ \t]
+          (?:\b[ \t]*|[ \t])
           do
           [ \t]*
           (\|[^|]*\|)?

data/lib/rubocop/slim/processed_source_builder.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Slim
+    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,
+          **keyword_arguments
+        )
+        new_processed_source.config = @processed_source.config
+        new_processed_source.registry = @processed_source.registry
+        new_processed_source
+      end
+
+      private
+
+      # @return [Hash]
+      def keyword_arguments
+        if @processed_source.respond_to?(:parser_engine)
+          { parser_engine: @processed_source.parser_engine }
+        else
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/slim/ruby_extractor.rb

@@ -25,16 +25,12 @@ module RuboCop
         return unless supported_file_path_pattern?
 
         ruby_clips.map do |ruby_clip|
-          processed_source = ::RuboCop::ProcessedSource.new(
-            ruby_clip.code,
-            @processed_source.ruby_version,
-            file_path
-          )
-          processed_source.config = @processed_source.config
-          processed_source.registry = @processed_source.registry
           {
             offset: ruby_clip.offset,
-            processed_source: processed_source
+            processed_source: ProcessedSourceBuilder.call(
+              code: ruby_clip.code,
+              processed_source: @processed_source
+            )
           }
         end
       end
@@ -61,7 +57,7 @@ module RuboCop
             offset: begin_
           )
         end.flat_map do |ruby_clip|
-          WhenDecomposer.call(ruby_clip)
+          WhenDecomposer.call(@processed_source, ruby_clip)
         end.map do |ruby_clip|
           KeywordRemover.call(ruby_clip)
         end

data/lib/rubocop/slim/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Slim
-    VERSION = '0.2.5'
+    VERSION = '0.2.7'
   end
 end

data/lib/rubocop/slim/when_decomposer.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'parser/current'
-require 'rubocop/ast/builder'
-
 module RuboCop
   module Slim
     class WhenDecomposer
@@ -13,15 +10,27 @@ module RuboCop
       /x.freeze
 
       class << self
+        # @param [RuboCop::ProcessedSource] processed_source
         # @param [RuboCop::Slim::RubyClip] ruby_clip
         # @return [Array<RuboCop::Slim::RubyClip>]
-        def call(ruby_clip)
-          new(ruby_clip).call
+        def call(
+          processed_source,
+          ruby_clip
+        )
+          new(
+            processed_source,
+            ruby_clip
+          ).call
         end
       end
 
+      # @param [RuboCop::ProcessedSource] processed_source
       # @param [RuboCop::Slim::RubyClip] ruby_clip
-      def initialize(ruby_clip)
+      def initialize(
+        processed_source,
+        ruby_clip
+      )
+        @processed_source = processed_source
         @ruby_clip = ruby_clip
       end
 
@@ -53,14 +62,10 @@ module RuboCop
       # @param [String] source
       # @return [RuboCop::AST::Node]
       def parse(source)
-        ::Parser::CurrentRuby.new(
-          ::RuboCop::AST::Builder.new
-        ).parse(
-          ::Parser::Source::Buffer.new(
-            '(string)',
-            source: source
-          )
-        )
+        ProcessedSourceBuilder.call(
+          code: source,
+          processed_source: @processed_source
+        ).ast
       end
     end
   end

data/lib/rubocop/slim.rb

@@ -4,6 +4,7 @@ module RuboCop
   module Slim
     autoload :ConfigLoader, 'rubocop/slim/config_loader'
     autoload :KeywordRemover, 'rubocop/slim/keyword_remover'
+    autoload :ProcessedSourceBuilder, 'rubocop/slim/processed_source_builder'
     autoload :RubyClip, 'rubocop/slim/ruby_clip'
     autoload :RubyExtractor, 'rubocop/slim/ruby_extractor'
     autoload :WhenDecomposer, 'rubocop/slim/when_decomposer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-slim
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-25 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -58,6 +58,7 @@ files:
 - lib/rubocop/slim.rb
 - lib/rubocop/slim/config_loader.rb
 - lib/rubocop/slim/keyword_remover.rb
+- lib/rubocop/slim/processed_source_builder.rb
 - lib/rubocop/slim/rubocop_extension.rb
 - lib/rubocop/slim/ruby_clip.rb
 - lib/rubocop/slim/ruby_extractor.rb