Support RBS::AST::Members::ClassInstanceVariable

Author: mame

lib/typeprof/core/ast.rb

@@ -414,7 +414,9 @@ def self.create_rbs_member(raw_decl, lenv)
       when RBS::AST::Declarations::Base
         self.create_rbs_decl(raw_decl, lenv)
       when RBS::AST::Members::InstanceVariable
-        SigInstanceVariableNode.new(raw_decl, lenv)
+        SigInstanceVariableNode.new(raw_decl, lenv, false)
+      when RBS::AST::Members::ClassInstanceVariable
+        SigInstanceVariableNode.new(raw_decl, lenv, true)
       else
         raise "unsupported: #{ raw_decl.class }"
       end

lib/typeprof/core/ast/sig_decl.rb

@@ -435,33 +435,34 @@ def install0(genv)
     end
 
     class SigInstanceVariableNode < Node
-      def initialize(raw_decl, lenv)
+      def initialize(raw_decl, lenv, class_scope)
         super(raw_decl, lenv)
         @var = raw_decl.name
         @cpath = lenv.cref.cpath
+        @class_scope = class_scope
         @type = AST.create_rbs_type(raw_decl.type, lenv)
       end
 
-      attr_reader :cpath, :type
+      attr_reader :cpath, :class_scope, :type
       def subnodes = { type: }
-      def attrs = { cpath: }
+      def attrs = { cpath:, class_scope: }
 
       def define0(genv)
         @type.define(genv)
-        mod = genv.resolve_ivar(cpath, false, @var)
+        mod = genv.resolve_ivar(cpath, @class_scope, @var)
         mod.add_decl(self)
         mod
       end
 
       def define_copy(genv)
-        mod = genv.resolve_ivar(cpath, false, @var)
+        mod = genv.resolve_ivar(cpath, @class_scope, @var)
         mod.add_decl(self)
         mod.remove_decl(@prev_node)
         super(genv)
       end
 
       def undefine0(genv)
-        genv.resolve_ivar(cpath, false, @var).remove_decl(self)
+        genv.resolve_ivar(cpath, @class_scope, @var).remove_decl(self)
         @type.undefine(genv)
       end
 

scenario/rbs/ivar.rb

@@ -1,16 +1,21 @@
 ## update: test.rbs
 class Foo
   @foo: String
+  self.@foo: Integer
 end
 
 ## update: test.rb
 class Foo
   def check
     @foo
   end
+  def self.check
+    @foo
+  end
 end
 
 ## assert
 class Foo
   def check: -> String
+  def self.check: -> Integer
 end