rubocop-sketchup 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c66b91ae2f5056ef609c39db88b840882f2851d527d81da3945286729057e2b
-  data.tar.gz: a81182571e69ab415c3f4479a8728b9d802bd6d228ec4d747d3eb1ab7c951f6f
+  metadata.gz: e71400ffe2efbaddd014f143a511597e0fc9d8eaba1a745e129687f332e49580
+  data.tar.gz: 65cc6969cac75295435a0e013df64b5d17ec8be2e3302e32c6f75423882b543f
 SHA512:
-  metadata.gz: e12ed63bc17f8d1e9968b4d8a86748e718d0189f0529c4aedc27f3f40b1a464573b83ab31d734a71b4f1ad2aca3142ed14cc8c7d6d19940171dfb2c4f4b675f7
-  data.tar.gz: 037bea071ddccafbb5cdea79d7fe69a513da277a2d661e8a959e9fa33e47f142c15cd77f4a8988d89f0cae93597e6c5dd42e10f259ff9ae7945053e6d9adce46
+  metadata.gz: fc305dbd24df0851c73cd0f89cc0b7560f60fb96988991a145d5f3323d52a5980d0bba517e8a78216d0c6d0ad65375944232d38c93bd9123a2f7115376d7c7f3
+  data.tar.gz: 6b3c92a2dac501d52c3ba4b458f48ba2e0265a68d9011e657bd5902b712bb408231115556ffa86925789d52d88918a9c791f5aa992ca8b2058565ea87a3a2488

data/lib/rubocop/sketchup/cop/requirements/sketchup_extension.rb

@@ -29,9 +29,21 @@ module RuboCop
         # rubocop:enable Layout/LineLength
 
         # Reference: http://rubocop.readthedocs.io/en/latest/node_pattern/
-        def_node_search :sketchup_extension_new, <<-PATTERN
-          (send
-            (const {nil? cbase} :SketchupExtension) :new ...)
+        def_node_matcher :sketchup_extension_assignment, <<-PATTERN
+          {
+            ({lvasgn ivasgn cvasgn gvasgn} $_
+              $(send (const {nil? cbase} :SketchupExtension) :new ...))
+
+            (casgn _ $_
+              $(send (const {nil? cbase} :SketchupExtension) :new ...))
+
+            (or_asgn
+              {
+                ({lvasgn ivasgn cvasgn gvasgn} $_)
+                (casgn _ $_)
+              }
+              $(send (const {nil? cbase} :SketchupExtension) :new ...))
+          }
         PATTERN
 
         def_node_search :sketchup_register_extension, <<-PATTERN
@@ -46,27 +58,34 @@ module RuboCop
 
           source_node = processed_source.ast
 
-          # Look for SketchupExtension.new.
-          extension_nodes = sketchup_extension_new(source_node).to_a
-
-          # Threat instances not assigned to anything as non-existing.
-          extension_nodes.select! { |node|
-            node.parent&.assignment?
-          }
+          # Look for assigned SketchupExtension.new instances.
+          assignment_nodes = source_node.each_descendant(
+              :or_asgn,
+              :lvasgn,
+              :ivasgn,
+              :cvasgn,
+              :gvasgn,
+              :casgn
+            )
+          assignments = assignment_nodes.filter_map do |node|
+            sketchup_extension_assignment(node)
+          end
 
           # There should not be multiple instances.
-          if extension_nodes.size > 1
+          if assignments.size > 1
             add_global_offense(MSG_CREATE_ONE)
             return
           end
 
           # There should be exactly one.
-          extension_node = extension_nodes.first
-          if extension_node.nil?
+          assignment = assignments.first
+          if assignment.nil?
             add_global_offense(MSG_CREATE_MISSING)
             return
           end
 
+          extension_var, extension_node = assignment
+
           # Ensure it have two arguments.
           if extension_node.arguments.size < 2
             message = if extension_node.arguments.size == 1
@@ -79,14 +98,6 @@ module RuboCop
             return
           end
 
-          # Find the name of the value SketchupExtension.new was assigned to.
-          assignment_node = extension_node.parent
-          if assignment_node.casgn_type?
-            extension_var = assignment_node.to_a[1]
-          else
-            extension_var = assignment_node.to_a[0]
-          end
-
           # Look for Sketchup.register and make sure it register the extension
           # object detected earlier.
           registered_vars = sketchup_register_extension(source_node).to_a

data/lib/rubocop/sketchup/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module SketchUp
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sketchup
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Trimble Inc, SketchUp Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-05 00:00:00.000000000 Z
+date: 2026-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64