steep 0.24.0 → 0.30.0

data/lib/steep/project/target.rb

@@ -29,9 +29,15 @@ module Steep
         @signature_files = {}
       end
 
-      def add_source(path, content)
+      def add_source(path, content = "")
         file = SourceFile.new(path: path)
-        file.content = content
+
+        if block_given?
+          file.content = yield
+        else
+          file.content = content
+        end
+
         source_files[path] = file
       end
 
@@ -39,14 +45,22 @@ module Steep
         source_files.delete(path)
       end
 
-      def update_source(path, content)
+      def update_source(path, content = nil)
         file = source_files[path]
-        file.content = content
+        if block_given?
+          file.content = yield(file.content)
+        else
+          file.content = content || file.content
+        end
       end
 
-      def add_signature(path, content)
+      def add_signature(path, content = "")
         file = SignatureFile.new(path: path)
-        file.content = content
+        if block_given?
+          file.content = yield
+        else
+          file.content = content
+        end
         signature_files[path] = file
       end
 
@@ -54,9 +68,13 @@ module Steep
         signature_files.delete(path)
       end
 
-      def update_signature(path, content)
+      def update_signature(path, content = nil)
         file = signature_files[path]
-        file.content = content
+        if block_given?
+          file.content = yield(file.content)
+        else
+          file.content = content || file.content
+        end
       end
 
       def source_file?(path)
@@ -115,6 +133,7 @@ module Steep
                     when TypeCheckStatus
                       status.timestamp
                     end
+        now = Time.now
 
         updated_files = []
 
@@ -151,11 +170,11 @@ module Steep
                 validator.validate()
 
                 if validator.no_error?
-                  yield env, check, Time.now
+                  yield env, check, now
                 else
                   @status = SignatureValidationErrorStatus.new(
                     errors: validator.each_error.to_a,
-                    timestamp: Time.now
+                    timestamp: now
                   )
                 end
               else
@@ -169,10 +188,11 @@ module Steep
                     location: exn.decls[0].location
                   )
                 ],
-                timestamp: Time.now
+                timestamp: now
               )
             rescue => exn
-              @status = SignatureOtherErrorStatus.new(error: exn, timestamp: Time.now)
+              Steep.log_error exn
+              @status = SignatureOtherErrorStatus.new(error: exn, timestamp: now)
             end
           end
 
@@ -194,8 +214,10 @@ module Steep
         type_check_sources = []
 
         target_sources.each do |file|
-          if file.type_check(check, timestamp)
-            type_check_sources << file
+          Steep.logger.tagged("path=#{file.path}") do
+            if file.type_check(check, timestamp)
+              type_check_sources << file
+            end
           end
         end
 

data/lib/steep/server/base_worker.rb

@@ -12,6 +12,7 @@ module Steep
         @project = project
         @reader = reader
         @writer = writer
+        @shutdown = false
       end
 
       def handle_request(request)
@@ -28,7 +29,7 @@ module Steep
           Steep.logger.formatter.push_tags(*tags)
           Steep.logger.tagged "background" do
             while job = queue.pop
-              handle_job(job)
+              handle_job(job) unless @shutdown
             end
           end
         end
@@ -38,11 +39,12 @@ module Steep
             reader.read do |request|
               case request[:method]
               when "shutdown"
-                # nop
+                @shutdown = true
+                writer.write(id: request[:id], result: nil)
               when "exit"
                 break
               else
-                handle_request(request)
+                handle_request(request) unless @shutdown
               end
             end
           ensure

data/lib/steep/server/code_worker.rb

@@ -5,47 +5,32 @@ module Steep
 
       include Utils
 
-      attr_reader :target_files
+      attr_reader :typecheck_paths
       attr_reader :queue
 
       def initialize(project:, reader:, writer:, queue: Queue.new)
         super(project: project, reader: reader, writer: writer)
 
-        @target_files = {}
+        @typecheck_paths = Set[]
         @queue = queue
       end
 
-      def enqueue_type_check(target:, path:, version: target_files[path])
-        Steep.logger.info "Enqueueing type check: #{path}(#{version})@#{target.name}..."
-        target_files[path] = version
-        queue << [path, version, target]
-      end
-
-      def each_type_check_subject(path:, version:)
-        case
-        when !(updated_targets = project.targets.select {|target| target.signature_file?(path) }).empty?
-          updated_targets.each do |target|
-            target_files.each_key do |path|
-              if target.source_file?(path)
-                yield target, path, target_files[path]
-              end
-            end
-          end
-
-        when target = project.targets.find {|target| target.source_file?(path) }
-          if target_files.key?(path)
-            yield target, path, version
-          end
-        end
+      def enqueue_type_check(target:, path:)
+        Steep.logger.info "Enqueueing type check: #{target.name}::#{path}..."
+        queue << [target, path]
       end
 
       def typecheck_file(path, target)
-        Steep.logger.info "Starting type checking: #{path}@#{target.name}..."
+        Steep.logger.info "Starting type checking: #{target.name}::#{path}..."
 
         source = target.source_files[path]
         target.type_check(target_sources: [source], validate_signatures: false)
 
-        Steep.logger.info "Finished type checking: #{path}@#{target.name}"
+        if target.status.is_a?(Project::Target::TypeCheckStatus) && target.status.type_check_sources.empty?
+          Steep.logger.debug "Skipped type checking: #{target.name}::#{path}"
+        else
+          Steep.logger.info "Finished type checking: #{target.name}::#{path}"
+        end
 
         diagnostics = source_diagnostics(source, target.options)
 
@@ -109,8 +94,8 @@ module Steep
           # Don't respond to initialize request, but start type checking.
           project.targets.each do |target|
             target.source_files.each_key do |path|
-              if target_files.key?(path)
-                enqueue_type_check(target: target, path: path, version: target_files[path])
+              if typecheck_paths.include?(path)
+                enqueue_type_check(target: target, path: path)
               end
             end
           end
@@ -118,33 +103,34 @@ module Steep
         when "workspace/executeCommand"
           if request[:params][:command] == "steep/registerSourceToWorker"
             paths = request[:params][:arguments].map {|arg| source_path(URI.parse(arg)) }
-            paths.each do |path|
-              target_files[path] = 0
-            end
+            typecheck_paths.merge(paths)
           end
 
         when "textDocument/didChange"
-          update_source(request) do |path, version|
-            if target_files.key?(path)
-              target_files[path] = version
+          update_source(request) do |path, _|
+            source_target, signature_targets = project.targets_for_path(path)
+
+            if source_target
+              if typecheck_paths.include?(path)
+                enqueue_type_check(target: source_target, path: path)
+              end
             end
-          end
 
-          path = source_path(URI.parse(request[:params][:textDocument][:uri]))
-          version = request[:params][:textDocument][:version]
-          each_type_check_subject(path: path, version: version) do |target, path, version|
-            enqueue_type_check(target: target, path: path, version: version)
+            signature_targets.each do |target|
+              target.source_files.each_key do |source_path|
+                if typecheck_paths.include?(source_path)
+                  enqueue_type_check(target: target, path: source_path)
+                end
+              end
+            end
           end
         end
       end
 
       def handle_job(job)
-        path, version, target = job
-        if !version || target_files[path] == version
-          typecheck_file(path, target)
-        else
-          Steep.logger.info "Skipping type check: #{path}@#{target.name}, queued version=#{version}, latest version=#{target_files[path]}"
-        end
+        target, path = job
+
+        typecheck_file(path, target)
       end
     end
   end

data/lib/steep/server/master.rb

@@ -14,6 +14,8 @@ module Steep
       attr_reader :signature_worker
       attr_reader :code_workers
 
+      include Utils
+
       def initialize(project:, reader:, writer:, interaction_worker:, signature_worker:, code_workers:, queue: Queue.new)
         @project = project
         @reader = reader
@@ -23,22 +25,28 @@ module Steep
         @signature_worker = signature_worker
         @code_workers = code_workers
         @worker_to_paths = {}
+        @shutdown_request_id = nil
       end
 
       def start
-        source_paths = project.targets.flat_map {|target| target.source_files.keys }
+        source_paths = project.all_source_files
         bin_size = (source_paths.size / code_workers.size) + 1
         source_paths.each_slice(bin_size).with_index do |paths, index|
           register_code_to_worker(paths, worker: code_workers[index])
         end
 
+        tags = Steep.logger.formatter.current_tags.dup
+        tags << "master"
+
         Thread.new do
+          Steep.logger.formatter.push_tags(*tags, "from-worker@interaction")
           interaction_worker.reader.read do |message|
             process_message_from_worker(message)
           end
         end
 
         Thread.new do
+          Steep.logger.formatter.push_tags(*tags, "from-worker@signature")
           signature_worker.reader.read do |message|
             process_message_from_worker(message)
           end
@@ -46,6 +54,7 @@ module Steep
 
         code_workers.each do |worker|
           Thread.new do
+            Steep.logger.formatter.push_tags(*tags, "from-worker@#{worker.name}")
             worker.reader.read do |message|
               process_message_from_worker(message)
             end
@@ -53,13 +62,21 @@ module Steep
         end
 
         Thread.new do
+          Steep.logger.formatter.push_tags(*tags, "from-client")
           reader.read do |request|
             process_message_from_client(request)
           end
         end
 
         while job = queue.pop
-          writer.write(job)
+          if @shutdown_request_id
+            if job[:id] == @shutdown_request_id
+              writer.write(job)
+              break
+            end
+          else
+            writer.write(job)
+          end
         end
 
         writer.io.close
@@ -89,7 +106,7 @@ module Steep
             result: LSP::Interface::InitializeResult.new(
               capabilities: LSP::Interface::ServerCapabilities.new(
                 text_document_sync: LSP::Interface::TextDocumentSyncOptions.new(
-                  change: LSP::Constant::TextDocumentSyncKind::FULL
+                  change: LSP::Constant::TextDocumentSyncKind::INCREMENTAL
                 ),
                 hover_provider: true,
                 completion_provider: LSP::Interface::CompletionOptions.new(
@@ -104,36 +121,10 @@ module Steep
           end
 
         when "textDocument/didChange"
+          update_source(message)
+
           uri = URI.parse(message[:params][:textDocument][:uri])
           path = project.relative_path(Pathname(uri.path))
-          text = message[:params][:contentChanges][0][:text]
-
-          project.targets.each do |target|
-            case
-            when target.source_file?(path)
-              if text.empty? && !path.file?
-                Steep.logger.info { "Deleting source file: #{path}..." }
-                target.remove_source(path)
-              else
-                Steep.logger.info { "Updating source file: #{path}..." }
-                target.update_source(path, text)
-              end
-            when target.possible_source_file?(path)
-              Steep.logger.info { "Adding source file: #{path}..." }
-              target.add_source(path, text)
-            when target.signature_file?(path)
-              if text.empty? && !path.file?
-                Steep.logger.info { "Deleting signature file: #{path}..." }
-                target.remove_signature(path)
-              else
-                Steep.logger.info { "Updating signature file: #{path}..." }
-                target.update_signature(path, text)
-              end
-            when target.possible_signature_file?(path)
-              Steep.logger.info { "Adding signature file: #{path}..." }
-              target.add_signature(path, text)
-            end
-          end
 
           unless registered_path?(path)
             register_code_to_worker [path], worker: least_busy_worker()
@@ -154,6 +145,7 @@ module Steep
 
         when "shutdown"
           queue << { id: id, result: nil }
+          @shutdown_request_id = id
 
         when "exit"
           queue << nil

data/lib/steep/server/utils.rb

@@ -7,23 +7,56 @@ module Steep
         project.relative_path(Pathname(uri.path))
       end
 
+      def apply_change(change, text)
+        range = change[:range]
+
+        if range
+          text = text.dup
+
+          buf = AST::Buffer.new(name: :_, content: text)
+
+          start_pos = buf.loc_to_pos(range[:start].yield_self {|pos| [pos[:line]+1, pos[:character]] })
+          end_pos = buf.loc_to_pos(range[:end].yield_self {|pos| [pos[:line]+1, pos[:character]] })
+
+          text[start_pos...end_pos] = change[:text]
+          text
+        else
+          change[:text]
+        end
+      end
+
       def update_source(request)
         path = source_path(URI.parse(request[:params][:textDocument][:uri]))
-        text = request[:params][:contentChanges][0][:text]
         version = request[:params][:textDocument][:version]
+        Steep.logger.info { "Updating source: path=#{path}, version=#{version}..." }
+
+        changes = request[:params][:contentChanges]
+
+        source_target, signature_targets = project.targets_for_path(path)
+
+        if source_target
+          changes.each do |change|
+            case
+            when source_target.source_file?(path)
+              Steep.logger.debug { "Updating source in #{source_target.name}: path=#{path}" }
+              source_target.update_source(path) {|text| apply_change(change, text) }
+            when source_target.possible_source_file?(path)
+              Steep.logger.debug { "Adding source to #{source_target.name}: path=#{path}" }
+              source_target.add_source(path, change[:text])
+            end
+          end
+        end
 
-        Steep.logger.debug "Updateing source: path=#{path}, version=#{version}, size=#{text.bytesize}"
-
-        project.targets.each do |target|
-          case
-          when target.source_file?(path)
-            target.update_source path, text
-          when target.possible_source_file?(path)
-            target.add_source path, text
-          when target.signature_file?(path)
-            target.update_signature path, text
-          when target.possible_signature_file?(path)
-            target.add_signature path, text
+        signature_targets.each do |target|
+          changes.each do |change|
+            case
+            when target.signature_file?(path)
+              Steep.logger.debug { "Updating signature in #{target.name}: path=#{path}" }
+              target.update_signature(path) {|text| apply_change(change, text) }
+            when target.possible_signature_file?(path)
+              Steep.logger.debug { "Adding signature to #{target.name}: path=#{path}" }
+              target.add_signature(path, change[:text])
+            end
           end
         end