steep 1.6.0.pre.2 → 1.6.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a94bcc44621f7c597278fe70c9a9f909983408b8f02fae8ba400b8193f88918
-  data.tar.gz: 32381468ac551d739b2ab84c70a5bfb0ea30265ca66ab3020f8eb3a99b53b2ba
+  metadata.gz: 9d612ef62eb6e7c7e280b918e6cf1bfbcaac06346f4a49b18f61db5cc277798d
+  data.tar.gz: 04c2542f6fc1b05f6c1a36ac470b85d90cbe9a1af5eb82bda37be5a41cc93b14
 SHA512:
-  metadata.gz: 02bb300d0a9f42ccf368a32f8b6161eb6332433b5a68d6f9e75158d52cfe9ea19b67aba437b31000817b21b009e78f46633c5b7745157f32520deb711dcdbeb8
-  data.tar.gz: 367df39a6e217e6c962d4eee1d38a0d1f8e55833190375ce3e17d2b11f2a049e9e8ce78e6fdfb14db5d69c917f4f6ff4460ffb2d50197325f8dc0433bfd4149f
+  metadata.gz: 48bc0af1c2ad26831d11588e2224eb6b45fe71f45faa3d030475402260e6f693b8a528d6831e2619b68e76359264a1d8445c8902efe6aaefc2adfe3c8fc8513c
+  data.tar.gz: c61112bbc9cc29bf805fe12cc4b21352e7603252538440952e63af19888f34219131e38726b181238c052c09b479d3a1e4d2c23adf4d70e1f004ed207dccb796

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## master
 
+## 1.6.0.pre.4 (2023-11-02)
+
+### Language server
+
+* Fix LSP text synchronization problems ([#954](https://github.com/soutaro/steep/pull/954))
+
+## 1.6.0.pre.3 (2023-11-01)
+
+### Type checker core
+
+* Object methods are moved to Kernel ([#952](https://github.com/soutaro/steep/pull/952))
+* Check if `rescue` body has `bot` type ([#953](https://github.com/soutaro/steep/pull/953))
+
 ## 1.6.0.pre.2 (2023-10-31)
 
 ### Type checker core

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steep (1.6.0.pre.2)
+    steep (1.6.0.pre.4)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
@@ -66,7 +66,7 @@ GEM
       racc
     psych (5.1.0)
       stringio
-    racc (1.7.1)
+    racc (1.7.2)
     rainbow (3.1.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)

data/lib/steep/interface/builder.rb

@@ -1,4 +1,3 @@
-
 module Steep
   module Interface
     class Builder
@@ -718,22 +717,30 @@ module Steep
         if member.is_a?(RBS::AST::Members::MethodDefinition)
           case method_name.method_name
           when :is_a?, :kind_of?, :instance_of?
-            if defined_in == RBS::BuiltinNames::Object.name && member.instance?
-              return method_type.with(
-                type: method_type.type.with(
-                  return_type: AST::Types::Logic::ReceiverIsArg.new(location: method_type.type.return_type.location)
+            case
+            when RBS::BuiltinNames::Object.name,
+              RBS::BuiltinNames::Kernel.name
+              if member.instance?
+                return method_type.with(
+                  type: method_type.type.with(
+                    return_type: AST::Types::Logic::ReceiverIsArg.new(location: method_type.type.return_type.location)
+                  )
                 )
-              )
+              end
             end
 
           when :nil?
             case defined_in
-            when RBS::BuiltinNames::Object.name, AST::Builtin::NilClass.module_name
-              return method_type.with(
-                type: method_type.type.with(
-                  return_type: AST::Types::Logic::ReceiverIsNil.new(location: method_type.type.return_type.location)
+            when RBS::BuiltinNames::Object.name,
+              AST::Builtin::NilClass.module_name,
+              RBS::BuiltinNames::Kernel.name
+              if member.instance?
+                return method_type.with(
+                  type: method_type.type.with(
+                    return_type: AST::Types::Logic::ReceiverIsNil.new(location: method_type.type.return_type.location)
+                  )
                 )
-              )
+            end
             end
 
           when :!
@@ -757,8 +764,14 @@ module Steep
                   return_type: AST::Types::Logic::ArgIsReceiver.new(location: method_type.type.return_type.location)
                 )
               )
-            when RBS::BuiltinNames::Object.name, RBS::BuiltinNames::String.name, RBS::BuiltinNames::Integer.name, RBS::BuiltinNames::Symbol.name,
-              RBS::BuiltinNames::TrueClass.name, RBS::BuiltinNames::FalseClass.name, TypeName("::NilClass")
+            when RBS::BuiltinNames::Object.name,
+              RBS::BuiltinNames::Kernel.name,
+              RBS::BuiltinNames::String.name,
+              RBS::BuiltinNames::Integer.name,
+              RBS::BuiltinNames::Symbol.name,
+              RBS::BuiltinNames::TrueClass.name,
+              RBS::BuiltinNames::FalseClass.name,
+              TypeName("::NilClass")
               # Value based type-case works on literal types which is available for String, Integer, Symbol, TrueClass, FalseClass, and NilClass
               return method_type.with(
                 type: method_type.type.with(
@@ -783,3 +796,4 @@ module Steep
     end
   end
 end
+

data/lib/steep/server/master.rb

@@ -115,18 +115,25 @@ module Steep
             code_paths.include?(path)
           end
 
-          def add(path)
-            return if library_path?(path) || signature_path?(path) || code_path?(path)
+          def add(path, library: false)
+            return true if signature_path?(path) || code_path?(path) || library_path?(path)
 
-            relative_path = project.relative_path(path)
-
-            case
-            when target.source_pattern =~ relative_path
-              code_paths << path
-            when target.signature_pattern =~ relative_path
-              signature_paths << path
-            else
+            if library
               library_paths << path
+              true
+            else
+              relative_path = project.relative_path(path)
+
+              case
+              when target.source_pattern =~ relative_path
+                code_paths << path
+                true
+              when target.signature_pattern =~ relative_path
+                signature_paths << path
+                true
+              else
+                false
+              end
             end
           end
 
@@ -645,20 +652,22 @@ module Steep
 
             path = PathHelper.to_pathname(uri) or next
 
-            controller.push_changes(path)
+            unless controller.priority_paths.include?(path)
+              controller.push_changes(path)
 
-            case type
-            when 1, 2
-              content = path.read
-            when 4
-              # Deleted
-              content = ""
-            end
+              case type
+              when 1, 2
+                content = path.read
+              when 4
+                # Deleted
+                content = ""
+              end
 
-            broadcast_notification({
-              method: "$/file/reset",
-              params: { uri: uri, content: content }
-            })
+              broadcast_notification({
+                method: "$/file/reset",
+                params: { uri: uri, content: content }
+              })
+            end
           end
 
           if typecheck_automatically
@@ -683,6 +692,8 @@ module Steep
               start_type_checking_queue.execute do
                 job_queue.push(
                   -> do
+                    Steep.logger.info { "Starting type check from textDocument/didChange notification..." }
+
                     last_request = current_type_check_request
                     if request = controller.make_request(last_request: last_request)
                       start_type_check(request, last_request: last_request, start_progress: request.total > 10)

data/lib/steep/type_construction.rb

@@ -2214,6 +2214,10 @@ module Steep
               end
             end
 
+            resbody_pairs.select! do |pair|
+              no_subtyping?(sub_type: pair.type, super_type: AST::Types::Bot.new)
+            end
+
             resbody_types = resbody_pairs.map(&:type)
             resbody_envs = resbody_pairs.map {|pair| pair.context.type_env }
 
@@ -2225,8 +2229,13 @@ module Steep
                 .update_type_env {|env| env.join(*resbody_envs, env) }
                 .add_typing(node, type: union_type(else_type, *resbody_types))
             else
-              update_type_env {|env| env.join(*resbody_envs, else_constr.context.type_env) }
-                .add_typing(node, type: union_type(*[body_pair&.type, *resbody_types].compact))
+              if resbody_types.empty?
+                constr = body_pair ? body_pair.constr : self
+                constr.add_typing(node, type: body_pair&.type || AST::Builtin.nil_type)
+              else
+                update_type_env {|env| env.join(*resbody_envs, else_constr.context.type_env) }
+                  .add_typing(node, type: union_type(*[body_pair&.type, *resbody_types].compact))
+              end
             end
           end
 

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.6.0.pre.2"
+  VERSION = "1.6.0.pre.4"
 end

data/sig/steep/server/master.rbs

@@ -61,15 +61,29 @@ module Steep
 
         attr_reader target_paths: Array[TargetPaths]
 
+        # TargetPaths object keeps track of the expanded absolute paths of each target
+        #
+        # 1. *Library path* is a RBS file that is loaded as a part of a library
+        # 2. *Signature path* is a RBS file that is loaded as a part of the application library
+        # 3. *Code path* is a Ruby file that is being type checked
+        #
         class TargetPaths
           attr_reader project: Project
 
           attr_reader target: Project::Target
 
+          # Set of absolute paths of Ruby code
+          #
           attr_reader code_paths: Set[Pathname]
 
+          # Set of absolute paths of app signatures
+          #
           attr_reader signature_paths: Set[Pathname]
 
+          # Set of absolute paths of library signatures
+          #
+          # Unlike `code_paths` and `signature_paths`, the `library_paths` must be added explicitly not by `#add` method.
+          #
           attr_reader library_paths: Set[Pathname]
 
           def initialize: (project: Project, target: Project::Target) -> void
@@ -82,7 +96,14 @@ module Steep
 
           def code_path?: (Pathname path) -> bool
 
-          def add: (Pathname path) -> void
+          # Adds `path` to the object
+          #
+          # Returns `false` if the path is not a part of the project.
+          #
+          # Whether `path` is a code path or signature path is automatically detected.
+          # `library: true` is required to add the path to library path.
+          #
+          def add: (Pathname path, ?library: bool) -> bool
 
           alias << add
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.6.0.pre.2
+  version: 1.6.0.pre.4
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser