steep 0.29.0 → 0.33.0

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
@@ -27,19 +29,24 @@ module Steep
       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
@@ -47,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
@@ -54,6 +62,7 @@ module Steep
         end
 
         Thread.new do
+          Steep.logger.formatter.push_tags(*tags, "from-client")
           reader.read do |request|
             process_message_from_client(request)
           end
@@ -97,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(
@@ -112,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()

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 = RBS::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
 

data/lib/steep/server/worker_process.rb

@@ -5,13 +5,15 @@ module Steep
       attr_reader :writer
       attr_reader :stderr
 
+      attr_reader :name
       attr_reader :wait_thread
 
-      def initialize(reader:, writer:, stderr:, wait_thread:)
+      def initialize(reader:, writer:, stderr:, wait_thread:, name:)
         @reader = reader
         @writer = writer
         @stderr = stderr
         @wait_thread = wait_thread
+        @name = name
       end
 
       def self.spawn_worker(type, name:, steepfile:)
@@ -33,7 +35,7 @@ module Steep
         writer = LanguageServer::Protocol::Transport::Io::Writer.new(stdin)
         reader = LanguageServer::Protocol::Transport::Io::Reader.new(stdout)
 
-        new(reader: reader, writer: writer, stderr: stderr, wait_thread: thread)
+        new(reader: reader, writer: writer, stderr: stderr, wait_thread: thread, name: name)
       end
 
       def self.spawn_code_workers(steepfile:, count: [Etc.nprocessors-3, 1].max)

data/lib/steep/source.rb

@@ -65,11 +65,11 @@ module Steep
         parser.tokenize(buffer)
       end
 
-      buffer = AST::Buffer.new(name: path, content: source_code)
+      buffer = RBS::Buffer.new(name: path, content: source_code)
 
       comments.each do |comment|
         src = comment.text.gsub(/\A#\s*/, '')
-        location = AST::Location.new(buffer: buffer,
+        location = RBS::Location.new(buffer: buffer,
                                      start_pos: comment.location.expression.begin_pos + 1,
                                      end_pos: comment.location.expression.end_pos)
         annotation = AnnotationParser.new(factory: factory).parse(src, location: location)
@@ -107,7 +107,7 @@ module Steep
 
             if node.children[1]
               if node.loc.keyword.source == "if" || node.loc.keyword.source == "elsif"
-                then_start = node.loc.begin&.loc&.last_line || node.children[0].loc.last_line
+                then_start = node.loc.begin&.last_line || node.children[0].loc.last_line
                 then_end = node.children[2] ? node.loc.else.line : node.loc.last_line
               else
                 then_start = node.loc.else.last_line
@@ -276,6 +276,18 @@ module Steep
       end
     end
 
+    def self.map_child_nodes(node)
+      children = node.children.map do |child|
+        if child.is_a?(::AST::Node)
+          yield child
+        else
+          child
+        end
+      end
+
+      node.updated(nil, children)
+    end
+
     def annotations(block:, factory:, current_module:)
       AST::Annotation::Collection.new(
         annotations: mapping[block.__id__] || [],
@@ -316,5 +328,50 @@ module Steep
         end
       end
     end
+
+    def self.delete_defs(node, allow_list)
+      case node.type
+      when :def
+        if allow_list.include?(node)
+          node
+        else
+          node.updated(:nil, [])
+        end
+      when :defs
+        if allow_list.include?(node)
+          node
+        else
+          delete_defs(node.children[0], allow_list)
+        end
+      else
+        map_child_nodes(node) do |child|
+          delete_defs(child, allow_list)
+        end
+      end
+    end
+
+    def without_unrelated_defs(line:, column:)
+      nodes = find_nodes(line: line, column: column) || []
+      defs = Set[].compare_by_identity.merge(nodes.select {|node| node.type == :def || node.type == :defs })
+
+      node_ = Source.delete_defs(node, defs)
+
+      Source.new(path: path, node: node_, mapping: mapping)
+    end
+
+    def compact_siblings(node)
+      case node
+      when :def
+        node.updated(:nil, [])
+      when :defs
+        node.children[0]
+      when :class
+        node.updated(:class, [node.children[0], node.children[1], nil])
+      when :module
+        node.updated(:module, [node.children[0], nil])
+      else
+        node
+      end
+    end
   end
 end

data/lib/steep/type_inference/context_array.rb

@@ -29,7 +29,7 @@ module Steep
                   else
                     ""
                   end
-        buffer = AST::Buffer.new(name: source.path, content: content)
+        buffer = RBS::Buffer.new(name: source.path, content: content)
         new(buffer: buffer, context: context, range: range || 0..buffer.content.size)
       end
 

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -207,6 +207,12 @@ module Steep
             [type]
           ]
 
+        when AST::Types::Name::Interface
+          [
+            [instance_type],
+            [type]
+          ]
+
         else
           [
             [],

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.29.0"
+  VERSION = "0.33.0"
 end

data/smoke/regression/fun.rb

@@ -0,0 +1,8 @@
+class Fun
+  def foo(v)
+    !v.nil? && foo2(v)
+  end
+
+  def foo2(_)
+  end
+end

data/smoke/regression/fun.rbs

@@ -0,0 +1,4 @@
+class Fun
+  def foo: (Integer?) -> void
+  def foo2: (Integer) -> void
+end

data/smoke/toplevel/Steepfile

@@ -0,0 +1,5 @@
+target :test do
+  typing_options :strict
+  check "*.rb"
+  signature "*.rbs"
+end

data/smoke/toplevel/a.rb

@@ -0,0 +1,4 @@
+# !expects MethodBodyTypeMismatch: method=fizz_buzz, expected=::String, actual=nil
+def fizz_buzz(n)
+  nil
+end

data/smoke/toplevel/a.rbs

@@ -0,0 +1,3 @@
+class Object
+  def fizz_buzz: (Integer) -> String
+end

data/steep.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "ast_utils", "~> 0.3.0"
   spec.add_runtime_dependency "activesupport", ">= 5.1"
   spec.add_runtime_dependency "rainbow", ">= 2.2.2", "< 4.0"
-  spec.add_runtime_dependency "listen", "~> 3.1"
+  spec.add_runtime_dependency "listen", "~> 3.0"
   spec.add_runtime_dependency "language_server-protocol", "~> 3.15.0.1"
   spec.add_runtime_dependency "rbs", "~> 0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
@@ -140,9 +140,7 @@ files:
 - lib/steep/annotation_parser.rb
 - lib/steep/ast/annotation.rb
 - lib/steep/ast/annotation/collection.rb
-- lib/steep/ast/buffer.rb
 - lib/steep/ast/builtin.rb
-- lib/steep/ast/location.rb
 - lib/steep/ast/type_params.rb
 - lib/steep/ast/types.rb
 - lib/steep/ast/types/any.rb
@@ -187,10 +185,11 @@ files:
 - lib/steep/project.rb
 - lib/steep/project/completion_provider.rb
 - lib/steep/project/dsl.rb
-- lib/steep/project/file.rb
 - lib/steep/project/file_loader.rb
 - lib/steep/project/hover_content.rb
 - lib/steep/project/options.rb
+- lib/steep/project/signature_file.rb
+- lib/steep/project/source_file.rb
 - lib/steep/project/target.rb
 - lib/steep/server/base_worker.rb
 - lib/steep/server/code_worker.rb
@@ -330,6 +329,8 @@ files:
 - smoke/regexp/b.rb
 - smoke/regression/Steepfile
 - smoke/regression/array.rb
+- smoke/regression/fun.rb
+- smoke/regression/fun.rbs
 - smoke/regression/hash.rb
 - smoke/regression/poly_new.rb
 - smoke/regression/poly_new.rbs
@@ -347,6 +348,9 @@ files:
 - smoke/super/Steepfile
 - smoke/super/a.rb
 - smoke/super/a.rbs
+- smoke/toplevel/Steepfile
+- smoke/toplevel/a.rb
+- smoke/toplevel/a.rbs
 - smoke/type_case/Steepfile
 - smoke/type_case/a.rb
 - smoke/yield/Steepfile

data/lib/steep/ast/buffer.rb

@@ -1,51 +0,0 @@
-module Steep
-  module AST
-    class Buffer
-      attr_reader :name
-      attr_reader :content
-      attr_reader :lines
-      attr_reader :ranges
-
-      def initialize(name:, content:)
-        @name = name
-        @content = content
-
-        @lines = content.split(/\n/, -1)
-
-        @ranges = []
-        offset = 0
-        lines.each.with_index do |line, index|
-          if index == lines.size - 1
-            ranges << (offset..offset)
-          else
-            size = line.size
-            range = offset..(offset+size)
-            ranges << range
-            offset += size+1
-          end
-        end
-      end
-
-      def pos_to_loc(pos)
-        index = ranges.bsearch_index do |range|
-          pos <= range.end
-        end
-
-        if index
-          [index + 1, pos - ranges[index].begin]
-        else
-          [1, pos]
-        end
-      end
-
-      def loc_to_pos(loc)
-        line, column = loc
-        ranges[line - 1].begin + column
-      end
-
-      def source(range)
-        content[range]
-      end
-    end
-  end
-end