fix: 存在ガードの解決範囲を拡張 / Resolve loop and qualified guards

Author: inakaegg

CHANGELOG.md

@@ -9,7 +9,7 @@
 - Required options in eval mode accept space-separated lambda and unary expressions without consuming known option tokens as values.
 - Constant discovery now includes classes and modules assigned with `Class.new` / `Module.new` during the target file load.
 - Repeated loads retain assigned constant aliases when the source file is unchanged.
-- Repeated loads retain aliases from completed direct, multiple, and `const_set` assignments or matching fully qualified existence guards, including receivers found by Ruby's lexical constant fallback, without reviving failed assignments or aliases behind disabled conditions.
+- Repeated loads retain aliases from completed direct, multiple, and `const_set` assignments or matching fully qualified existence guards, including loop initializers and receivers found by Ruby's lexical constant fallback, without reviving failed assignments or aliases behind disabled conditions.
 - Constant discovery analyzes the preloaded source without triggering autoloads, so inactive autoload branches and self-removing target files do not add side effects or fail after a successful load.
 - Constructor arity errors raised by `--new` are now wrapped in Rubycli's user-facing runner error.
 - Framework argument errors raised by constructors are also wrapped in the same user-facing runner error.

lib/rubycli/constant_capture.rb

@@ -447,6 +447,10 @@ def guarded_condition(context)
         [context[1], true]
       when :unless_mod
         [context[1], false]
+      when :while, :while_mod
+        [context[1], true]
+      when :until, :until_mod
+        [context[1], false]
       when :ifop
         [context[2], context[1] == :then]
       when :binary
@@ -594,7 +598,7 @@ def constant_name_from_node(node, namespace)
       when :@const
         (namespace + [node[1]]).join('::')
       when :const_path_field, :const_path_ref
-        parent_name = constant_name_from_node(node[1], namespace)
+        parent_name = receiver_constant_name_from_node(node[1], namespace)
         child_name = node.dig(2, 1)
         [parent_name, child_name].compact.join('::')
       when :top_const_field, :top_const_ref

test/constant_capture_test.rb

@@ -773,6 +773,61 @@ module CaptureEquivalentGuardOwner; end
     end
   end
 
+  def test_retains_aliases_initialized_by_loop_existence_guards
+    skip 'Ruby 2.x does not reliably emit loop-condition line events' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0')
+
+    capture = Rubycli::ConstantCapture.new
+    Tempfile.create(['loop_guarded_aliases', '.rb']) do |file|
+      file.write(<<~RUBY)
+        module CaptureLoopGuardSource
+          def self.run; end
+        end
+        while !defined?(CaptureWhileGuardAlias)
+          CaptureWhileGuardAlias = CaptureLoopGuardSource
+        end
+        CaptureUntilGuardAlias = CaptureLoopGuardSource until defined?(CaptureUntilGuardAlias)
+      RUBY
+      file.flush
+
+      2.times do
+        capture_io { capture.capture(file.path) { load file.path } }
+        assert_includes capture.constants_for(file.path), 'CaptureWhileGuardAlias'
+        assert_includes capture.constants_for(file.path), 'CaptureUntilGuardAlias'
+      end
+    ensure
+      cleanup_constant(:CaptureWhileGuardAlias)
+      cleanup_constant(:CaptureUntilGuardAlias)
+      cleanup_constant(:CaptureLoopGuardSource)
+    end
+  end
+
+  def test_retains_namespace_qualified_defined_guard
+    capture = Rubycli::ConstantCapture.new
+    Tempfile.create(['namespace_qualified_guard', '.rb']) do |file|
+      file.write(<<~RUBY)
+        module CaptureQualifiedGuardSource
+          def self.run; end
+        end
+        module CaptureQualifiedGuardNamespace
+          Runner = CaptureQualifiedGuardSource unless defined?(CaptureQualifiedGuardNamespace::Runner)
+        end
+      RUBY
+      file.flush
+
+      2.times do
+        capture_io { capture.capture(file.path) { load file.path } }
+        assert_includes capture.constants_for(file.path), 'CaptureQualifiedGuardNamespace::Runner'
+      end
+    ensure
+      if Object.const_defined?(:CaptureQualifiedGuardNamespace)
+        owner = Object.const_get(:CaptureQualifiedGuardNamespace)
+        owner.send(:remove_const, :Runner) if owner.const_defined?(:Runner, false)
+      end
+      cleanup_constant(:CaptureQualifiedGuardNamespace)
+      cleanup_constant(:CaptureQualifiedGuardSource)
+    end
+  end
+
   def test_does_not_retain_const_set_moved_into_uninvoked_method
     capture = Rubycli::ConstantCapture.new
     Tempfile.create(['deferred_const_set_alias', '.rb']) do |file|