steep 0.50.0 → 0.51.0

data/lib/steep/type_inference/constant_env.rb

@@ -2,33 +2,51 @@ module Steep
   module TypeInference
     class ConstantEnv
       attr_reader :context
-      attr_reader :cache
       attr_reader :factory
-      attr_reader :table
+      attr_reader :resolver
 
       # ConstantEnv receives an TypeName as a context, not a Namespace, because this is a simulation of Ruby.
       # Any namespace is a module or class.
-      def initialize(factory:, context:)
+      def initialize(factory:, context:, resolver:)
         @cache = {}
         @factory = factory
         @context = context
-        @table = RBS::ConstantTable.new(builder: factory.definition_builder)
+        @resolver = resolver
       end
 
-      def lookup_constant(name)
-        table.resolve_constant_reference(name, context: context)
+      def resolve(name)
+        decompose_constant(
+          resolver.resolve(name, context: context)
+        )
       end
 
-      def lookup(name)
-        cache[name] ||= begin
-          constant = lookup_constant(name)
+      def toplevel(name)
+        decompose_constant(
+          resolver.table.toplevel[name]
+        )
+      end
+
+      def constants
+        resolver.constants(context).transform_values {|c| decompose_constant(c) }
+      end
+
+      def resolve_child(module_name, constant_name)
+        decompose_constant(
+          resolver.resolve_child(module_name, constant_name)
+        )
+      end
+
+      def children(module_name)
+        resolver.children(module_name).transform_values {|c| decompose_constant(c) }
+      end
 
-          if constant
-            factory.type(constant.type)
-          end
-        rescue => exn
-          Steep.logger.debug "Looking up a constant failed: name=#{name}, context=[#{context.join(", ")}], error=#{exn.inspect}"
-          nil
+      def decompose_constant(constant)
+        if constant
+          [
+            factory.type(constant.type),
+            constant.name,
+            constant.entry
+          ]
         end
       end
     end

data/lib/steep/type_inference/context.rb

@@ -48,26 +48,23 @@ module Steep
         attr_reader :defined_module_methods
         attr_reader :const_env
         attr_reader :implement_name
-        attr_reader :namespaces
-        attr_reader :current_namespace
         attr_reader :class_name
         attr_reader :instance_definition
         attr_reader :module_definition
 
-        def initialize(instance_type:, module_type:, implement_name:, current_namespace:, const_env:, class_name:, instance_definition: nil, module_definition: nil)
+        def initialize(instance_type:, module_type:, implement_name:, const_env:, class_name:, instance_definition: nil, module_definition: nil)
           @instance_type = instance_type
           @module_type = module_type
           @defined_instance_methods = Set.new
           @defined_module_methods = Set.new
           @implement_name = implement_name
-          @current_namespace = current_namespace
           @const_env = const_env
           @class_name = class_name
           @instance_definition = instance_definition
           @module_definition = module_definition
         end
 
-        def const_context
+        def nesting
           const_env.context
         end
 
@@ -83,7 +80,6 @@ module Steep
           instance_type: self.instance_type,
           module_type: self.module_type,
           implement_name: self.implement_name,
-          current_namespace: self.current_namespace,
           const_env: self.const_env,
           class_name: self.class_name,
           instance_definition: self.instance_definition,
@@ -93,7 +89,6 @@ module Steep
             instance_type: instance_type,
             module_type: module_type,
             implement_name: implement_name,
-            current_namespace: current_namespace,
             const_env: const_env,
             class_name: class_name,
             instance_definition: instance_definition,
@@ -175,6 +170,10 @@ module Steep
           variable_context: variable_context
         )
       end
+
+      def env
+        type_env.subtyping.factory.env
+      end
     end
   end
 end

data/lib/steep/type_inference/type_env.rb

@@ -44,18 +44,6 @@ module Steep
           merge!(original_env: env.gvar_types, override_env: gvar_types, self_type: self_type, instance_type: instance_type, class_type: class_type, &block)
 
           const_types.each do |name, annotated_type|
-            original_type = self.const_types[name] || const_env.lookup(name)
-            if original_type
-              assert_annotation(
-                name,
-                original_type: original_type,
-                annotated_type: annotated_type,
-                self_type: self_type,
-                instance_type: instance_type,
-                class_type: class_type,
-                &block
-              )
-            end
             env.const_types[name] = annotated_type
           end
         end
@@ -70,14 +58,8 @@ module Steep
           if const_types.key?(const)
             const_types[const]
           else
-            const_env.lookup(const).yield_self do |type|
-              if type
-                type
-              else
-                yield
-                AST::Types::Any.new
-              end
-            end
+            yield
+            AST::Types::Any.new
           end
         else
           lookup_dictionary(ivar: ivar, gvar: gvar) do |var_name, dictionary|
@@ -105,40 +87,20 @@ module Steep
       # @type method assign: (const: TypeName, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
       #                    | (gvar: Symbol, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
       #                    | (ivar: Symbol, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
-      def assign(const: nil, gvar: nil, ivar: nil, type:, self_type:, instance_type:, class_type:, &block)
-        case
-        when const
-          yield_self do
-            const_type = const_types[const] || const_env.lookup(const)
-            if const_type
-              assert_assign(
-                var_type: const_type,
-                lhs_type: type,
-                self_type: self_type,
-                instance_type: instance_type,
-                class_type: class_type,
-                &block
-              )
-            else
-              yield nil
-              AST::Types::Any.new
-            end
-          end
-        else
-          lookup_dictionary(ivar: ivar, gvar: gvar) do |var_name, dictionary|
-            if dictionary.key?(var_name)
-              assert_assign(
-                var_type: dictionary[var_name],
-                lhs_type: type,
-                self_type: self_type,
-                instance_type: instance_type,
-                class_type: class_type,
-                &block
-              )
-            else
-              yield nil
-              AST::Types::Any.new
-            end
+      def assign(gvar: nil, ivar: nil, type:, self_type:, instance_type:, class_type:, &block)
+        lookup_dictionary(ivar: ivar, gvar: gvar) do |var_name, dictionary|
+          if dictionary.key?(var_name)
+            assert_assign(
+              var_type: dictionary[var_name],
+              lhs_type: type,
+              self_type: self_type,
+              instance_type: instance_type,
+              class_type: class_type,
+              &block
+            )
+          else
+            yield nil
+            AST::Types::Any.new
           end
         end
       end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.50.0"
+  VERSION = "0.51.0"
 end

data/smoke/const/test_expectations.yml

@@ -24,8 +24,18 @@
         line: 6
         character: 5
     severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
+    message: 'Cannot find the declaration of constant: `B`'
+    code: Ruby::UnknownConstant
+  - range:
+      start:
+        line: 8
+        character: 7
+      end:
+        line: 8
+        character: 8
+    severity: ERROR
+    message: 'Cannot find the declaration of module: `X`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 14
@@ -49,8 +59,8 @@
         line: 16
         character: 9
     severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
+    message: 'Cannot find the declaration of constant: `B`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 23
@@ -69,23 +79,18 @@
   - range:
       start:
         line: 26
-        character: 4
-      end:
-        line: 26
-        character: 10
-    severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
-  - range:
-      start:
-        line: 26
-        character: 4
+        character: 0
       end:
         line: 26
         character: 15
     severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
+    message: |-
+      Cannot assign a value of type `::Integer` to a variable of type `::String`
+        ::Integer <: ::String
+          ::Numeric <: ::String
+            ::Object <: ::String
+              ::BasicObject <: ::String
+    code: Ruby::IncompatibleAssignment
   - range:
       start:
         line: 27
@@ -125,5 +130,5 @@
         line: 5
         character: 8
     severity: ERROR
-    message: Cannot find the declaration of constant `Baz2`
-    code: Ruby::UnknownConstantAssigned
+    message: 'Cannot find the declaration of constant: `Baz2`'
+    code: Ruby::UnknownConstant

data/smoke/diagnostics/test_expectations.yml

@@ -65,6 +65,16 @@
     code: Ruby::BreakTypeMismatch
 - file: different_method_parameter_kind.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 34
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `DifferentMethodParameterKind`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 3
@@ -207,6 +217,16 @@
     code: Ruby::IncompatibleAssignment
 - file: method_arity_mismatch.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 25
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `MethodArityMismatch`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 3
@@ -230,6 +250,16 @@
     code: Ruby::MethodArityMismatch
 - file: method_body_type_mismatch.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 28
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `MethodBodyTypeMismatch`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 3
@@ -258,6 +288,16 @@
     code: Ruby::MethodDefinitionMissing
 - file: method_parameter_mismatch.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 29
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `MethodParameterMismatch`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 3
@@ -293,6 +333,16 @@
     code: Ruby::MethodParameterMismatch
 - file: method_return_type_annotation_mismatch.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 40
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `MethodReturnTypeAnnotationMismatch`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 3
@@ -358,6 +408,16 @@
     code: Ruby::RequiredBlockMissing
 - file: return_type_mismatch.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 24
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `ReturnTypeMismatch`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 4
@@ -445,6 +505,16 @@
     code: Ruby::UnexpectedKeywordArgument
 - file: unexpected_yield.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 21
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `UnexpectedYield`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 4
@@ -475,8 +545,8 @@
         line: 2
         character: 5
     severity: ERROR
-    message: Cannot find the declaration of constant `FOO`
-    code: Ruby::UnknownConstantAssigned
+    message: 'Cannot find the declaration of constant: `FOO`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 4
@@ -485,28 +555,28 @@
         line: 4
         character: 5
     severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
+    message: 'Cannot find the declaration of constant: `FOO`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 4
-        character: 2
+        character: 7
       end:
         line: 4
         character: 10
     severity: ERROR
-    message: Cannot find the declaration of constant `FOO::BAR`
-    code: Ruby::UnknownConstantAssigned
+    message: 'Cannot find the declaration of constant: `BAR`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 6
-        character: 2
+        character: 4
       end:
         line: 6
         character: 7
     severity: ERROR
-    message: Cannot find the declaration of constant `::FOO`
-    code: Ruby::UnknownConstantAssigned
+    message: 'Cannot find the declaration of constant: `FOO`'
+    code: Ruby::UnknownConstant
 - file: unresolved_overloading.rb
   diagnostics:
   - range:

data/smoke/integer/test_expectations.yml

@@ -21,6 +21,16 @@
     severity: ERROR
     message: Type `::Integer` does not have method `foo`
     code: Ruby::NoMethod
+  - range:
+      start:
+        line: 9
+        character: 6
+      end:
+        line: 9
+        character: 15
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `WithToInt`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 12
@@ -29,8 +39,8 @@
         line: 12
         character: 29
     severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
+    message: 'Cannot find the declaration of constant: `WithToInt`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 13
@@ -41,6 +51,16 @@
     severity: ERROR
     message: Type `::Integer` does not have method `foo`
     code: Ruby::NoMethod
+  - range:
+      start:
+        line: 15
+        character: 6
+      end:
+        line: 15
+        character: 13
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `WithToI`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 18
@@ -49,8 +69,8 @@
         line: 18
         character: 27
     severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
+    message: 'Cannot find the declaration of constant: `WithToI`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 19

data/smoke/method/test_expectations.yml

@@ -74,6 +74,16 @@
     code: Ruby::IncompatibleAssignment
 - file: b.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 7
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `A`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 4
@@ -89,3 +99,23 @@
             ::Object <: ::Integer
               ::BasicObject <: ::Integer
     code: Ruby::MethodBodyTypeMismatch
+  - range:
+      start:
+        line: 9
+        character: 6
+      end:
+        line: 9
+        character: 7
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `B`'
+    code: Ruby::UnknownConstant
+  - range:
+      start:
+        line: 18
+        character: 6
+      end:
+        line: 18
+        character: 7
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `C`'
+    code: Ruby::UnknownConstant

data/smoke/regression/test_expectations.yml

@@ -1,4 +1,28 @@
 ---
+- file: array.rb
+  diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 9
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `Foo`'
+    code: Ruby::UnknownConstant
+- file: hash.rb
+  diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 9
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `Foo`'
+    code: Ruby::UnknownConstant
 - file: issue_332.rb
   diagnostics:
   - range:

data/smoke/yield/test_expectations.yml

@@ -1,6 +1,16 @@
 ---
 - file: a.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 7
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `A`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 6
@@ -52,6 +62,16 @@
     code: Ruby::UnexpectedYield
 - file: b.rb
   diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 6
+      end:
+        line: 1
+        character: 9
+    severity: ERROR
+    message: 'Cannot find the declaration of class: `Foo`'
+    code: Ruby::UnknownConstant
   - range:
       start:
         line: 4

data/steep.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rainbow", ">= 2.2.2", "< 4.0"
   spec.add_runtime_dependency "listen", "~> 3.0"
   spec.add_runtime_dependency "language_server-protocol", ">= 3.15", "< 4.0"
-  spec.add_runtime_dependency "rbs", ">= 2.2.0"
+  spec.add_runtime_dependency "rbs", ">= 2.3.0"
   spec.add_runtime_dependency "parallel", ">= 1.0.0"
   spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.51.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,7 @@ files:
 - lib/steep/ast/types/var.rb
 - lib/steep/ast/types/void.rb
 - lib/steep/cli.rb
+- lib/steep/diagnostic/deprecated/unknown_constant_assigned.rb
 - lib/steep/diagnostic/helper.rb
 - lib/steep/diagnostic/lsp_formatter.rb
 - lib/steep/diagnostic/ruby.rb