steep 0.15.0 → 0.17.0

data/lib/steep/type_construction.rb

@@ -235,6 +235,9 @@ module Steep
       new_module_name = Names::Module.from_node(node.children.first) or raise "Unexpected module name: #{node.children.first}"
       new_namespace = nested_namespace_for_module(new_module_name)
 
+      const_context = [new_namespace] + self.module_context.const_env.context
+      module_const_env = TypeInference::ConstantEnv.new(factory: checker.factory, context: const_context)
+
       annots = source.annotations(block: node, factory: checker.factory, current_module: new_namespace)
       module_type = AST::Builtin::Module.instance_type
 
@@ -292,13 +295,6 @@ module Steep
         module_type = annots.module_type
       end
 
-      const_context = if new_namespace.empty?
-                        nil
-                      else
-                        Names::Module.new(name: new_namespace.path.last, namespace: new_namespace.parent)
-                      end
-      module_const_env = TypeInference::ConstantEnv.new(factory: checker.factory, context: const_context)
-
       module_context_ = TypeInference::Context::ModuleContext.new(
         instance_type: instance_type,
         module_type: annots.self_type || module_type,
@@ -397,11 +393,7 @@ module Steep
         module_type = annots.module_type
       end
 
-      const_context = if new_namespace.empty?
-                        nil
-                      else
-                        Names::Module.new(name: new_namespace.path.last, namespace: new_namespace.parent)
-                      end
+      const_context = [new_namespace] + self.module_context.const_env.context
       class_const_env = TypeInference::ConstantEnv.new(factory: checker.factory, context: const_context)
 
       module_context = TypeInference::Context::ModuleContext.new(
@@ -1045,10 +1037,10 @@ module Steep
               case child.type
               when :pair
                 key, value = child.children
-                key_types << synthesize(key).type.yield_self do |type|
+                key_types << synthesize(key, hint: key_hint).type.yield_self do |type|
                   select_super_type(type, key_hint)
                 end
-                value_types << synthesize(value).type.yield_self do |type|
+                value_types << synthesize(value, hint: value_hint).type.yield_self do |type|
                   select_super_type(type, value_hint)
                 end
               when :kwsplat
@@ -1128,6 +1120,7 @@ module Steep
 
         when :const
           const_name = Names::Module.from_node(node)
+
           if const_name
             type = type_env.get(const: const_name) do
               fallback_to_any node
@@ -1141,7 +1134,8 @@ module Steep
           yield_self do
             const_name = Names::Module.from_node(node)
             if const_name
-              value_type = synthesize(node.children.last).type
+              const_type = type_env.get(const: const_name) {}
+              value_type = synthesize(node.children.last, hint: const_type).type
               type = type_env.assign(const: const_name, type: value_type, self_type: self_type) do |error|
                 case error
                 when Subtyping::Result::Failure
@@ -1262,7 +1256,7 @@ module Steep
                       end
                     end
                   else
-                    [select_super_type(synthesize(e).type, element_hint)]
+                    [select_super_type(synthesize(e, hint: element_hint).type, element_hint)]
                   end
                 end
                 array_type = AST::Builtin::Array.instance_type(AST::Types::Union.build(types: element_types))
@@ -2729,10 +2723,10 @@ module Steep
     end
 
     def nested_namespace_for_module(module_name)
-      if module_name.relative? && module_name.namespace.empty?
-        current_namespace.append(module_name.name)
+      if module_name.relative?
+        (current_namespace + module_name.namespace).append(module_name.name)
       else
-        current_namespace
+        module_name
       end
     end
 

data/lib/steep/type_inference/constant_env.rb

@@ -15,26 +15,18 @@ module Steep
         @table = RBS::ConstantTable.new(builder: factory.definition_builder)
       end
 
-      def namespace
-        @namespace ||= if context
-                         context.namespace.append(context.name)
-                       else
-                         AST::Namespace.root
-                       end
-      end
-
       def lookup(name)
         cache[name] ||= begin
           constant = table.resolve_constant_reference(
             factory.type_name_1(name),
-            context: factory.namespace_1(namespace)
+            context: context.map {|namespace| factory.namespace_1(namespace) }
           )
 
           if constant
             factory.type(constant.type)
           end
         rescue => exn
-          Steep.logger.error "Looking up a constant failed: name=#{name}, context=#{context}, error=#{exn.inspect}"
+          Steep.logger.error "Looking up a constant failed: name=#{name}, context=[#{context.join(", ")}], error=#{exn.inspect}"
           nil
         end
       end

data/lib/steep/type_inference/context.rb

@@ -48,6 +48,7 @@ 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

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.15.0"
+  VERSION = "0.17.0"
 end

data/steep.gemspec

@@ -14,14 +14,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/soutaro/steep"
   spec.license       = 'MIT'
 
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/soutaro/steep"
+  spec.metadata["changelog_uri"] = "https://github.com/soutaro/steep/blob/master/CHANGELOG.md"
+
   spec.files         = `git ls-files -z`.split("\x0").reject {|f|
     f.match(%r{^(test|spec|features)/})
-  } + Dir.chdir("vendor/ruby-signature") {
-    `git ls-files -z`.split("\x0")
-      .reject {|f| f.match(%r{^(test|spec|features)/}) }
-      .map {|f| File.join("vendor/ruby-signature", f) }
   }
-  spec.files         << "vendor/ruby-signature/lib/rbs/parser.rb"
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -33,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "racc", "~> 1.4"
-  spec.add_development_dependency "minitest-reporters", "~> 1.3.6"
+  spec.add_development_dependency "minitest-reporters", "~> 1.4.2"
   spec.add_development_dependency "minitest-hooks", "~> 1.5.0"
 
   spec.add_runtime_dependency "parser", "~> 2.7.0"
@@ -41,6 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport", ">= 5.1"
   spec.add_runtime_dependency "rainbow", ">= 2.2.2", "< 4.0"
   spec.add_runtime_dependency "listen", "~> 3.1"
-  spec.add_runtime_dependency "pry", "~> 0.12.2"
-  spec.add_runtime_dependency "language_server-protocol", "~> 3.14.0.1"
+  spec.add_runtime_dependency "language_server-protocol", "~> 3.14.0.2"
+  spec.add_runtime_dependency "rbs", "~> 0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: minitest-hooks
   requirement: !ruby/object:Gem::Requirement
@@ -171,38 +171,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 3.14.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 3.14.0.2
 - !ruby/object:Gem::Dependency
-  name: language_server-protocol
+  name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.0.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.0.1
+        version: 0.3.1
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com
 executables:
-- rbs
 - steep
 extensions: []
 extra_rdoc_files: []
@@ -219,7 +218,6 @@ files:
 - bin/console
 - bin/setup
 - bin/smoke_runner.rb
-- exe/rbs
 - exe/steep
 - lib/steep.rb
 - lib/steep/annotation_parser.rb
@@ -263,6 +261,7 @@ files:
 - lib/steep/drivers/validate.rb
 - lib/steep/drivers/vendor.rb
 - lib/steep/drivers/watch.rb
+- lib/steep/drivers/worker.rb
 - lib/steep/errors.rb
 - lib/steep/interface/interface.rb
 - lib/steep/interface/method.rb
@@ -277,6 +276,13 @@ files:
 - lib/steep/project/hover_content.rb
 - lib/steep/project/options.rb
 - lib/steep/project/target.rb
+- lib/steep/server/base_worker.rb
+- lib/steep/server/code_worker.rb
+- lib/steep/server/interaction_worker.rb
+- lib/steep/server/master.rb
+- lib/steep/server/signature_worker.rb
+- lib/steep/server/utils.rb
+- lib/steep/server/worker_process.rb
 - lib/steep/signature/errors.rb
 - lib/steep/signature/validator.rb
 - lib/steep/source.rb
@@ -429,139 +435,13 @@ files:
 - smoke/yield/Steepfile
 - smoke/yield/a.rb
 - steep.gemspec
-- vendor/ruby-signature/.github/workflows/ruby.yml
-- vendor/ruby-signature/.gitignore
-- vendor/ruby-signature/.rubocop.yml
-- vendor/ruby-signature/BSDL
-- vendor/ruby-signature/COPYING
-- vendor/ruby-signature/Gemfile
-- vendor/ruby-signature/README.md
-- vendor/ruby-signature/Rakefile
-- vendor/ruby-signature/bin/annotate-with-rdoc
-- vendor/ruby-signature/bin/console
-- vendor/ruby-signature/bin/query-rdoc
-- vendor/ruby-signature/bin/setup
-- vendor/ruby-signature/bin/sort
-- vendor/ruby-signature/bin/test_runner.rb
-- vendor/ruby-signature/docs/CONTRIBUTING.md
-- vendor/ruby-signature/docs/sigs.md
-- vendor/ruby-signature/docs/stdlib.md
-- vendor/ruby-signature/docs/syntax.md
-- vendor/ruby-signature/exe/rbs
-- vendor/ruby-signature/lib/rbs.rb
-- vendor/ruby-signature/lib/rbs/ast/annotation.rb
-- vendor/ruby-signature/lib/rbs/ast/comment.rb
-- vendor/ruby-signature/lib/rbs/ast/declarations.rb
-- vendor/ruby-signature/lib/rbs/ast/members.rb
-- vendor/ruby-signature/lib/rbs/buffer.rb
-- vendor/ruby-signature/lib/rbs/builtin_names.rb
-- vendor/ruby-signature/lib/rbs/cli.rb
-- vendor/ruby-signature/lib/rbs/constant.rb
-- vendor/ruby-signature/lib/rbs/constant_table.rb
-- vendor/ruby-signature/lib/rbs/definition.rb
-- vendor/ruby-signature/lib/rbs/definition_builder.rb
-- vendor/ruby-signature/lib/rbs/environment.rb
-- vendor/ruby-signature/lib/rbs/environment_loader.rb
-- vendor/ruby-signature/lib/rbs/environment_walker.rb
-- vendor/ruby-signature/lib/rbs/errors.rb
-- vendor/ruby-signature/lib/rbs/location.rb
-- vendor/ruby-signature/lib/rbs/method_type.rb
-- vendor/ruby-signature/lib/rbs/namespace.rb
-- vendor/ruby-signature/lib/rbs/parser.rb
-- vendor/ruby-signature/lib/rbs/parser.y
-- vendor/ruby-signature/lib/rbs/prototype/rb.rb
-- vendor/ruby-signature/lib/rbs/prototype/rbi.rb
-- vendor/ruby-signature/lib/rbs/prototype/runtime.rb
-- vendor/ruby-signature/lib/rbs/substitution.rb
-- vendor/ruby-signature/lib/rbs/test.rb
-- vendor/ruby-signature/lib/rbs/test/errors.rb
-- vendor/ruby-signature/lib/rbs/test/hook.rb
-- vendor/ruby-signature/lib/rbs/test/setup.rb
-- vendor/ruby-signature/lib/rbs/test/spy.rb
-- vendor/ruby-signature/lib/rbs/test/test_helper.rb
-- vendor/ruby-signature/lib/rbs/test/type_check.rb
-- vendor/ruby-signature/lib/rbs/type_name.rb
-- vendor/ruby-signature/lib/rbs/types.rb
-- vendor/ruby-signature/lib/rbs/variance_calculator.rb
-- vendor/ruby-signature/lib/rbs/vendorer.rb
-- vendor/ruby-signature/lib/rbs/version.rb
-- vendor/ruby-signature/lib/rbs/writer.rb
-- vendor/ruby-signature/lib/ruby/signature.rb
-- vendor/ruby-signature/rbs.gemspec
-- vendor/ruby-signature/stdlib/abbrev/abbrev.rbs
-- vendor/ruby-signature/stdlib/base64/base64.rbs
-- vendor/ruby-signature/stdlib/benchmark/benchmark.rbs
-- vendor/ruby-signature/stdlib/builtin/array.rbs
-- vendor/ruby-signature/stdlib/builtin/basic_object.rbs
-- vendor/ruby-signature/stdlib/builtin/binding.rbs
-- vendor/ruby-signature/stdlib/builtin/builtin.rbs
-- vendor/ruby-signature/stdlib/builtin/class.rbs
-- vendor/ruby-signature/stdlib/builtin/comparable.rbs
-- vendor/ruby-signature/stdlib/builtin/complex.rbs
-- vendor/ruby-signature/stdlib/builtin/constants.rbs
-- vendor/ruby-signature/stdlib/builtin/data.rbs
-- vendor/ruby-signature/stdlib/builtin/deprecated.rbs
-- vendor/ruby-signature/stdlib/builtin/dir.rbs
-- vendor/ruby-signature/stdlib/builtin/encoding.rbs
-- vendor/ruby-signature/stdlib/builtin/enumerable.rbs
-- vendor/ruby-signature/stdlib/builtin/enumerator.rbs
-- vendor/ruby-signature/stdlib/builtin/errno.rbs
-- vendor/ruby-signature/stdlib/builtin/errors.rbs
-- vendor/ruby-signature/stdlib/builtin/exception.rbs
-- vendor/ruby-signature/stdlib/builtin/false_class.rbs
-- vendor/ruby-signature/stdlib/builtin/fiber.rbs
-- vendor/ruby-signature/stdlib/builtin/fiber_error.rbs
-- vendor/ruby-signature/stdlib/builtin/file.rbs
-- vendor/ruby-signature/stdlib/builtin/file_test.rbs
-- vendor/ruby-signature/stdlib/builtin/float.rbs
-- vendor/ruby-signature/stdlib/builtin/gc.rbs
-- vendor/ruby-signature/stdlib/builtin/hash.rbs
-- vendor/ruby-signature/stdlib/builtin/integer.rbs
-- vendor/ruby-signature/stdlib/builtin/io.rbs
-- vendor/ruby-signature/stdlib/builtin/kernel.rbs
-- vendor/ruby-signature/stdlib/builtin/marshal.rbs
-- vendor/ruby-signature/stdlib/builtin/match_data.rbs
-- vendor/ruby-signature/stdlib/builtin/math.rbs
-- vendor/ruby-signature/stdlib/builtin/method.rbs
-- vendor/ruby-signature/stdlib/builtin/module.rbs
-- vendor/ruby-signature/stdlib/builtin/nil_class.rbs
-- vendor/ruby-signature/stdlib/builtin/numeric.rbs
-- vendor/ruby-signature/stdlib/builtin/object.rbs
-- vendor/ruby-signature/stdlib/builtin/proc.rbs
-- vendor/ruby-signature/stdlib/builtin/process.rbs
-- vendor/ruby-signature/stdlib/builtin/random.rbs
-- vendor/ruby-signature/stdlib/builtin/range.rbs
-- vendor/ruby-signature/stdlib/builtin/rational.rbs
-- vendor/ruby-signature/stdlib/builtin/rb_config.rbs
-- vendor/ruby-signature/stdlib/builtin/regexp.rbs
-- vendor/ruby-signature/stdlib/builtin/ruby_vm.rbs
-- vendor/ruby-signature/stdlib/builtin/signal.rbs
-- vendor/ruby-signature/stdlib/builtin/string.rbs
-- vendor/ruby-signature/stdlib/builtin/string_io.rbs
-- vendor/ruby-signature/stdlib/builtin/struct.rbs
-- vendor/ruby-signature/stdlib/builtin/symbol.rbs
-- vendor/ruby-signature/stdlib/builtin/thread.rbs
-- vendor/ruby-signature/stdlib/builtin/thread_group.rbs
-- vendor/ruby-signature/stdlib/builtin/time.rbs
-- vendor/ruby-signature/stdlib/builtin/trace_point.rbs
-- vendor/ruby-signature/stdlib/builtin/true_class.rbs
-- vendor/ruby-signature/stdlib/builtin/unbound_method.rbs
-- vendor/ruby-signature/stdlib/builtin/warning.rbs
-- vendor/ruby-signature/stdlib/coverage/coverage.rbs
-- vendor/ruby-signature/stdlib/csv/csv.rbs
-- vendor/ruby-signature/stdlib/erb/erb.rbs
-- vendor/ruby-signature/stdlib/find/find.rbs
-- vendor/ruby-signature/stdlib/ipaddr/ipaddr.rbs
-- vendor/ruby-signature/stdlib/pathname/pathname.rbs
-- vendor/ruby-signature/stdlib/prime/integer-extension.rbs
-- vendor/ruby-signature/stdlib/prime/prime.rbs
-- vendor/ruby-signature/stdlib/securerandom/securerandom.rbs
-- vendor/ruby-signature/stdlib/set/set.rbs
-- vendor/ruby-signature/stdlib/tmpdir/tmpdir.rbs
 homepage: https://github.com/soutaro/steep
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/soutaro/steep
+  source_code_uri: https://github.com/soutaro/steep
+  changelog_uri: https://github.com/soutaro/steep/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:

data/exe/rbs

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-
-load File.join(__dir__, "../vendor/ruby-signature/exe/rbs")

data/vendor/ruby-signature/.github/workflows/ruby.yml

@@ -1,27 +0,0 @@
-name: Ruby
-
-on:
-  push:
-    branches:
-      - master
-  pull_request: {}
-
-jobs:
-  test:
-    runs-on: "ubuntu-latest"
-    strategy:
-      matrix:
-        container_tag:
-        - master-nightly-bionic 
-        - 2.6.5-bionic
-        - 2.7.0-bionic
-    container:
-      image: rubylang/ruby:${{ matrix.container_tag }}
-    steps:
-    - uses: actions/checkout@v1
-    - name: Run test
-      run: |
-        ruby -v
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake