steep 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1008a3723d59bab0d00afb4b385ee2752d8679461416eba84e48cc9ae479b0a4
-  data.tar.gz: 58c470fe9d8c619d9d0767a392ab6557b6dc50b007c6c99ff6ad27a79a88ecd4
+  metadata.gz: 9a954088d00de93ba0f69e38e5522cc4204f4463cb973babffacb2f50bc7cfc6
+  data.tar.gz: 2e31ce933c1969efc22e7615b4f20f765b061a35eed001bfaa261db3421e2811
 SHA512:
-  metadata.gz: 6f1074ca3634f9df53f361f78a4838912cb7420918f72afdb08e49ab9d64bbe97177780a54648526ff3947b36ab2f0fb2fec3fce73ed97ce0b835359c81ff52d
-  data.tar.gz: b1c5b3fb447832fb648a56b4d827592ba0ddd719e384795786e27201a32305ce36a0d93edde61c94a311708599dd7090359bc1f15ae04ef0fa3717bd897cb580
+  metadata.gz: 393ff10a5ecd1170f73fef996f0928a345cedec142c7492e6629d3ea3582721ac903d2a6920ae05272550f739d104fec2c3f719bc6c29e9a1091971bd886c780
+  data.tar.gz: 971c80dd2959bb36fc9c6505b1a70a4af713a696471db805fb37acda66fa1acb4ff3a846e912238b4e22994fc76a3d532dce07e194f7c4a8fc7e9fa8d28a2962

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master
 
+## 0.23.0 (2020-08-06)
+
+* Fix literal typing with hint ([#179](https://github.com/soutaro/steep/pull/179))
+* Fix literal type subtyping ([#178](https://github.com/soutaro/steep/pull/178))
+
 ## 0.22.0 (2020-08-03)
 
 * Improve signature validation ([#175](https://github.com/soutaro/steep/pull/175), [#177](https://github.com/soutaro/steep/pull/177))
@@ -51,7 +56,7 @@
 
 * Fix constant resolution ([#143](https://github.com/soutaro/steep/pull/143))
 * Fix RBS diagnostics line number in LSP ([#142](https://github.com/soutaro/steep/pull/142))
-* Fix crash caused by hover on `def` in LSP ([#140](https://github.com/soutaro/steep/pull/140)) 
+* Fix crash caused by hover on `def` in LSP ([#140](https://github.com/soutaro/steep/pull/140))
 
 ## 0.16.0 (2020-05-19)
 

data/lib/steep/ast/types/factory.rb

@@ -288,7 +288,7 @@ module Steep
         def expand_alias(type)
           unfolded = case type
                      when AST::Types::Name::Alias
-                       unfolded = unfold(type.name)
+                       unfold(type.name)
                      else
                        type
                      end

data/lib/steep/subtyping/check.rb

@@ -180,15 +180,6 @@ module Steep
               constraints: constraints
             )
 
-          when relation.sub_type.is_a?(AST::Types::Literal)
-            check(
-              Relation.new(sub_type: relation.sub_type.back_type, super_type: relation.super_type),
-              self_type: self_type,
-              assumption: assumption,
-              trace: trace,
-              constraints: constraints
-            )
-
           when relation.sub_type.is_a?(AST::Types::Union)
             results = relation.sub_type.types.map do |sub_type|
               check(Relation.new(sub_type: sub_type, super_type: relation.super_type),
@@ -386,6 +377,15 @@ module Steep
           when relation.sub_type.is_a?(AST::Types::Nil) && AST::Builtin::NilClass.instance_type?(relation.super_type)
             success(constraints: constraints)
 
+          when relation.sub_type.is_a?(AST::Types::Literal)
+            check(
+              Relation.new(sub_type: relation.sub_type.back_type, super_type: relation.super_type),
+              self_type: self_type,
+              assumption: assumption,
+              trace: trace,
+              constraints: constraints
+            )
+
           else
             failure(error: Result::Failure::UnknownPairError.new(relation: relation),
                     trace: trace)

data/lib/steep/type_construction.rb

@@ -638,7 +638,8 @@ module Steep
             when :__skip__
               add_typing(node, type: AST::Builtin.any_type)
             else
-              rhs_result = synthesize(rhs, hint: hint || context.lvar_env.declared_types[name]&.type)
+              hint ||= context.lvar_env.declared_types[name]&.type
+              rhs_result = synthesize(rhs, hint: hint)
 
               constr = rhs_result.constr.update_lvar_env do |lvar_env|
                 lvar_env.assign(name, node: node, type: rhs_result.type) do |declared_type, actual_type, result|
@@ -1062,7 +1063,7 @@ module Steep
 
         when :int
           yield_self do
-            literal_type = expand_alias(hint) {|hint_| test_literal_type(node.children[0], hint_) }
+            literal_type = test_literal_type(node.children[0], hint)
 
             if literal_type
               add_typing(node, type: literal_type)
@@ -1073,7 +1074,7 @@ module Steep
 
         when :sym
           yield_self do
-            literal_type = expand_alias(hint) {|hint| test_literal_type(node.children[0], hint) }
+            literal_type = test_literal_type(node.children[0], hint)
 
             if literal_type
               add_typing(node, type: literal_type)
@@ -1084,7 +1085,7 @@ module Steep
 
         when :str
           yield_self do
-            literal_type = expand_alias(hint) {|hint_| test_literal_type(node.children[0], hint_)}
+            literal_type = test_literal_type(node.children[0], hint)
 
             if literal_type
               add_typing(node, type: literal_type)
@@ -3022,14 +3023,15 @@ module Steep
     end
 
     def test_literal_type(literal, hint)
-      case hint
-      when AST::Types::Literal
-        if hint.value == literal
-          hint
-        end
-      when AST::Types::Union
-        if hint.types.any? {|ty| ty.is_a?(AST::Types::Literal) && ty.value == literal}
-          hint
+      if hint
+        case hint
+        when AST::Types::Any
+          nil
+        else
+          literal_type = AST::Types::Literal.new(value: literal, location: nil)
+          if check_relation(sub_type: literal_type, super_type: hint).success?
+            hint
+          end
         end
       end
     end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.22.0"
+  VERSION = "0.23.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser