refactor: rubofix

Author: stackmystack

.rubocop.yml

@@ -76,6 +76,11 @@ Style/BlockDelimiters:
 Style/DoubleNegation:
   Enabled: false
 
+Style/ArgumentsForwarding:
+  Exclude:
+    - lib/tree_stand.rb
+    - lib/tree_stand/*
+
 Style/FormatString:
   Enabled: false
 

ext/tree_sitter/extconf.rb

@@ -121,25 +121,27 @@ def env_var_on?(var)
     $warnflags.gsub!(/#{r}/, '')
   end
 
-  cflags.concat %W[
-    -fms-extensions
-    -fdeclspec
-    -fsanitize=#{sanitizers}
-    -fsanitize-blacklist=../../../../.asanignore
-    -fsanitize-recover=#{sanitizers}
-    -fno-sanitize-recover=all
-    -fno-sanitize=null
-    -fno-sanitize=alignment
-    -fno-omit-frame-pointer
-  ]
-
-  ldflags.concat %W[
-    -fsanitize=#{sanitizers}
-    -dynamic-libasan
-  ]
+  cflags.push(*
+    %W[
+      -fms-extensions
+      -fdeclspec
+      -fsanitize=#{sanitizers}
+      -fsanitize-blacklist=../../../../.asanignore
+      -fsanitize-recover=#{sanitizers}
+      -fno-sanitize-recover=all
+      -fno-sanitize=null
+      -fno-sanitize=alignment
+      -fno-omit-frame-pointer
+    ])
+
+  ldflags.push(*
+    %W[
+      -fsanitize=#{sanitizers}
+      -dynamic-libasan
+    ])
 end
 
-cflags.concat %w[-std=c99 -fPIC -Wall]
+cflags.push(*%w[-std=c99 -fPIC -Wall])
 
 append_cflags(cflags)
 append_ldflags(ldflags)

ext/tree_sitter/repo.rb

@@ -39,7 +39,7 @@ def exe?(name)
     end
 
     def extract?
-      !exe.filter { |k, v| %i[tar zip].include?(k) && v }.empty?
+      exe.any? { |k, v| %i[tar zip].include?(k) && v }
     end
 
     def download
@@ -50,7 +50,7 @@ def download
       %w[git curl wget].each do |cmd|
         res =
           if find_executable(cmd)
-            send("sources_from_#{cmd}")
+            send("sources_from_#{cmd}?")
           else
             false
           end
@@ -76,7 +76,7 @@ def sh(cmd)
       MSG
     end
 
-    def sources_from_curl
+    def sources_from_curl?
       return false if !exe?(:curl) || !extract?
 
       if exe?(:tar)
@@ -90,7 +90,7 @@ def sources_from_curl
       true
     end
 
-    def sources_from_git
+    def sources_from_git?
       return false if !exe?(:git)
 
       sh <<~SHELL.chomp
@@ -104,7 +104,7 @@ def sources_from_git
       true
     end
 
-    def sources_from_wget
+    def sources_from_wget?
       return false if !exe?(:wget) || !extract?
 
       if exe?(:tar)

lib/tree_sitter/query.rb

@@ -45,11 +45,7 @@ def process(source) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexi
       pattern_count.times do |i| # rubocop:disable Metrics/BlockLength
         predicate_steps = predicates_for_pattern(i)
         byte_offset = start_byte_for_pattern(i)
-        row =
-          source.chars.map.with_index
-            .take_while { |_, i| i < byte_offset } # rubocop:disable Lint/ShadowingOuterLocalVariable
-            .filter { |c, _| c == "\n" }
-            .size
+        row = source[0...byte_offset].count("\n")
         text_predicates = []
         property_predicates = []
         property_settings = []

test/tree_sitter/language_test.rb

@@ -75,7 +75,6 @@ def mul(a, b)
   end
 
   it 'must be of correct version' do
-    assert ruby.version <= TreeSitter::LANGUAGE_VERSION \
-           && ruby.version >= TreeSitter::MIN_COMPATIBLE_LANGUAGE_VERSION
+    assert ruby.version.between?(TreeSitter::MIN_COMPATIBLE_LANGUAGE_VERSION, TreeSitter::LANGUAGE_VERSION)
   end
 end

test/tree_sitter/query_test.rb

@@ -218,7 +218,7 @@ def mul(a, b)
     matches.each do |m|
       _(m).must_be_kind_of Hash
       _(m.keys.sort).must_equal %w[product product.left product.right sum sum.left]
-      _(m.values.all? { |n| TreeSitter::Node == n.class }).must_be_equal true
+      _(m.values.all? { |n| n.instance_of?(TreeSitter::Node) }).must_be_equal true
     end
   end
 end

test/tree_stand/visitors/tree_walker_test.rb

@@ -28,10 +28,7 @@ def test_walk_the_tree_depth_first
         1 + x * 3 + 2
       MATH
 
-      node_types = []
-      tree.each do |node|
-        node_types << node.type
-      end
+      node_types = tree.map(&:type)
 
       assert_equal(
         #             double sum nodes show the tree is walked depth-first.
@@ -42,10 +39,7 @@ def test_walk_the_tree_depth_first
     end
 
     def test_tree_api_walks_the_whole_tree
-      node_types = []
-      @tree.each do |node|
-        node_types << node.type
-      end
+      node_types = @tree.map(&:type)
 
       assert_equal(
         %i[expression sum number + product variable * number],