steep 1.1.1 → 1.2.0.pre.1

data/lib/steep/project.rb

@@ -34,14 +34,12 @@ module Steep
 
     def targets_for_path(path)
       if target = target_for_source_path(path)
-        [target, []]
+        target
       else
-        [
-          nil,
-          targets.select do |target|
-            target.possible_signature_file?(path)
-          end
-        ]
+        ts = targets.select {|target| target.possible_signature_file?(path) }
+        unless ts.empty?
+          ts
+        end
       end
     end
   end

data/lib/steep/server/base_worker.rb

@@ -6,7 +6,7 @@ module Steep
       attr_reader :project
       attr_reader :reader, :writer, :queue
 
-      ShutdownJob = Struct.new(:id, keyword_init: true)
+      ShutdownJob = _ = Struct.new(:id, keyword_init: true)
 
       def initialize(project:, reader:, writer:)
         @project = project
@@ -14,7 +14,7 @@ module Steep
         @writer = writer
         @skip_job = false
         @shutdown = false
-        @skip_jobs_after_shutdown = nil
+        @skip_jobs_after_shutdown = false
       end
 
       def skip_jobs_after_shutdown!(flag = true)

data/lib/steep/server/change_buffer.rb

@@ -11,11 +11,12 @@ module Steep
       end
 
       def pop_buffer
-        changes = {}
-        @mutex.synchronize do
-          changes.merge!(buffered_changes)
+        changes = @mutex.synchronize do
+          copy = buffered_changes.dup
           buffered_changes.clear
+          copy
         end
+        
         if block_given?
           yield changes
         else

data/lib/steep/server/interaction_worker.rb

@@ -126,7 +126,7 @@ module Steep
                 is_incomplete: false,
                 items: completion_items
               )
-            when (_, targets = project.targets_for_path(job.path))
+            when (targets = project.targets_for_path(job.path)).is_a?(Array)
               target = targets[0] or return
               sig_service = service.signature_services[target.name]
               relative_path = job.path

data/lib/steep/server/master.rb

@@ -172,6 +172,7 @@ module Steep
 
         def update_priority(open: nil, close: nil)
           path = open || close
+          path or raise
 
           target_paths.each {|paths| paths << path }
 
@@ -263,7 +264,6 @@ module Steep
 
         def initialize()
           @handlers = {}
-          @waiting_handlers = Set[]
           @completion_handler = nil
         end
 
@@ -321,13 +321,61 @@ module Steep
         end
       end
 
-      ReceiveMessageJob = Struct.new(:source, :message, keyword_init: true) do
+      module MessageUtils
+        def request?
+          if method && id
+            true
+          else
+            false
+          end
+        end
+
+        def response?
+          if id && !method
+            true
+          else
+            false
+          end
+        end
+
+        def notification?
+          if method && !id
+            true
+          else
+            false
+          end
+        end
+
+        def method
+          message[:method]
+        end
+
+        def id
+          message[:id]
+        end
+
+        def result
+          message[:result]
+        end
+
+        def params
+          message[:params]
+        end
+      end
+
+      ReceiveMessageJob = _ = Struct.new(:source, :message, keyword_init: true) do
+        # @implements ReceiveMessageJob
+
         def response?
           message.key?(:id) && !message.key?(:method)
         end
+
+        include MessageUtils
       end
 
-      SendMessageJob = Struct.new(:dest, :message, keyword_init: true) do
+      SendMessageJob = _ = Struct.new(:dest, :message, keyword_init: true) do
+        # @implements SendMessageJob
+
         def self.to_worker(worker, message:)
           new(dest: worker, message: message)
         end
@@ -335,9 +383,10 @@ module Steep
         def self.to_client(message:)
           new(dest: :client, message: message)
         end
+
+        include MessageUtils
       end
 
-      attr_reader :steepfile
       attr_reader :project
       attr_reader :reader, :writer
       attr_reader :commandline_args
@@ -373,6 +422,7 @@ module Steep
         Steep.logger.tagged "master" do
           tags = Steep.logger.formatter.current_tags.dup
 
+          # @type var worker_threads: Array[Thread]
           worker_threads = []
 
           if interaction_worker
@@ -404,7 +454,8 @@ module Steep
             while job = job_queue.deq
               case job
               when ReceiveMessageJob
-                src = if job.source == :client
+                src = case job.source
+                      when :client
                         :client
                       else
                         job.source.name
@@ -447,9 +498,9 @@ module Steep
       end
 
       def each_worker(&block)
-        if block_given?
+        if block
           yield interaction_worker if interaction_worker
-          typecheck_workers.each &block
+          typecheck_workers.each(&block)
         else
           enum_for :each_worker
         end
@@ -460,7 +511,7 @@ module Steep
       end
 
       def work_done_progress_supported?
-        initialize_params&.dig(:capabilities, :window, :workDoneProgress)
+        initialize_params&.dig(:capabilities, :window, :workDoneProgress) ? true : false
       end
 
       def process_message_from_client(message)
@@ -641,6 +692,14 @@ module Steep
             )
           end
 
+        when "$/ping"
+          job_queue << SendMessageJob.to_client(
+            message: {
+                id: message[:id],
+                result: message[:params]
+            }
+          )
+
         when "shutdown"
           result_controller << group_request do |group|
             each_worker do |worker|
@@ -794,9 +853,10 @@ module Steep
       def send_request(method:, id: fresh_request_id(), params: nil, worker:, &block)
         Steep.logger.info "Sending request #{method}(#{id}) to #{worker.name}"
 
+        # @type var message: lsp_request
         message = { method: method, id: id, params: params }
         ResultHandler.new(request: message).tap do |handler|
-          yield handler if block_given?
+          yield handler if block
           job_queue << SendMessageJob.to_worker(worker, message: message)
         end
       end

data/lib/steep/server/type_check_worker.rb

@@ -5,13 +5,15 @@ module Steep
       attr_reader :commandline_args
       attr_reader :current_type_check_guid
 
-      WorkspaceSymbolJob = Struct.new(:query, :id, keyword_init: true)
-      StatsJob = Struct.new(:id, keyword_init: true)
-      StartTypeCheckJob = Struct.new(:guid, :changes, keyword_init: true)
-      TypeCheckCodeJob = Struct.new(:guid, :path, keyword_init: true)
-      ValidateAppSignatureJob = Struct.new(:guid, :path, keyword_init: true)
-      ValidateLibrarySignatureJob = Struct.new(:guid, :path, keyword_init: true)
-      GotoJob = Struct.new(:id, :kind, :params, keyword_init: true) do
+      WorkspaceSymbolJob = _ = Struct.new(:query, :id, keyword_init: true)
+      StatsJob = _ = Struct.new(:id, keyword_init: true)
+      StartTypeCheckJob = _ = Struct.new(:guid, :changes, keyword_init: true)
+      TypeCheckCodeJob = _ = Struct.new(:guid, :path, keyword_init: true)
+      ValidateAppSignatureJob = _ = Struct.new(:guid, :path, keyword_init: true)
+      ValidateLibrarySignatureJob = _ = Struct.new(:guid, :path, keyword_init: true)
+      GotoJob = _ = Struct.new(:id, :kind, :params, keyword_init: true) do
+        # @implements GotoJob
+
         def self.implementation(id:, params:)
           new(
             kind: :implementation,
@@ -86,10 +88,10 @@ module Steep
           queue << StartTypeCheckJob.new(guid: guid, changes: changes)
         end
 
-        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) }
+        priority_paths = Set.new(params[:priority_uris].map {|uri| Steep::PathHelper.to_pathname(uri) || raise })
+        library_paths = params[:library_uris].map {|uri| Steep::PathHelper.to_pathname(uri) || raise }
+        signature_paths = params[:signature_uris].map {|uri| Steep::PathHelper.to_pathname(uri) || raise }
+        code_paths = params[:code_uris].map {|uri| Steep::PathHelper.to_pathname(uri) || raise }
 
         library_paths.each do |path|
           if priority_paths.include?(path)

data/lib/steep/server/worker_process.rb

@@ -52,13 +52,15 @@ module Steep
 
       def self.spawn_typecheck_workers(steepfile:, args:, steep_command: "steep", count: [Etc.nprocessors - 1, 1].max, delay_shutdown: false)
         count.times.map do |i|
-          spawn_worker(:typecheck,
-                       name: "typecheck@#{i}",
-                       steepfile: steepfile,
-                       steep_command: steep_command,
-                       options: ["--max-index=#{count}", "--index=#{i}", *args],
-                       delay_shutdown: delay_shutdown,
-                       index: i)
+          spawn_worker(
+            :typecheck,
+            name: "typecheck@#{i}",
+            steepfile: steepfile,
+            steep_command: steep_command,
+            options: ["--max-index=#{count}", "--index=#{i}", *args],
+            delay_shutdown: delay_shutdown,
+            index: i
+          )
         end
       end
 

data/lib/steep/services/completion_provider.rb

@@ -343,9 +343,21 @@ module Steep
 
       def method_items_for_receiver_type(type, include_private:, prefix:, position:, items:)
         range = range_for(position, prefix: prefix)
-        interface = subtyping.factory.interface(type, self_type: type, private: include_private)
+        context = typing.context_at(line: position.line, column: position.column)
+
+        shape = subtyping.builder.shape(
+          type,
+          public_only: !include_private,
+          config: Interface::Builder::Config.new(
+            self_type: context.self_type,
+            class_type: context.module_context&.module_type,
+            instance_type: context.module_context&.instance_type,
+            variable_bounds: context.variable_context.upper_bounds
+          )
+        )
+        # factory.shape(type, self_type: type, private: include_private)
 
-        interface.methods.each do |name, method_entry|
+        shape.methods.each do |name, method_entry|
           next if disallowed_method?(name)
 
           if name.to_s.start_with?(prefix)
@@ -355,7 +367,7 @@ module Steep
                   identifier: name,
                   range: range,
                   receiver_type: type,
-                  method_type: subtyping.factory.method_type_1(method_type, self_type: type),
+                  method_type: subtyping.factory.method_type_1(method_type),
                   method_decls: method_type.method_decls
                 )
               end

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

@@ -4,13 +4,12 @@ module Steep
       module SingletonMethods
         def content_for(service:, path:, line:, column:)
           project = service.project
-          target_for_code, targets_for_sigs = project.targets_for_path(path)
 
-          case
-          when target_for_code
-            Ruby.new(service: service).content_for(target: target_for_code, path: path, line: line, column: column)
-          when target = targets_for_sigs.first
-            RBS.new(service: service).content_for(target: target, path: path, line: line, column: column)
+          case (target = project.targets_for_path(path))
+          when Project::Target
+            Ruby.new(service: service).content_for(target: target, path: path, line: line, column: column)
+          when Array
+            RBS.new(service: service).content_for(target: target[0], path: path, line: line, column: column)
           end
         end
       end

data/lib/steep/services/signature_service.rb

@@ -48,7 +48,11 @@ module Steep
         end
 
         def subtyping
-          @subtyping ||= Subtyping::Check.new(factory: AST::Types::Factory.new(builder: builder))
+          @subtyping ||= begin
+            factory = AST::Types::Factory.new(builder: builder)
+            interface_builder = Interface::Builder.new(factory)
+            Subtyping::Check.new(builder: interface_builder)
+          end
         end
 
         def rbs_index
@@ -59,7 +63,7 @@ module Steep
         end
       end
 
-      FileStatus = Struct.new(:path, :content, :decls, keyword_init: true)
+      FileStatus = _ = Struct.new(:path, :content, :decls, keyword_init: true)
 
       def initialize(env:)
         builder = RBS::DefinitionBuilder.new(env: env)
@@ -96,7 +100,7 @@ module Steep
       end
 
       def pending_changed_paths
-        case status
+        case status = status()
         when LoadedStatus
           Set[]
         when SyntaxErrorStatus, AncestorErrorStatus
@@ -109,7 +113,7 @@ module Steep
       end
 
       def latest_builder
-        case status
+        case status = status()
         when LoadedStatus
           status.builder
         when SyntaxErrorStatus, AncestorErrorStatus
@@ -130,7 +134,8 @@ module Steep
       def apply_changes(files, changes)
         Steep.logger.tagged "#apply_changes" do
           Steep.measure2 "Applying change" do |sampler|
-            changes.each.with_object({}) do |(path, cs), update|
+            changes.each.with_object({}) do |pair, update|
+              path, cs = pair
               sampler.sample "#{path}" do
                 old_text = files[path]&.content
                 content = cs.inject(old_text || "") {|text, change| change.apply_to(text) }
@@ -183,7 +188,7 @@ module Steep
             )
           else
             files = self.files.merge(updates)
-            updated_files = paths.each.with_object({}) do |path, hash|
+            updated_files = paths.each_with_object({}) do |path, hash|
               hash[path] = files[path]
             end
             result =
@@ -228,7 +233,7 @@ module Steep
                 errors << content.decls
               else
                 begin
-                  content.decls.each do |decl|
+                  decls.each do |decl|
                     env << decl
                     new_decls << decl
                   end
@@ -376,7 +381,7 @@ module Steep
       end
 
       def add_nested_decls(env:, names:, set:)
-        tops = names.each.with_object(Set[]) do |name, tops|
+        tops = names.each_with_object(Set[]) do |name, tops|
           unless name.namespace.empty?
             tops << name.namespace.path[0]
           end

data/lib/steep/services/type_check_service.rb

@@ -100,6 +100,7 @@ module Steep
       end
 
       def signature_diagnostics
+        # @type var signature_diagnostics: Hash[Pathname, Array[Diagnostic::Signature::Base]]
         signature_diagnostics = {}
 
         project.targets.each do |target|
@@ -191,6 +192,7 @@ module Steep
       def validate_signature(path:, &block)
         Steep.logger.tagged "#validate_signature(path=#{path})" do
           Steep.measure "validation" do
+            # @type var accumulated_diagnostics: Array[Diagnostic::Signature::Base]
             accumulated_diagnostics = []
 
             project.targets.each do |target|

data/lib/steep/signature/validator.rb

@@ -72,7 +72,7 @@ module Steep
 
               checker.check(
                 Subtyping::Relation.new(sub_type: arg_type, super_type: upper_bound_type),
-                self_type: nil,
+                self_type: AST::Types::Self.instance,
                 class_type: nil,
                 instance_type: nil,
                 constraints: constraints