steep 1.4.0 → 1.5.0.pre.1

data/sig/steep/typing.rbs

@@ -1,11 +1,13 @@
+use Steep::TypeInference::Context, Steep::TypeInference::ContextArray, Steep::TypeInference::MethodCall
+
 module Steep
   class Typing
     class UnknownNodeError < StandardError
-      attr_reader op: untyped
+      attr_reader op: Symbol
 
-      attr_reader node: untyped
+      attr_reader node: Parser::AST::Node
 
-      def initialize: (untyped op, node: untyped) -> void
+      def initialize: (Symbol op, node: Parser::AST::Node) -> void
     end
 
     attr_reader source: Source
@@ -16,43 +18,43 @@ module Steep
 
     attr_reader parent: Typing?
 
-    attr_reader parent_last_update: untyped
+    attr_reader parent_last_update: Integer?
 
-    attr_reader last_update: untyped
+    attr_reader last_update: Integer
 
-    attr_reader should_update: untyped
+    attr_reader should_update: bool
 
-    attr_reader contexts: untyped
+    attr_reader contexts: ContextArray
 
-    attr_reader root_context: untyped
+    attr_reader root_context: Context
 
-    attr_reader method_calls: untyped
+    attr_reader method_calls: Hash[Parser::AST::Node, MethodCall::t]
 
-    attr_reader source_index: untyped
+    attr_reader source_index: Index::SourceIndex
 
-    def initialize: (source: untyped, root_context: untyped, ?parent: untyped?, ?parent_last_update: untyped, ?contexts: untyped?, ?source_index: untyped?) -> void
+    def initialize: (source: Source, root_context: Context, ?parent: Typing?, ?parent_last_update: Integer?, ?contexts: ContextArray?, ?source_index: Index::SourceIndex?) -> void
 
     def add_error: (Diagnostic::Ruby::Base error) -> void
 
-    def add_typing: (Parser::AST::Node node, AST::Types::t `type`, top) -> untyped
+    def add_typing: (Parser::AST::Node node, AST::Types::t `type`, top) -> void
 
-    def add_call: (untyped node, untyped call) -> untyped
+    def add_call: (Parser::AST::Node node, MethodCall::t call) -> void
 
-    def add_context: (Range[Integer] range, context: TypeInference::Context) -> void
+    def add_context: (Range[Integer] range, context: Context) -> void
 
-    def has_type?: (untyped node) -> untyped
+    def has_type?: (Parser::AST::Node node) -> bool
 
     def type_of: (node: Parser::AST::Node) -> AST::Types::t
 
     def call_of: (node: Parser::AST::Node) -> TypeInference::MethodCall::t
 
-    def add_context_for_node: (untyped node, context: untyped) -> untyped
+    def add_context_for_node: (Parser::AST::Node node, context: Context) -> void
 
-    def block_range: (untyped node) -> ::Range[untyped]
+    def block_range: (Parser::AST::Node node) -> Range[Integer]
 
-    def add_context_for_body: (untyped node, context: untyped) -> untyped
+    def add_context_for_body: (Parser::AST::Node node, context: Context) -> void
 
-    def context_at: (line: Integer, column: Integer) -> TypeInference::Context
+    def context_at: (line: Integer, column: Integer) -> Context
 
     def dump: (untyped io) -> untyped
 
@@ -61,7 +63,7 @@ module Steep
     def new_child: [A] (Range[Integer] range) { (Typing) -> A } -> A
                  | (Range[Integer]) -> Typing
 
-    def each_typing: () { (Parser::AST::Node, AST::Types::t) -> void } -> void
+    def each_typing: () { ([Parser::AST::Node, AST::Types::t]) -> void } -> void
 
     # Push the current changes to the `#parent` typing
     #

data/sig/steep.rbs

@@ -3,33 +3,34 @@ module Steep
 
   def self.logger: () -> (Logger & ActiveSupport::TaggedLogging)
 
-  def self.new_logger: (untyped output, untyped prev_level) -> untyped
+  def self.new_logger: (IO output, Integer? prev_level) -> (Logger & ActiveSupport::TaggedLogging)
 
-  def self.log_output: () -> untyped
-
-  def self.log_output=: (untyped output) -> untyped
+  attr_accessor self.log_output: IO
 
   def self.measure: [A] (String message, ?level: ::Symbol) { () -> A } -> A
 
-  def self.log_error: (untyped exn, ?message: ::String) -> untyped
+  def self.log_error: (Exception exn, ?message: ::String) -> void
 
-  self.@logger: ActiveSupport::TaggedLogging?
+  self.@logger: (Logger & ActiveSupport::TaggedLogging)?
 
   class Sampler
+    type sample = [String, Float]
+    @samples: Array[sample]
+
     def initialize: () -> void
 
-    def sample: (untyped message) { () -> untyped } -> untyped
+    def sample: [A] (String message) { () -> A } -> A
 
-    def count: () -> untyped
+    def count: () -> Integer
 
-    def total: () -> untyped
+    def total: () -> Float
 
-    def slowests: (untyped num) -> untyped
+    def slowests: (Integer num) -> Array[sample]
 
-    def average: () -> (untyped | 0)
+    def average: () -> Float
 
-    def percentile: (untyped p) -> untyped
+    def percentile: (Integer p) -> Float
   end
 
-  def self.measure2: (untyped message, ?level: ::Symbol) { (untyped) -> untyped } -> untyped
+  def self.measure2: [A] (String message, ?level: ::Symbol) { (Sampler) -> A } -> A
 end

data/smoke/and/a.rb

@@ -1,7 +1,7 @@
 # @type var b: String
 # @type var c: ::Integer
 
-a = "foo"
+a = ["foo"].sample
 
 b = a && a.to_str
 

data/smoke/and/test_expectations.yml

@@ -10,8 +10,8 @@
         character: 17
     severity: ERROR
     message: |-
-      Cannot assign a value of type `(::String | nil)` to a variable of type `::String`
-        (::String | nil) <: ::String
+      Cannot assign a value of type `(nil | ::String)` to a variable of type `::String`
+        (nil | ::String) <: ::String
           nil <: ::String
     code: Ruby::IncompatibleAssignment
   - range:
@@ -23,9 +23,7 @@
         character: 17
     severity: ERROR
     message: |-
-      Cannot assign a value of type `(::String | nil)` to a variable of type `::Integer`
-        (::String | nil) <: ::Integer
-          ::String <: ::Integer
-            ::Object <: ::Integer
-              ::BasicObject <: ::Integer
+      Cannot assign a value of type `(nil | ::String)` to a variable of type `::Integer`
+        (nil | ::String) <: ::Integer
+          nil <: ::Integer
     code: Ruby::IncompatibleAssignment

data/smoke/diagnostics/incompatible_annotation.rb

@@ -1,6 +1,6 @@
 a = [1,2,3]
 
-if 1
+if _ = 1
   # @type var a: String
   a + ""
 end

data/smoke/diagnostics/test_expectations.yml

@@ -130,8 +130,8 @@
         line: 11
         character: 26
     severity: ERROR
-    message: The branch is unreachable because the condition is exhaustive
-    code: Ruby::ElseOnExhaustiveCase
+    message: The branch is unreachable
+    code: Ruby::UnreachableBranch
 - file: incompatible_annotation.rb
   diagnostics:
   - range:

data/smoke/enumerator/a.rb

@@ -3,11 +3,4 @@
 a = [1]
 
 hash = a.each.with_object("") do |x, y|
-  hash = x
-  hash = y
-end
-
-hash = a.each.with_index do |x, y|
-  hash = x
-  hash = y
 end

data/smoke/enumerator/b.rb

@@ -4,12 +4,10 @@
 a = [1]
 
 b = a.each.with_object([]) do |i, xs|
-  # @type var xs: String
   xs << i.to_s
 end
 
 c = a.each.with_object([]) do |i, xs|
-  # @type var xs: Array[String]
   xs << i.to_s
 end
 

data/smoke/enumerator/test_expectations.yml

@@ -4,98 +4,39 @@
   - range:
       start:
         line: 5
-        character: 0
-      end:
-        line: 8
-        character: 3
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `::String` to a variable of type `::Hash[::Symbol, ::String]`
-        ::String <: ::Hash[::Symbol, ::String]
-          ::Object <: ::Hash[::Symbol, ::String]
-            ::BasicObject <: ::Hash[::Symbol, ::String]
-    code: Ruby::IncompatibleAssignment
-  - range:
-      start:
-        line: 6
-        character: 2
+        character: 7
       end:
         line: 6
-        character: 10
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `::Integer` to a variable of type `::Hash[::Symbol, ::String]`
-        ::Integer <: ::Hash[::Symbol, ::String]
-          ::Numeric <: ::Hash[::Symbol, ::String]
-            ::Object <: ::Hash[::Symbol, ::String]
-              ::BasicObject <: ::Hash[::Symbol, ::String]
-    code: Ruby::IncompatibleAssignment
-  - range:
-      start:
-        line: 7
-        character: 2
-      end:
-        line: 7
-        character: 10
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `::String` to a variable of type `::Hash[::Symbol, ::String]`
-        ::String <: ::Hash[::Symbol, ::String]
-          ::Object <: ::Hash[::Symbol, ::String]
-            ::BasicObject <: ::Hash[::Symbol, ::String]
-    code: Ruby::IncompatibleAssignment
-  - range:
-      start:
-        line: 10
-        character: 0
-      end:
-        line: 13
         character: 3
     severity: ERROR
     message: |-
-      Cannot assign a value of type `::Array[::Integer]` to a variable of type `::Hash[::Symbol, ::String]`
-        ::Array[::Integer] <: ::Hash[::Symbol, ::String]
-          ::Object <: ::Hash[::Symbol, ::String]
-            ::BasicObject <: ::Hash[::Symbol, ::String]
-    code: Ruby::IncompatibleAssignment
+      Cannot find compatible overloading of method `with_object` of type `::Enumerator[::Integer, ::Array[::Integer]]`
+      Method types:
+        def with_object: [U] (U) { (::Integer, U) -> untyped } -> U
+                       | [U] (U) -> ::Enumerator[[::Integer, U], U]
+    code: Ruby::UnresolvedOverloading
+- file: b.rb
+  diagnostics:
   - range:
       start:
         line: 11
-        character: 2
+        character: 8
       end:
         line: 11
-        character: 10
+        character: 14
     severity: ERROR
     message: |-
-      Cannot assign a value of type `::Integer` to a variable of type `::Hash[::Symbol, ::String]`
-        ::Integer <: ::Hash[::Symbol, ::String]
-          ::Numeric <: ::Hash[::Symbol, ::String]
-            ::Object <: ::Hash[::Symbol, ::String]
-              ::BasicObject <: ::Hash[::Symbol, ::String]
-    code: Ruby::IncompatibleAssignment
+      Cannot pass a value of type `::String` as an argument of type `::Integer`
+        ::String <: ::Integer
+          ::Object <: ::Integer
+            ::BasicObject <: ::Integer
+    code: Ruby::ArgumentTypeMismatch
   - range:
       start:
-        line: 12
-        character: 2
-      end:
-        line: 12
-        character: 10
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `::Integer` to a variable of type `::Hash[::Symbol, ::String]`
-        ::Integer <: ::Hash[::Symbol, ::String]
-          ::Numeric <: ::Hash[::Symbol, ::String]
-            ::Object <: ::Hash[::Symbol, ::String]
-              ::BasicObject <: ::Hash[::Symbol, ::String]
-    code: Ruby::IncompatibleAssignment
-- file: b.rb
-  diagnostics:
-  - range:
-      start:
-        line: 6
+        line: 15
         character: 4
       end:
-        line: 9
+        line: 17
         character: 3
     severity: ERROR
     message: |-
@@ -104,32 +45,3 @@
         def with_object: [U] (U) { (::Integer, U) -> untyped } -> U
                        | [U] (U) -> ::Enumerator[[::Integer, U], U]
     code: Ruby::UnresolvedOverloading
-  - range:
-      start:
-        line: 11
-        character: 0
-      end:
-        line: 14
-        character: 3
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `::Array[::String]` to a variable of type `::Array[::Integer]`
-        ::Array[::String] <: ::Array[::Integer]
-          ::String <: ::Integer
-            ::Object <: ::Integer
-              ::BasicObject <: ::Integer
-    code: Ruby::IncompatibleAssignment
-  - range:
-      start:
-        line: 17
-        character: 0
-      end:
-        line: 19
-        character: 3
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `::Array[untyped]` to a variable of type `::String`
-        ::Array[untyped] <: ::String
-          ::Object <: ::String
-            ::BasicObject <: ::String
-    code: Ruby::IncompatibleAssignment

data/smoke/lambda/a.rb

@@ -6,10 +6,5 @@ a = -> (x, y) do
   x + y
 end["foo", "bar"]
 
-# @type var b: ^(Integer) -> Integer
-b = lambda do |x|
-  x + 1
-end
-
 # @type var c: ^(Integer) -> Integer
 c = -> (x) { x + 1 }

data/smoke/lambda/test_expectations.yml

@@ -15,25 +15,3 @@
           ::Object <: ::Integer
             ::BasicObject <: ::Integer
     code: Ruby::IncompatibleAssignment
-  - range:
-      start:
-        line: 10
-        character: 0
-      end:
-        line: 12
-        character: 3
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `::Proc` to a variable of type `^(::Integer) -> ::Integer`
-        ::Proc <: ^(::Integer) -> ::Integer
-    code: Ruby::IncompatibleAssignment
-  - range:
-      start:
-        line: 11
-        character: 4
-      end:
-        line: 11
-        character: 5
-    severity: ERROR
-    message: Type `nil` does not have method `+`
-    code: Ruby::NoMethod

data/smoke/type_case/test_expectations.yml

@@ -11,6 +11,16 @@
     severity: ERROR
     message: Type `(::Integer | ::String)` does not have method `foobar`
     code: Ruby::NoMethod
+  - range:
+      start:
+        line: 12
+        character: 2
+      end:
+        line: 12
+        character: 10
+    severity: ERROR
+    message: The branch is unreachable
+    code: Ruby::UnreachableBranch
   - range:
       start:
         line: 12

data/steep.gemspec

@@ -33,8 +33,8 @@ 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.8.0"
-  spec.add_runtime_dependency "concurrent-ruby", ">= 1.2.2"
+  spec.add_runtime_dependency "rbs", ">= 3.1.0"
+  spec.add_runtime_dependency "concurrent-ruby", ">= 1.1.10"
   spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
   spec.add_runtime_dependency "securerandom", ">= 0.1"
   spec.add_runtime_dependency "json", ">= 2.1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0.pre.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -98,28 +98,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +237,7 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
+- ".vscode/steep-shared.code-snippets"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -287,6 +288,7 @@ files:
 - lib/steep/ast/types/var.rb
 - lib/steep/ast/types/void.rb
 - lib/steep/cli.rb
+- lib/steep/diagnostic/deprecated/else_on_exhaustive_case.rb
 - lib/steep/diagnostic/deprecated/unknown_constant_assigned.rb
 - lib/steep/diagnostic/helper.rb
 - lib/steep/diagnostic/lsp_formatter.rb
@@ -358,6 +360,7 @@ files:
 - lib/steep/subtyping/relation.rb
 - lib/steep/subtyping/result.rb
 - lib/steep/subtyping/variable_variance.rb
+- lib/steep/thread_waiter.rb
 - lib/steep/type_construction.rb
 - lib/steep/type_inference/block_params.rb
 - lib/steep/type_inference/constant_env.rb
@@ -380,6 +383,7 @@ files:
 - sample/lib/length.rb
 - sample/sig/conference.rbs
 - sample/sig/length.rbs
+- sig/shims/bundler.rbs
 - sig/shims/concurrent-ruby.rbs
 - sig/shims/exception.rbs
 - sig/shims/language-server_protocol.rbs
@@ -420,6 +424,7 @@ files:
 - sig/steep/ast/types/var.rbs
 - sig/steep/ast/types/void.rbs
 - sig/steep/cli.rbs
+- sig/steep/diagnostic/deprecated/else_on_exhaustive_case.rbs
 - sig/steep/diagnostic/deprecated/unknown_constant_assigned.rbs
 - sig/steep/diagnostic/helper.rbs
 - sig/steep/diagnostic/lsp_formatter.rbs
@@ -440,6 +445,7 @@ files:
 - sig/steep/drivers/watch.rbs
 - sig/steep/drivers/worker.rbs
 - sig/steep/equatable.rbs
+- sig/steep/expectations.rbs
 - sig/steep/index/rbs_index.rbs
 - sig/steep/index/signature_symbol_provider.rbs
 - sig/steep/index/source_index.rbs
@@ -488,6 +494,7 @@ files:
 - sig/steep/subtyping/relation.rbs
 - sig/steep/subtyping/result.rbs
 - sig/steep/subtyping/variable_variance.rbs
+- sig/steep/thread_waiter.rbs
 - sig/steep/type_construction.rbs
 - sig/steep/type_inference/block_params.rbs
 - sig/steep/type_inference/constant_env.rbs
@@ -775,11 +782,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Gradual Typing for Ruby