Support constant diff

Author: ksss

lib/rbs/diff.rb

@@ -85,16 +85,18 @@ def initialize(type_name:, library_options:, after_path: [], before_path: [])
     def each_diff(&block)
       return to_enum(:each_diff) unless block
 
-      before_instance_methods, before_singleton_methods = build_methods(@before_path)
-      after_instance_methods, after_singleton_methods = build_methods(@after_path)
+      before_instance_methods, before_singleton_methods, before_constant_decls = build_methods(@before_path)
+      after_instance_methods, after_singleton_methods, after_constant_decls = build_methods(@after_path)
 
-      each_diff_by(:instance, before_instance_methods, after_instance_methods, &block)
-      each_diff_by(:singleton, before_singleton_methods, after_singleton_methods, &block)
+      each_diff_methods(:instance, before_instance_methods, after_instance_methods, &block)
+      each_diff_methods(:singleton, before_singleton_methods, after_singleton_methods, &block)
+
+      each_diff_constants(before_constant_decls, after_constant_decls, &block)
     end
 
     private
 
-    def each_diff_by(kind, before_methods, after_methods)
+    def each_diff_methods(kind, before_methods, after_methods)
       all_keys = before_methods.keys.to_set + after_methods.keys.to_set
       all_keys.each do |key|
         before = definition_method_to_s(key, kind, before_methods[key]) or next
@@ -105,6 +107,17 @@ def each_diff_by(kind, before_methods, after_methods)
       end
     end
 
+    def each_diff_constants(before_constant_decls, after_constant_decls)
+      all_keys = before_constant_decls.keys.to_set + after_constant_decls.keys.to_set
+      all_keys.each do |key|
+        before = constant_to_s(key, before_constant_decls[key]) or next
+        after = constant_to_s(key, after_constant_decls[key]) or next
+        next if before == after
+
+        yield before, after
+      end
+    end
+
     def build_methods(path)
       env = build_env(path)
       builder = build_builder(env)
@@ -121,8 +134,10 @@ def build_methods(path)
         RBS.logger.warn("#{path}: #{e.message}")
         {}
       end
+      type_name_to_s = @type_name.to_s
+      constant_decls = env.constant_decls.select { |key| key.to_s.start_with?(type_name_to_s) }
 
-      [ instance_methods, singleton_methods ]
+      [ instance_methods, singleton_methods, constant_decls ]
     end
 
     def build_env(path)
@@ -147,7 +162,15 @@ def definition_method_to_s(key, kind, definition_method)
           "def #{prefix}#{key}: #{definition_method.method_types.join(" | ")}"
         end
       else
-        +"-"
+        "-"
+      end
+    end
+
+    def constant_to_s(key, constant)
+      if constant
+        "#{key}: #{constant.decl.type}"
+      else
+        "-"
       end
     end
   end

test/rbs/diff_test.rb

@@ -22,6 +22,12 @@ def bar: () -> void
           def self.baz: () -> (Integer | String)
           def qux: (untyped) -> untyped
           def quux: () -> void
+
+          SAME_MOD_SAME_VALUE: 1
+          SAME_MOD_OTHER_VALUE: 2
+          SAME_MOD_BEFORE_ONLY: 3
+          OTHER_MOD_SAME_VALUE: 4
+          OTHER_MOD_OTHER_VALUE: 5
         end
       RBS
 
@@ -30,6 +36,8 @@ def quux: () -> void
       (dir2 / 'after.rbs').write(<<~RBS)
         module Bar
           def bar: () -> void
+          OTHER_MOD_SAME_VALUE: 4
+          OTHER_MOD_OTHER_VALUE: Array[Integer]
         end
 
         module Baz
@@ -40,6 +48,9 @@ class Foo
           include Bar
           extend Baz
           alias quux bar
+          SAME_MOD_SAME_VALUE: 1
+          SAME_MOD_OTHER_VALUE: String
+          SAME_MOD_AFTER_ONLY: 3
         end
       RBS
 
@@ -55,7 +66,12 @@ class Foo
       assert_equal [
         ["def qux: (untyped) -> untyped", "-"],
         ["def quux: () -> void", "alias quux bar"],
-        ["def self.baz: () -> (::Integer | ::String)", "def self.baz: (::Integer) -> ::Integer?"]
+        ["def self.baz: () -> (::Integer | ::String)", "def self.baz: (::Integer) -> ::Integer?"],
+        ["::Foo::SAME_MOD_OTHER_VALUE: 2", "::Foo::SAME_MOD_OTHER_VALUE: String"],
+        ["::Foo::SAME_MOD_BEFORE_ONLY: 3", "-"],
+        ["::Foo::OTHER_MOD_SAME_VALUE: 4", "-"],
+        ["::Foo::OTHER_MOD_OTHER_VALUE: 5", "-"],
+        ["-", "::Foo::SAME_MOD_AFTER_ONLY: 3"]
       ], results
     end
   end