steep 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4dda8122216dc9af384ceba2c84f7cb1076df5be7060d2aa32dbaff32140ed6
-  data.tar.gz: d4ce7351acc02b06cd608a10639c00bc8bb1bed8ca81596bb1ed718112392a68
+  metadata.gz: 42abbd58a114142d676d6f6a5ba60d736c56385814491f2c6b6c3eb7f84fbeed
+  data.tar.gz: cecbb129ec52814935611a36eb9596e6cdce3857389880fc16c25102ba3d1641
 SHA512:
-  metadata.gz: 0bc09bf14d4fbfe8cea15d8f939efd2f9b75672a25fdfbbd19011461001786d15e7d84fadfa37cf67a0303f742c6b2a718855095603119276d1154c4b97cc673
-  data.tar.gz: 7d3d1d4f8acb18de067228fe38d52a7cb62dbd5049555fa748d96226c6ce1906fc49e034f3e19ae346c215ee89a715e04e0138b985cbedcc89b922499adc0a08
+  metadata.gz: 259698c20f17fbf9f19efd0fe46e5e1c9c4b8f50295c50dea3a9e8934be10ce3d017ad0410fdb3cd81822cd59968c3f3b2acf72ff55cbc99a6ab17e62173f91c
+  data.tar.gz: f799370012998a8f6a418a497c816ed407e708fac59a6adcdbcaf2cb57d0ce241ce0494a0a0cedc557880eb195fe5620ac5d182664df984a158dbe8335a78b5f

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/ruby-signature"]
-	path = vendor/ruby-signature
-	url = https://github.com/ruby/rbs.git

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.16.1 (2020-05-22)
+
+* 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)) 
+
 ## 0.16.0 (2020-05-19)
 
 * Spawn workers for type check performance ([#137](https://github.com/soutaro/steep/pull/137))

data/Rakefile

@@ -8,19 +8,6 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task :default => :test
-task :build => :parser
-task :test => :parser
-task :install => [:reset, :parser]
-
-task :parser do
-  Dir.chdir "vendor/ruby-signature" do
-    sh "bundle exec rake parser"
-  end
-end
-
-task :reset do
-  sh "git submodule update -f --init"
-end
 
 task :smoke do
   sh "bundle", "exec", "bin/smoke_runner.rb", *Dir.glob("smoke/*")

data/bin/setup

@@ -5,5 +5,3 @@ set -vx
 
 bundle install
 
-# Do any other automated setup that you need to do here
-bundle exec rake reset parser

data/bin/smoke_runner.rb

@@ -2,7 +2,6 @@
 
 require "pathname"
 
-$LOAD_PATH << Pathname(__dir__) + '../vendor/ruby-signature/lib'
 $LOAD_PATH << Pathname(__dir__) + "../lib"
 
 require "steep"

data/exe/steep

@@ -2,7 +2,6 @@
 
 require 'pathname'
 
-$LOAD_PATH << Pathname(__dir__) + "../vendor/ruby-signature/lib"
 $LOAD_PATH << Pathname(__dir__) + "../lib"
 
 require 'steep'

data/lib/steep/project/file.rb

@@ -42,7 +42,7 @@ module Steep
 
       def self.type_check(source, subtyping:)
         annotations = source.annotations(block: source.node, factory: subtyping.factory, current_module: AST::Namespace.root)
-        const_env = TypeInference::ConstantEnv.new(factory: subtyping.factory, context: nil)
+        const_env = TypeInference::ConstantEnv.new(factory: subtyping.factory, context: [AST::Namespace.root])
         type_env = TypeInference::TypeEnv.build(annotations: annotations,
                                                 subtyping: subtyping,
                                                 const_env: const_env,

data/lib/steep/project/hover_content.rb

@@ -110,7 +110,7 @@ module Steep
                 context = status.typing.context_at(line: line, column: column)
                 method_context = context.method_context
 
-                if method_context
+                if method_context && method_context.method
                   DefinitionContent.new(
                     node: node,
                     method_name: method_context.name,

data/lib/steep/server/code_worker.rb

@@ -84,7 +84,7 @@ module Steep
             loc = error.location_to_str
 
             LSP::Interface::Diagnostic.new(
-              message: StringIO.new.tap {|io| error.print_to(io) }.string.gsub(/\A#{loc}: /, "").chomp,
+              message: StringIO.new.tap {|io| error.print_to(io) }.string.gsub(/\A#{Regexp.escape(loc)}: /, "").chomp,
               severity: LSP::Constant::DiagnosticSeverity::ERROR,
               range: LSP::Interface::Range.new(
                 start: LSP::Interface::Position.new(

data/lib/steep/server/signature_worker.rb

@@ -72,11 +72,11 @@ module Steep
                                   severity: LSP::Constant::DiagnosticSeverity::ERROR,
                                   range: LSP::Interface::Range.new(
                                     start: LSP::Interface::Position.new(
-                                      line: location.start_line,
+                                      line: location.start_line - 1,
                                       character: location.start_column,
                                     ),
                                     end: LSP::Interface::Position.new(
-                                      line: location.end_line,
+                                      line: location.end_line - 1,
                                       character: location.end_column
                                     )
                                   )
@@ -97,11 +97,11 @@ module Steep
                               severity: LSP::Constant::DiagnosticSeverity::ERROR,
                               range: LSP::Interface::Range.new(
                                 start: LSP::Interface::Position.new(
-                                  line: error.location.start_line,
+                                  line: error.location.start_line - 1,
                                   character: error.location.start_column,
                                   ),
                                 end: LSP::Interface::Position.new(
-                                  line: error.location.end_line,
+                                  line: error.location.end_line - 1,
                                   character: error.location.end_column
                                 )
                               )

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(
@@ -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
@@ -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.16.0"
+  VERSION = "0.16.1"
 end

data/steep.gemspec

@@ -16,12 +16,7 @@ Gem::Specification.new do |spec|
 
   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) }
@@ -43,4 +38,5 @@ Gem::Specification.new do |spec|
   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.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.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,11 +198,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.14.0.2
+- !ruby/object:Gem::Dependency
+  name: rbs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com
 executables:
-- rbs
 - steep
 extensions: []
 extra_rdoc_files: []
@@ -219,7 +232,6 @@ files:
 - bin/console
 - bin/setup
 - bin/smoke_runner.rb
-- exe/rbs
 - exe/steep
 - lib/steep.rb
 - lib/steep/annotation_parser.rb
@@ -437,136 +449,6 @@ 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/json/json.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
@@ -586,7 +468,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gradual Typing for Ruby