steep 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 899bca0fd211114d52e015acc844ee4648eadb6b739af911f7ac73560cedef83
-  data.tar.gz: 2fe5b52342a6b932d5ce08f5b78c417e43cda38db378c35d1b31891ca7c79465
+  metadata.gz: 1d153db54fad9f22a3b38fe9a1a2539c11d50b6efc34cea1cba69b2849c69c1e
+  data.tar.gz: 98dfeb1b9a044c6ef30d880d5deda10fb97143e82807743c9f06c4e7aeff6663
 SHA512:
-  metadata.gz: 20e09462ddef35a3aa00a19d6f7cb86f2862c9ab700131bf439fc7750b088d43d1f2bb3380dfdf57a0c881d58c885b789d47eba35d7e146156809511e4e1c64c
-  data.tar.gz: dfa20a13b3b25575419ad1c9ac2417b1b873a0732eded5fa643e6e5768b644e27ea07c8d83bf9ae5e333b872d8f039aba111bee4d7ae2a48034dc06047265fee
+  metadata.gz: 6c7b1f95050bf14a7fbf1c521318648c3d99fd6750fff30c79d1bb84a55582dc4f74da0aec91f7ddfc7736c2a571caa99bc462865b42c1335659a6a1e44fe684
+  data.tar.gz: 7708ef12ea5754f432a2c71e347400ebd24cbcab9e69fab21783c1be00c000b3420c8f88db1f83bb2ed58a525a3a6f34f044ea421c2be8f53becf64dfbc7fdda

data/.github/workflows/ruby-windows.yml

@@ -0,0 +1,34 @@
+name: Run test on Windows
+
+on:
+  push:
+    branches:
+      - master
+  pull_request: {}
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        ruby_version:
+        - "2.7"
+        - "3.0"
+        - "3.1"
+        task:
+        - test
+        # - test:output  Ignored because the order of diagnostics changes somehow
+        - build
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+    - name: Run test
+      run: |
+        git config --global --add safe.directory /__w/steep/steep
+        ruby -v
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bin/setup
+        bundle exec rake ${{matrix.task}}

data/.github/workflows/ruby.yml

@@ -1,4 +1,4 @@
-name: Ruby
+name: Run test on container
 
 on:
   push:
@@ -8,7 +8,6 @@ on:
 
 jobs:
   test:
-    runs-on: "ubuntu-latest"
     strategy:
       matrix:
         container_tag:
@@ -20,6 +19,7 @@ jobs:
         - test
         - test:output
         - build
+    runs-on: ubuntu-latest
     container:
       image: rubylang/ruby:${{ matrix.container_tag }}
     steps:

data/CHANGELOG.md

@@ -2,6 +2,38 @@
 
 ## master
 
+## 1.0.1 (2022-06-16)
+
+This is the first patch release for Steep 1.0.
+However, this release includes one non-trivial type system update, [\#570](https://github.com/soutaro/steep/pull/570), which adds a special typing rule for `Hash#compact` like `Array#compact`.
+The change will make type checking more permissive and precise, so no new error won't be reported with the fix.
+
+### Type checker
+
+* Support shorthand hash for Ruby 3.1 ([\#567](https://github.com/soutaro/steep/pull/567))
+* Fix super and zsuper with block ([\#568](https://github.com/soutaro/steep/pull/568))
+* Apply logic-type evaluation only if the node is `:send` ([\#569](https://github.com/soutaro/steep/pull/569))
+* Add support for `Hash#compact` ([\#570](https://github.com/soutaro/steep/pull/570))
+* Use given `const_env` when making a new `ModuleContext` ([\#575](https://github.com/soutaro/steep/pull/575))
+* Graceful, hopefully, error handling with undefined outer module ([\#576](https://github.com/soutaro/steep/pull/576))
+* Type check anonymous block forwarding ([\#577](https://github.com/soutaro/steep/pull/577))
+* Incompatible default value is a type error ([\#578](https://github.com/soutaro/steep/pull/578))
+* Load `ChildrenLevel` helper in `AST::Types::Proc` ([\#584](https://github.com/soutaro/steep/pull/584))
+* Type check `gvar` and `gvasgn` in methods([\#579](https://github.com/soutaro/steep/pull/579))
+* Avoid `UnexpectedError` when assigning untyped singleton class ([\#586](https://github.com/soutaro/steep/pull/586))
+
+### Tool
+
+* Improve Windows support ([\#561](https://github.com/soutaro/steep/pull/561), [\#573](https://github.com/soutaro/steep/pull/573))
+* Test if `.ruby-version` exists before `rvm do` in binstub ([\#558](https://github.com/soutaro/steep/pull/558))
+* Fix typo ([\#564](https://github.com/soutaro/steep/pull/564))
+* Ignore `untitled:` URIs in LSP ([\#580](https://github.com/soutaro/steep/pull/580))
+
+### Miscellaneous
+
+* Fix test name ([\#565](https://github.com/soutaro/steep/pull/565), [\#566](https://github.com/soutaro/steep/pull/566), [\#585](https://github.com/soutaro/steep/pull/585))
+* Remove some unused code except tests ([\#587](https://github.com/soutaro/steep/pull/587))
+
 ## 1.0.0 (2022-05-20)
 
 * Add special typing rule for `Array#compact` ([\#555](https://github.com/soutaro/steep/pull/555))

data/Gemfile

@@ -7,7 +7,7 @@ gem "with_steep_types", path: "test/gems/with_steep_types"
 gem "without_steep_types", path: "test/gems/without_steep_types"
 
 gem "rake"
-gem "minitest", "~> 5.15"
+gem "minitest", "~> 5.16"
 gem "minitest-hooks"
 group :stackprof, optional: true do
   gem "stackprof"

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    steep (1.0.0)
+    steep (1.0.1)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       parallel (>= 1.0.0)
-      parser (>= 3.0)
+      parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
       rbs (>= 2.3.2)
       terminal-table (>= 2, < 4)
@@ -38,7 +38,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    minitest (5.15.0)
+    minitest (5.16.1)
     minitest-hooks (1.5.0)
       minitest (> 5.3)
     minitest-slow_test (0.2.0)
@@ -51,7 +51,7 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.4.0)
+    rbs (2.5.1)
     stackprof (0.2.19)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -63,7 +63,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (~> 5.15)
+  minitest (~> 5.16)
   minitest-hooks
   minitest-slow_test
   rake

data/lib/steep/ast/builtin.rb

@@ -16,7 +16,7 @@ module Steep
               args << Builtin.any_type
             end
           end
-          arity == args.size or raise "Mulformed instance type: name=#{module_name}, args=#{args}"
+          arity == args.size or raise "Malformed instance type: name=#{module_name}, args=#{args}"
 
           Types::Name::Instance.new(name: module_name, args: args)
         end
@@ -28,7 +28,7 @@ module Steep
         def instance_type?(type, args: nil)
           if type.is_a?(Types::Name::Instance)
             if args
-              arity == args.size or raise "Mulformed instance type: name=#{module_name}, args=#{args}"
+              arity == args.size or raise "Malformed instance type: name=#{module_name}, args=#{args}"
               type.name == module_name && type.args == args
             else
               type.name == module_name && type.args.size == arity

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

@@ -9,6 +9,12 @@ module Steep
 
         attr_reader :type_interface_cache
 
+        def inspect
+          s = "#<%s:%#018x " % [self.class, object_id]
+          s << "@definition_builder=#<%s:%#018x>" % [definition_builder.class, definition_builder.object_id]
+          s + ">"
+        end
+
         def initialize(builder:)
           @definition_builder = builder
 
@@ -282,8 +288,6 @@ module Steep
           fvs = self_type.free_variables()
 
           type_params = []
-          alpha_vars = []
-          alpha_types = []
 
           conflicting_names = method_type.type_params.each.with_object([]) do |param, names|
             names << params.name if fvs.include?(param.name)

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

@@ -45,6 +45,8 @@ module Steep
           end
         end
 
+        include Helper::ChildrenLevel
+
         def level
           children = type.params.each_type.to_a + [type.return_type]
           if block

data/lib/steep/cli.rb

@@ -271,7 +271,9 @@ if type "rbenv" > /dev/null 2>&1; then
   STEEP="rbenv exec ${STEEP}"
 else
   if type "rvm" > /dev/null 2>&1; then
-    STEEP="rvm ${ROOT_DIR} do ${STEEP}"
+    if [ -e ${ROOT_DIR}/.ruby-version ]; then
+      STEEP="rvm ${ROOT_DIR} do ${STEEP}"
+    fi
   fi
 fi
 

data/lib/steep/diagnostic/ruby.rb

@@ -296,7 +296,7 @@ module Steep
         attr_reader :method_type
 
         def initialize(node:, method_type:)
-          super(node: node, location: node.loc.selector)
+          super(node: node, location: (node.type == :super || node.type == :zsuper) ? node.loc.keyword : node.loc.selector)
           @method_type = method_type
         end
 

data/lib/steep/drivers/check.rb

@@ -139,7 +139,7 @@ module Steep
         missing_count = 0
 
         ns = notifications.each.with_object({}) do |notification, hash|
-          path = project.relative_path(Pathname(URI.parse(notification[:uri]).path))
+          path = project.relative_path(Steep::PathHelper.to_pathname(notification[:uri]))
           hash[path] = notification[:diagnostics]
         end
 
@@ -186,7 +186,7 @@ module Steep
                        end
 
         ns = notifications.each.with_object({}) do |notification, hash|
-          path = project.relative_path(Pathname(URI.parse(notification[:uri]).path))
+          path = project.relative_path(Steep::PathHelper.to_pathname(notification[:uri]))
           hash[path] = notification[:diagnostics]
         end
 
@@ -215,7 +215,7 @@ module Steep
           total = errors.sum {|notification| notification[:diagnostics].size }
 
           errors.each do |notification|
-            path = Pathname(URI.parse(notification[:uri]).path)
+            path = Steep::PathHelper.to_pathname(notification[:uri])
             buffer = RBS::Buffer.new(name: project.relative_path(path), content: path.read)
             printer = DiagnosticPrinter.new(buffer: buffer, stdout: stdout)
 

data/lib/steep/path_helper.rb

@@ -0,0 +1,22 @@
+module Steep
+  module PathHelper
+    module_function
+
+    def to_pathname(uri, dosish: Gem.win_platform?)
+      uri = URI.parse(uri)
+      if uri.scheme == "file"
+        path = uri.path
+        path.sub!(%r{^/([a-zA-Z])(:|%3A)//?}i, '\1:/') if dosish
+        Pathname(path)
+      end
+    end
+
+    def to_uri(path, dosish: Gem.win_platform?)
+      str_path = path.to_s
+      if dosish
+        str_path.insert(0, "/") if str_path[0] != "/"
+      end
+      URI::File.build(path: str_path)
+    end
+  end
+end

data/lib/steep/project.rb

@@ -16,22 +16,10 @@ module Steep
       steepfile_path.parent
     end
 
-    def relative_path(orig_path)
-      path = if Gem.win_platform?
-               path_str = URI.decode_www_form_component(
-                 orig_path.to_s.delete_prefix("/")
-               )
-               unless path_str.start_with?(%r{[a-z]:/}i)
-                 # FIXME: Sometimes drive letter is missing, taking from base_dir
-                 path_str = base_dir.to_s.split("/")[0] + "/" + path_str
-               end
-               Pathname.new(
-                 path_str
-               )
-             else
-               orig_path
-             end
+    def relative_path(path)
       path.relative_path_from(base_dir)
+    rescue ArgumentError
+      path
     end
 
     def absolute_path(path)

data/lib/steep/server/base_worker.rb

@@ -69,6 +69,7 @@ module Steep
             end
           end
         end
+        thread.abort_on_exception = true
 
         Steep.logger.tagged "frontend" do
           begin

data/lib/steep/server/change_buffer.rb

@@ -40,7 +40,7 @@ module Steep
 
       def collect_changes(request)
         push_buffer do |changes|
-          path = project.relative_path(Pathname(URI.parse(request[:params][:textDocument][:uri]).path))
+          path = project.relative_path(Steep::PathHelper.to_pathname(request[:params][:textDocument][:uri]))
           version = request[:params][:textDocument][:version]
           Steep.logger.info { "Updating source: path=#{path}, version=#{version}..." }
 

data/lib/steep/server/interaction_worker.rb

@@ -53,8 +53,7 @@ module Steep
         when "textDocument/hover"
           id = request[:id]
 
-          uri = URI.parse(request[:params][:textDocument][:uri])
-          path = project.relative_path(Pathname(uri.path))
+          path = project.relative_path(Steep::PathHelper.to_pathname(request[:params][:textDocument][:uri]))
           line = request[:params][:position][:line]+1
           column = request[:params][:position][:character]
 
@@ -64,8 +63,7 @@ module Steep
           id = request[:id]
 
           params = request[:params]
-          uri = URI.parse(params[:textDocument][:uri])
-          path = project.relative_path(Pathname(uri.path))
+          path = project.relative_path(Steep::PathHelper.to_pathname(params[:textDocument][:uri]))
           line, column = params[:position].yield_self {|hash| [hash[:line]+1, hash[:character]] }
           trigger = params.dig(:context, :triggerCharacter)
 
@@ -144,7 +142,7 @@ module Steep
               decls = sig_service.files[relative_path].decls
               locator = RBS::Locator.new(decls: decls)
 
-              hd, tail = locator.find2(line: job.line, column: job.column)
+              _hd, tail = locator.find2(line: job.line, column: job.column)
 
               namespace = []
               tail.each do |t|

data/lib/steep/server/master.rb

@@ -21,9 +21,7 @@ module Steep
         end
 
         def uri(path)
-          URI.parse(path.to_s).tap do |uri|
-            uri.scheme = "file"
-          end
+          Steep::PathHelper.to_uri(path)
         end
 
         def as_json(assignment:)
@@ -41,7 +39,7 @@ module Steep
         end
 
         def percentage
-          checked_paths.size * 100 / total
+          checked_paths.size * 100 / all_paths.size
         end
 
         def all_paths
@@ -50,12 +48,7 @@ module Steep
 
         def checking_path?(path)
           [library_paths, signature_paths, code_paths].any? do |paths|
-            if Gem.win_platform?
-              # FIXME: Sometimes drive letter is missing, so comparing without drive letter.
-              paths.any? {|p| p.to_s.split("/", 2)[1] == path.to_s.split("/", 2)[1]}
-            else
-              paths.include?(path)
-            end
+            paths.include?(path)
           end
         end
 
@@ -463,7 +456,7 @@ module Steep
       end
 
       def pathname(uri)
-        Pathname(URI.parse(uri).path)
+        Steep::PathHelper.to_pathname(uri)
       end
 
       def work_done_progress_supported?
@@ -524,40 +517,54 @@ module Steep
           end
 
         when "textDocument/didChange"
-          broadcast_notification(message)
-          path = pathname(message[:params][:textDocument][:uri])
-          controller.push_changes(path)
+          if path = pathname(message[:params][:textDocument][:uri])
+            broadcast_notification(message)
+            controller.push_changes(path)
+          end
 
         when "textDocument/didSave"
-          if typecheck_automatically
-            if request = controller.make_request(last_request: current_type_check_request)
-              start_type_check(
-                request,
-                last_request: current_type_check_request,
-                start_progress: request.total > 10
-              )
+          if path = pathname(message[:params][:textDocument][:uri])
+            if typecheck_automatically
+              if request = controller.make_request(last_request: current_type_check_request)
+                start_type_check(
+                  request,
+                  last_request: current_type_check_request,
+                  start_progress: request.total > 10
+                )
+              end
             end
           end
 
         when "textDocument/didOpen"
-          path = pathname(message[:params][:textDocument][:uri])
-          controller.update_priority(open: path)
+          if path = pathname(message[:params][:textDocument][:uri])
+            controller.update_priority(open: path)
+          end
 
         when "textDocument/didClose"
-          path = pathname(message[:params][:textDocument][:uri])
-          controller.update_priority(close: path)
+          if path = pathname(message[:params][:textDocument][:uri])
+            controller.update_priority(close: path)
+          end
 
         when "textDocument/hover", "textDocument/completion"
           if interaction_worker
-            result_controller << send_request(method: message[:method], params: message[:params], worker: interaction_worker) do |handler|
-              handler.on_completion do |response|
-                job_queue << SendMessageJob.to_client(
-                  message: {
-                    id: message[:id],
-                    result: response[:result]
-                  }
-                )
+            if path = pathname(message[:params][:textDocument][:uri])
+              result_controller << send_request(method: message[:method], params: message[:params], worker: interaction_worker) do |handler|
+                handler.on_completion do |response|
+                  job_queue << SendMessageJob.to_client(
+                    message: {
+                      id: message[:id],
+                      result: response[:result]
+                    }
+                  )
+                end
               end
+            else
+              job_queue << SendMessageJob.to_client(
+                message: {
+                  id: message[:id],
+                  result: nil
+                }
+              )
             end
           end
 
@@ -594,20 +601,29 @@ module Steep
           end
 
         when "textDocument/definition", "textDocument/implementation"
-          result_controller << group_request do |group|
-            typecheck_workers.each do |worker|
-              group << send_request(method: message[:method], params: message[:params], worker: worker)
-            end
+          if path = pathname(message[:params][:textDocument][:uri])
+            result_controller << group_request do |group|
+              typecheck_workers.each do |worker|
+                group << send_request(method: message[:method], params: message[:params], worker: worker)
+              end
 
-            group.on_completion do |handlers|
-              links = handlers.flat_map(&:result)
-              job_queue << SendMessageJob.to_client(
-                message: {
-                  id: message[:id],
-                  result: links
-                }
-              )
+              group.on_completion do |handlers|
+                links = handlers.flat_map(&:result)
+                job_queue << SendMessageJob.to_client(
+                  message: {
+                    id: message[:id],
+                    result: links
+                  }
+                )
+              end
             end
+          else
+            job_queue << SendMessageJob.to_client(
+              message: {
+                id: message[:id],
+                result: []
+              }
+            )
           end
 
         when "$/typecheck"

data/lib/steep/server/type_check_worker.rb

@@ -86,10 +86,10 @@ module Steep
           queue << StartTypeCheckJob.new(guid: guid, changes: changes)
         end
 
-        priority_paths = Set.new(params[:priority_uris].map {|uri| Pathname(URI.parse(uri).path) })
-        library_paths = params[:library_uris].map {|uri| Pathname(URI.parse(uri).path) }
-        signature_paths = params[:signature_uris].map {|uri| Pathname(URI.parse(uri).path) }
-        code_paths = params[:code_uris].map {|uri| Pathname(URI.parse(uri).path) }
+        priority_paths = Set.new(params[:priority_uris].map {|uri| Steep::PathHelper.to_pathname(uri) })
+        library_paths = params[:library_uris].map {|uri| Steep::PathHelper.to_pathname(uri) }
+        signature_paths = params[:signature_uris].map {|uri| Steep::PathHelper.to_pathname(uri) }
+        code_paths = params[:code_uris].map {|uri| Steep::PathHelper.to_pathname(uri) }
 
         library_paths.each do |path|
           if priority_paths.include?(path)
@@ -135,21 +135,6 @@ module Steep
       end
 
       def handle_job(job)
-        job_path = if job.respond_to?(:path)
-                     if Gem.win_platform?
-                       # FIXME: Sometimes drive letter is missing, using base_dir
-                       if job.path.to_s.start_with?(%r{/[a-z](:|%3A)/}i)
-                         job.path.to_s
-                       else
-                         "/#{project.base_dir.to_s.split("/").first}/#{job.path}"
-                       end
-                     else
-                       job.path.to_s
-                     end
-                   else
-                     nil
-                   end
-
         case job
         when StartTypeCheckJob
           Steep.logger.info { "Processing StartTypeCheckJob for guid=#{job.guid}" }
@@ -164,7 +149,7 @@ module Steep
               writer.write(
                 method: :"textDocument/publishDiagnostics",
                 params: LSP::Interface::PublishDiagnosticsParams.new(
-                  uri: URI.parse(job_path).tap {|uri| uri.scheme = "file"},
+                  uri: Steep::PathHelper.to_uri(job.path),
                   diagnostics: diagnostics.map {|diagnostic| formatter.format(diagnostic) }.uniq
                 )
               )
@@ -182,7 +167,7 @@ module Steep
               writer.write(
                 method: :"textDocument/publishDiagnostics",
                 params: LSP::Interface::PublishDiagnosticsParams.new(
-                  uri: URI.parse(job_path).tap {|uri| uri.scheme = "file"},
+                  uri: Steep::PathHelper.to_uri(job.path),
                   diagnostics: diagnostics.map {|diagnostic| formatter.format(diagnostic) }.uniq.compact
                 )
               )
@@ -201,7 +186,7 @@ module Steep
               writer.write(
                 method: :"textDocument/publishDiagnostics",
                 params: LSP::Interface::PublishDiagnosticsParams.new(
-                  uri: URI.parse(job_path).tap {|uri| uri.scheme = "file"},
+                  uri: Steep::PathHelper.to_uri(job.path),
                   diagnostics: diagnostics.map {|diagnostic| formatter.format(diagnostic) }.uniq.compact
                 )
               )
@@ -251,7 +236,7 @@ module Steep
               location: symbol.location.yield_self do |location|
                 path = Pathname(location.buffer.name)
                 {
-                  uri: URI.parse(project.absolute_path(path).to_s).tap {|uri| uri.scheme = "file" },
+                  uri: Steep::PathHelper.to_uri(project.absolute_path(path)),
                   range: {
                     start: { line: location.start_line - 1, character: location.start_column },
                     end: { line: location.end_line - 1, character: location.end_column }
@@ -279,7 +264,7 @@ module Steep
       end
 
       def goto(job)
-        path = Pathname(URI.parse(job.params[:textDocument][:uri]).path)
+        path = Steep::PathHelper.to_pathname(job.params[:textDocument][:uri])
         line = job.params[:position][:line] + 1
         column = job.params[:position][:character]
 
@@ -306,7 +291,7 @@ module Steep
           path = project.absolute_path(path)
 
           {
-            uri: URI.parse(path.to_s).tap {|uri| uri.scheme = "file" }.to_s,
+            uri: Steep::PathHelper.to_uri(path.to_s).to_s,
             range: loc.as_lsp_range
           }
         end

data/lib/steep/services/completion_provider.rb

@@ -157,7 +157,7 @@ module Steep
       end
 
       def items_for_trigger(position:)
-        node, *parents = source.find_nodes(line: position.line, column: position.column)
+        node, *_parents = source.find_nodes(line: position.line, column: position.column)
         node ||= source.node
 
         return [] unless node
@@ -265,7 +265,7 @@ module Steep
       def items_for_dot(position:)
         # foo. ←
         shift_pos = position-1
-        node, *parents = source.find_nodes(line: shift_pos.line, column: shift_pos.column)
+        node, *_parents = source.find_nodes(line: shift_pos.line, column: shift_pos.column)
         node ||= source.node
 
         return [] unless node
@@ -355,7 +355,7 @@ module Steep
             end
           end
         end
-      rescue RuntimeError => exn
+      rescue RuntimeError => _exn
         # nop
       end
 

data/lib/steep/services/goto_service.rb

@@ -35,7 +35,7 @@ module Steep
       def implementation(path:, line:, column:)
         locations = []
 
-        relative_path = project.relative_path(path)
+        # relative_path = project.relative_path(path)
 
         queries = query_at(path: path, line: line, column: column)
         queries.uniq!
@@ -57,8 +57,6 @@ module Steep
       def definition(path:, line:, column:)
         locations = []
 
-        relative_path = project.relative_path(path)
-
         queries = query_at(path: path, line: line, column: column)
         queries.uniq!
 
@@ -108,7 +106,7 @@ module Steep
         case
         when target = type_check.source_file?(relative_path)
           source = type_check.source_files[relative_path]
-          typing, signature = type_check_path(target: target, path: relative_path, content: source.content, line: line, column: column)
+          typing, _signature = type_check_path(target: target, path: relative_path, content: source.content, line: line, column: column)
           if typing
             node, *parents = typing.source.find_nodes(line: line, column: column)
 

data/lib/steep/services/hover_provider/rbs.rb

@@ -26,7 +26,7 @@ module Steep
           return if decls.nil?
 
           loc_key, path = ::RBS::Locator.new(decls: decls).find2(line: line, column: column) || return
-          head, *tail = path
+          head, *_tail = path
 
           case head
           when ::RBS::Types::Alias

data/lib/steep/services/stats_calculator.rb

@@ -39,7 +39,6 @@ module Steep
           typed = 0
           untyped = 0
           errors = 0
-          total = 0
           typing.method_calls.each_value do |call|
             case call
             when TypeInference::MethodCall::Typed

data/lib/steep/services/type_check_service.rb

@@ -335,6 +335,9 @@ module Steep
         SourceFile.with_syntax_error(path: path, content: text, error: error)
       rescue EncodingError => exn
         SourceFile.no_data(path: path, content: "")
+      rescue RuntimeError => exn
+        Steep.log_error(exn)
+        SourceFile.no_data(path: path, content: text)
       end
 
       def self.type_check(source:, subtyping:)

data/lib/steep/source.rb

@@ -39,7 +39,7 @@ module Steep
     end
 
     def self.new_parser
-      ::Parser::Ruby30.new(Builder.new).tap do |parser|
+      ::Parser::Ruby31.new(Builder.new).tap do |parser|
         parser.diagnostics.all_errors_are_fatal = true
         parser.diagnostics.ignore_warnings = true
       end

data/lib/steep/subtyping/check.rb

@@ -421,9 +421,6 @@ module Steep
         when relation.sub_type.is_a?(AST::Types::Proc) && relation.super_type.is_a?(AST::Types::Proc)
           name = :__proc__
 
-          sub_type = relation.sub_type
-          super_type = relation.super_type
-
           All(relation) do |result|
             result.add(relation.map {|p| p.type }) do |rel|
               check_function(name, rel)

data/lib/steep/type_construction.rb

@@ -131,11 +131,13 @@ module Steep
 
     def for_new_method(method_name, node, args:, self_type:, definition:)
       annots = source.annotations(block: node, factory: checker.factory, context: nesting)
-      type_env = TypeInference::TypeEnv.new(subtyping: checker, const_env: module_context&.const_env || self.type_env.const_env)
-
-      self.type_env.const_types.each do |name, type|
-        type_env.set(const: name, type: type)
-      end
+      type_env = TypeInference::TypeEnv.build(
+        annotations: annots,
+        subtyping: checker,
+        const_env: module_context&.const_env || self.type_env.const_env,
+        signatures: checker.factory.env
+      )
+      type_env.merge_const_types(self.type_env)
 
       definition_method_type = if definition
                                  definition.methods[method_name]&.yield_self do |method|
@@ -320,7 +322,7 @@ module Steep
           instance_type: nil,
           module_type: nil,
           implement_name: nil,
-          const_env: self.module_context.const_env,
+          const_env: const_env,
           class_name: self.module_context.class_name,
           module_definition: nil,
           instance_definition: nil
@@ -1355,24 +1357,23 @@ module Steep
             rhs = node.children[1]
 
             var_type = context.lvar_env[var]
-            node_type, constr = synthesize(rhs, hint: var_type)
-
-            type = AST::Types::Union.build(types: [var_type, node_type])
 
-            constr_ = constr.update_lvar_env do |env|
-              env.assign(var, node: node, type: type) do |declared_type, type, result|
+            if var_type
+              type, constr = check(rhs, var_type) do |expected_type, actual_type, result|
                 typing.add_error(
                   Diagnostic::Ruby::IncompatibleAssignment.new(
                     node: node,
-                    lhs_type: declared_type,
-                    rhs_type: type,
+                    lhs_type: expected_type,
+                    rhs_type: actual_type,
                     result: result
                   )
                 )
               end
+            else
+              type, constr = synthesize(rhs)
             end
 
-            add_typing(node, type: type, constr: constr_)
+            constr.add_typing(node, type: type)
           end
 
         when :restarg
@@ -1578,8 +1579,7 @@ module Steep
                     message: "sclass receiver must be instance type or singleton type, but type given `#{type}`"
                   )
                 )
-                constr.add_typing(node, type: AST::Builtin.nil_type)
-                return
+                return constr.add_typing(node, type: AST::Builtin.nil_type)
               end
 
               constructor.typing.add_context_for_node(node, context: constructor.context)
@@ -2299,7 +2299,8 @@ module Steep
           yield_self do
             value = node.children[0]
 
-            if hint.is_a?(AST::Types::Proc) && value.type == :sym
+            case
+            when hint.is_a?(AST::Types::Proc) && value && value.type == :sym
               if hint.one_arg?
                 # Assumes Symbol#to_proc implementation
                 param_type = hint.type.params.required[0]
@@ -2333,9 +2334,18 @@ module Steep
               else
                 Steep.logger.error "Passing multiple args through Symbol#to_proc is not supported yet"
               end
+            when value == nil
+              type = AST::Types::Proc.new(
+                type: method_context.method_type.block.type,
+                location: nil,
+                block: nil
+              )
+              if method_context.method_type.block.optional?
+                type = AST::Types::Union.build(types: [type, AST::Builtin.nil_type])
+              end
             end
 
-            type ||= synthesize(node.children[0], hint: hint).type
+            type ||= synthesize(value, hint: hint).type
 
             add_typing node, type: type
           end
@@ -2827,13 +2837,6 @@ module Steep
 
       block_constr.typing.add_context_for_body(node, context: block_constr.context)
 
-      default_proc_function =
-        Interface::Function.new(
-          params: Interface::Function::Params.empty,
-          return_type: AST::Builtin.any_type,
-          location: nil
-        )
-
       params.params.each do |param|
         _, block_constr = block_constr.synthesize(param.node, hint: param.type)
       end
@@ -3093,6 +3096,15 @@ module Steep
                                                          private: private,
                                                          self_type: AST::Types::Self.new)
 
+                         if send_node.type == :super || send_node.type == :zsuper
+                            method_name = method_context.name
+                            unless method_context.super_method
+                              return fallback_to_any(send_node) do
+                                Diagnostic::Ruby::UnexpectedSuper.new(node: send_node, method: method_name)
+                              end
+                            end
+                         end
+
                          constr.type_send_interface(node,
                                                     interface: interface,
                                                     receiver: receiver,
@@ -3144,6 +3156,9 @@ module Steep
       array_compact: Set[
         MethodName("::Array#compact"),
         MethodName("::Enumerable#compact")
+      ],
+      hash_compact: Set[
+        MethodName("::Hash#compact")
       ]
     }
 
@@ -3170,6 +3185,29 @@ module Steep
               method_decls: decls
             )
 
+            return [call, constr]
+          end
+        end
+      when decl = decls.find {|decl| SPECIAL_METHOD_NAMES[:hash_compact].include?(decl.method_name) }
+        if arguments.empty? && !block_params
+          # compact
+          return_type = method_type.type.return_type
+          if AST::Builtin::Hash.instance_type?(return_type)
+            key = return_type.args[0]
+            value = return_type.args[1]
+            type = AST::Builtin::Hash.instance_type(key, unwrap(value))
+
+            _, constr = add_typing(node, type: type)
+            call = TypeInference::MethodCall::Special.new(
+              node: node,
+              context: constr.context.method_context,
+              method_name: decl.method_name,
+              receiver_type: receiver_type,
+              actual_method_type: method_type.with(type: method_type.type.with(return_type: type)),
+              return_type: type,
+              method_decls: decls
+            )
+
             return [call, constr]
           end
         end
@@ -3309,7 +3347,6 @@ module Steep
       method_type = method_type.instantiate(instantiation)
 
       variance = Subtyping::VariableVariance.from_method_type(method_type)
-      occurence = Subtyping::VariableOccurence.from_method_type(method_type)
       constraints = Subtyping::Constraints.new(unknowns: type_params.map(&:name))
       ccontext = Subtyping::Constraints::Context.new(
         self_type: self_type,

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -132,9 +132,12 @@ module Steep
               end
             end
           when AST::Types::Logic::Not
-            receiver, * = value_node.children
-            receiver_type = typing.type_of(node: receiver)
-            falsy_env, truthy_env = eval(env: env, type: receiver_type, node: receiver)
+            case value_node.type
+            when :send
+              receiver, * = value_node.children
+              receiver_type = typing.type_of(node: receiver)
+              falsy_env, truthy_env = eval(env: env, type: receiver_type, node: receiver)
+            end
           end
         else
           _, vars = decompose_value(node)
@@ -195,7 +198,6 @@ module Steep
 
           [truthy_types, falsy_types]
         else
-          value_type = typing.type_of(node: value_node)
           types = [arg_type]
 
           case value_node.type

data/lib/steep/type_inference/send_args.rb

@@ -528,7 +528,6 @@ module Steep
       def each
         if block_given?
           errors = []
-          positional_count = 0
 
           positional_arg.tap do |args|
             while (value, args = args.next())
@@ -615,7 +614,7 @@ module Steep
             end
           end
 
-          pass = block_pass_arg
+          # pass = block_pass_arg
           # if pass.node
           #   yield pass
           # end

data/lib/steep/type_inference/type_env.rb

@@ -73,6 +73,12 @@ module Steep
         end
       end
 
+      def merge_const_types(env)
+        env.const_types.each do |name, type|
+          const_types[name] = type unless const_types.key?(name)
+        end
+      end
+
       def set(const: nil, gvar: nil, ivar: nil, type:)
         case
         when const

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/steep.rb

@@ -1,7 +1,7 @@
 require "steep/version"
 
 require "pathname"
-require "parser/ruby30"
+require "parser/ruby31"
 require "active_support"
 require "active_support/core_ext/object/try"
 require "active_support/core_ext/string/inflections"
@@ -21,6 +21,8 @@ require "terminal-table"
 
 require "rbs"
 
+require "steep/path_helper"
+
 require "steep/shims/filter_map"
 
 require "steep/equatable"
@@ -65,7 +67,6 @@ require "steep/subtyping/cache"
 require "steep/subtyping/relation"
 require "steep/subtyping/constraints"
 require "steep/subtyping/variable_variance"
-require "steep/subtyping/variable_occurrence"
 
 require "steep/diagnostic/helper"
 require "steep/diagnostic/ruby"

data/smoke/regression/lambda.rb

@@ -0,0 +1,3 @@
+module Mod
+  ->(){}
+end

data/smoke/regression/test_expectations.yml

@@ -40,6 +40,18 @@
              | (::Numeric) -> ::Time
              | (::Time) -> ::Float
     code: Ruby::UnresolvedOverloading
+- file: lambda.rb
+  diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 7
+      end:
+        line: 1
+        character: 10
+    severity: ERROR
+    message: 'Cannot find the declaration of module: `Mod`'
+    code: Ruby::UnknownConstant
 - file: set_divide.rb
   diagnostics:
   - range:

data/steep.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_runtime_dependency "parser", ">= 3.0"
+  spec.add_runtime_dependency "parser", ">= 3.1"
   spec.add_runtime_dependency "activesupport", ">= 5.1"
   spec.add_runtime_dependency "rainbow", ">= 2.2.2", "< 4.0"
   spec.add_runtime_dependency "listen", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/ruby-windows.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
@@ -224,6 +225,7 @@ files:
 - lib/steep/interface/type_param.rb
 - lib/steep/method_name.rb
 - lib/steep/module_helper.rb
+- lib/steep/path_helper.rb
 - lib/steep/project.rb
 - lib/steep/project/dsl.rb
 - lib/steep/project/options.rb
@@ -256,7 +258,6 @@ files:
 - lib/steep/subtyping/constraints.rb
 - lib/steep/subtyping/relation.rb
 - lib/steep/subtyping/result.rb
-- lib/steep/subtyping/variable_occurrence.rb
 - lib/steep/subtyping/variable_variance.rb
 - lib/steep/type_construction.rb
 - lib/steep/type_inference/block_params.rb
@@ -481,6 +482,7 @@ files:
 - smoke/regression/issue_332.rbs
 - smoke/regression/issue_372.rb
 - smoke/regression/issue_372.rbs
+- smoke/regression/lambda.rb
 - smoke/regression/masgn.rb
 - smoke/regression/poly_new.rb
 - smoke/regression/poly_new.rbs

data/lib/steep/subtyping/variable_occurrence.rb

@@ -1,51 +0,0 @@
-module Steep
-  module Subtyping
-    class VariableOccurence
-      attr_reader :params
-      attr_reader :returns
-
-      def initialize
-        @params = Set.new
-        @returns = Set.new
-      end
-
-      def add_method_type(method_type)
-        method_type.type.params.each_type do |type|
-          each_var(type) do |var|
-            params << var
-          end
-        end
-        each_var(method_type.type.return_type) do |var|
-          returns << var
-        end
-
-        method_type.block&.yield_self do |block|
-          block.type.params.each_type do |type|
-            each_var(type) do |var|
-              params << var
-            end
-          end
-          each_var(block.type.return_type) do |var|
-            returns << var
-          end
-        end
-
-        params.subtract(returns)
-      end
-
-      def each_var(type, &block)
-        type.free_variables.each(&block)
-      end
-
-      def strictly_return?(var)
-        !params.member?(var) && returns.member?(var)
-      end
-
-      def self.from_method_type(method_type)
-        self.new.tap do |occurence|
-          occurence.add_method_type(method_type)
-        end
-      end
-    end
-  end
-end