rbs 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2559e695400fc8d1c360aa80b1a9065f5ea0ae24b59faa91907102f7fc46d572
-  data.tar.gz: e32722dcf716317553827e15b3232e8971f3d613c3b2bd7f71a5b902e2fef8b3
+  metadata.gz: 8ffec56ef44262c857185b7700f17f586b8e1e857776eedc75663a0021246f2e
+  data.tar.gz: 53cf7480a2793dd8228cd385c40d10e767b7cb32d0216c302b8aee7c21423d3c
 SHA512:
-  metadata.gz: c26e77f6a2506cf1414d12aa74e1783bf8f7ca40d5e803831c9deb2e8b290954db119bb89fa8d26a24b76e8713b26fdd6535e557e59788808addbc3e96a07ec8
-  data.tar.gz: 10a1e4a16e16f627bda62c565258b84bb830c7a85b0d74acbd9187094626b3e76eca4f8bacc5d77758755bfa82d5dacdd7dc6a374b53f3778d0421b449013d40
+  metadata.gz: fa78c2ec3746d5803709fc999737d29d5bb072cddc6ad1b3af94d25bf3f3aa24b61051a1e3753095f30393fd7378fc88420d05a8bb6fdea38ca355072f8c3ebc
+  data.tar.gz: bd355d3d6b3e8df2fb6e06608aaa3d12182c1e3a6d5add565c1f98032faa65c8d003d3e13ce409d22767b1cb64ad0964501cb68801488a5c4c1db01b8e075bca

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.3.0 (2020-05-20)
+
+* Fix constant resolution [#288](https://github.com/ruby/rbs/pull/288)
+
+## 0.2.0
+
 * The first release of RBS gem.
 
 ## 0.1.0

data/lib/rbs/cli.rb

@@ -362,7 +362,7 @@ module RBS
       name = Namespace.parse(args[0]).to_type_name
       stdout.puts "Constant name: #{name}"
 
-      constant = table.resolve_constant_reference(name, context: namespace)
+      constant = table.resolve_constant_reference(name, context: namespace.ascend.to_a)
 
       if constant
         stdout.puts " => #{constant.name}: #{constant.type}"

data/lib/rbs/constant_table.rb

@@ -30,17 +30,18 @@ module RBS
     end
 
     def resolve_constant_reference(name, context:)
+      raise "Context cannot be empty: Specify `[Namespace.root]`" if context.empty?
+
       head, *tail = split_name(name)
 
       head_constant = case
                       when name.absolute?
                         name_to_constant(TypeName.new(name: head, namespace: Namespace.root))
-                      when !context || context.empty?
+                      when context == [Namespace.root]
                         name_to_constant(TypeName.new(name: head, namespace: Namespace.root))
                       else
                         resolve_constant_reference_context(head, context: context) ||
-                          resolve_constant_reference_inherit(head,
-                                                             scopes: constant_scopes(context.to_type_name))
+                          resolve_constant_reference_inherit(head, scopes: constant_scopes(context.first.to_type_name))
                       end
 
       if head_constant
@@ -53,11 +54,11 @@ module RBS
     end
 
     def resolve_constant_reference_context(name, context:)
-      if context.empty?
-        nil
-      else
-        name_to_constant(TypeName.new(name: name, namespace: context)) ||
-          resolve_constant_reference_context(name, context: context.parent)
+      head, *tail = context
+
+      if head
+        name_to_constant(TypeName.new(name: name, namespace: head)) ||
+          resolve_constant_reference_context(name, context: tail)
       end
     end
 
@@ -125,7 +126,7 @@ module RBS
 
         scopes.unshift namespace
       else
-        raise "Unexpected declaration: #{name}"
+        raise "Unexpected declaration: #{name} (#{decl.class})"
       end
 
       env.each_extension(name).sort_by {|e| e.extension_name.to_s }.each do |extension|

data/lib/rbs/namespace.rb

@@ -87,5 +87,23 @@ module RBS
         new(path: string.split("::").map(&:to_sym), absolute: false)
       end
     end
+
+
+    def ascend
+      if block_given?
+        current = self
+
+        until current.empty?
+          yield current
+          current = current.parent
+        end
+
+        yield current
+
+        self
+      else
+        enum_for(:ascend)
+      end
+    end
   end
 end

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler