steep 0.12.0 → 0.13.0

data/lib/steep/type_inference/context.rb

@@ -0,0 +1,107 @@
+module Steep
+  module TypeInference
+    class Context
+      class MethodContext
+        attr_reader :name
+        attr_reader :method
+        attr_reader :method_type
+        attr_reader :return_type
+        attr_reader :constructor
+        attr_reader :super_method
+
+        def initialize(name:, method:, method_type:, return_type:, constructor:, super_method:)
+          @name = name
+          @method = method
+          @return_type = return_type
+          @method_type = method_type
+          @constructor = constructor
+          @super_method = super_method
+        end
+
+        def block_type
+          method_type&.block
+        end
+      end
+
+      class BlockContext
+        attr_reader :body_type
+
+        def initialize(body_type:)
+          @body_type = body_type
+        end
+      end
+
+      class BreakContext
+        attr_reader :break_type
+        attr_reader :next_type
+
+        def initialize(break_type:, next_type:)
+          @break_type = break_type
+          @next_type = next_type
+        end
+      end
+
+      class ModuleContext
+        attr_reader :instance_type
+        attr_reader :module_type
+        attr_reader :defined_instance_methods
+        attr_reader :defined_module_methods
+        attr_reader :const_env
+        attr_reader :implement_name
+        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)
+          @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
+          const_env.context
+        end
+      end
+
+      attr_reader :method_context
+      attr_reader :block_context
+      attr_reader :break_context
+      attr_reader :module_context
+      attr_reader :self_type
+      attr_reader :type_env
+
+      def initialize(method_context:, block_context:, break_context:, module_context:, self_type:, type_env:)
+        @method_context = method_context
+        @block_context = block_context
+        @break_context = break_context
+        @module_context = module_context
+        @self_type = self_type
+        @type_env = type_env
+      end
+
+      def with(method_context: self.method_context,
+               block_context: self.block_context,
+               break_context: self.break_context,
+               module_context: self.module_context,
+               self_type: self.self_type,
+               type_env: self.type_env)
+        self.class.new(
+          method_context: method_context,
+          block_context: block_context,
+          break_context: break_context,
+          module_context: module_context,
+          self_type: self_type,
+          type_env: type_env
+        )
+      end
+    end
+  end
+end

data/lib/steep/typing.rb

@@ -2,12 +2,11 @@ module Steep
   class Typing
     attr_reader :errors
     attr_reader :typing
-    attr_reader :nodes
-    attr_reader :var_typing
     attr_reader :parent
     attr_reader :parent_last_update
     attr_reader :last_update
     attr_reader :should_update
+    attr_reader :contexts
 
     def initialize(parent: nil, parent_last_update: parent&.last_update)
       @parent = parent
@@ -16,18 +15,17 @@ module Steep
       @should_update = false
 
       @errors = []
-      @nodes = {}
-      @var_typing = {}
-      @typing = {}
+      @typing = {}.compare_by_identity
+      @contexts = {}.compare_by_identity
     end
 
     def add_error(error)
       errors << error
     end
 
-    def add_typing(node, type)
-      typing[node.__id__] = type
-      nodes[node.__id__] = node
+    def add_typing(node, type, context)
+      typing[node] = type
+      contexts[node] = context
 
       if should_update
         @last_update += 1
@@ -38,11 +36,11 @@ module Steep
     end
 
     def has_type?(node)
-      typing.key?(node.__id__)
+      typing.key?(node)
     end
 
     def type_of(node:)
-      type = typing[node.__id__]
+      type = typing[node]
 
       if type
         type
@@ -55,6 +53,20 @@ module Steep
       end
     end
 
+    def context_of(node:)
+      ctx = contexts[node]
+
+      if ctx
+        ctx
+      else
+        if parent
+          parent.context_of(node: node)
+        else
+          raise "Unknown node for context: #{node.inspect}"
+        end
+      end
+    end
+
     def dump(io)
       io.puts "Typing: "
       nodes.each_value do |node|
@@ -86,10 +98,8 @@ module Steep
       end
     end
 
-    def each_typing
-      nodes.each do |id, node|
-        yield node, typing[id]
-      end
+    def each_typing(&block)
+      typing.each(&block)
     end
 
     def save!
@@ -97,7 +107,7 @@ module Steep
       raise "Parent modified since new_child" unless parent.last_update == parent_last_update
 
       each_typing do |node, type|
-        parent.add_typing(node, type)
+        parent.add_typing(node, type, contexts[node])
       end
 
       errors.each do |error|

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -275,6 +275,7 @@ files:
 - lib/steep/project/dsl.rb
 - lib/steep/project/file.rb
 - lib/steep/project/file_loader.rb
+- lib/steep/project/hover_content.rb
 - lib/steep/project/options.rb
 - lib/steep/project/target.rb
 - lib/steep/signature/errors.rb
@@ -291,6 +292,7 @@ files:
 - lib/steep/type_construction.rb
 - lib/steep/type_inference/block_params.rb
 - lib/steep/type_inference/constant_env.rb
+- lib/steep/type_inference/context.rb
 - lib/steep/type_inference/send_args.rb
 - lib/steep/type_inference/type_env.rb
 - lib/steep/typing.rb