steep 1.0.0 → 1.1.0.pre.1

data/lib/steep/node_helper.rb

@@ -0,0 +1,49 @@
+module Steep
+  module NodeHelper
+    def each_child_node(node, &block)
+      if block
+        node.children.each do |child|
+          if child.is_a?(Parser::AST::Node)
+            yield child
+          end
+        end
+      else
+        enum_for :each_child_node, node
+      end
+    end
+
+    def each_descendant_node(node, &block)
+      if block
+        each_child_node(node) do |child|
+          yield child
+          each_descendant_node(child, &block)
+        end
+      else
+        enum_for :each_descendant_node, node
+      end
+    end
+
+    def value_node?(node)
+      case node.type
+      when :true, :false, :str, :sym, :int, :float, :nil
+        true
+      when :lvar
+        true
+      when :const
+        each_child_node(node).all? {|child| child.type == :cbase || value_node?(child) }
+      when :array
+        each_child_node(node).all? {|child| value_node?(child) }
+      when :hash
+        each_child_node(node).all? do |pair|
+          each_child_node(pair).all? {|child| value_node?(child) }
+        end
+      when :dstr
+        each_child_node(node).all? {|child| value_node?(child)}
+      when :begin
+        each_child_node(node).all? {|child| value_node?(node) }
+      else
+        false
+      end
+    end
+  end
+end

data/lib/steep/path_helper.rb

@@ -0,0 +1,22 @@
+module Steep
+  module PathHelper
+    module_function
+
+    def to_pathname(uri, dosish: Gem.win_platform?)
+      uri = URI.parse(uri)
+      if uri.scheme == "file"
+        path = uri.path
+        path.sub!(%r{^/([a-zA-Z])(:|%3A)//?}i, '\1:/') if dosish
+        Pathname(path)
+      end
+    end
+
+    def to_uri(path, dosish: Gem.win_platform?)
+      str_path = path.to_s
+      if dosish
+        str_path.insert(0, "/") if str_path[0] != "/"
+      end
+      URI::File.build(path: str_path)
+    end
+  end
+end

data/lib/steep/project.rb

@@ -16,22 +16,10 @@ module Steep
       steepfile_path.parent
     end
 
-    def relative_path(orig_path)
-      path = if Gem.win_platform?
-               path_str = URI.decode_www_form_component(
-                 orig_path.to_s.delete_prefix("/")
-               )
-               unless path_str.start_with?(%r{[a-z]:/}i)
-                 # FIXME: Sometimes drive letter is missing, taking from base_dir
-                 path_str = base_dir.to_s.split("/")[0] + "/" + path_str
-               end
-               Pathname.new(
-                 path_str
-               )
-             else
-               orig_path
-             end
+    def relative_path(path)
       path.relative_path_from(base_dir)
+    rescue ArgumentError
+      path
     end
 
     def absolute_path(path)

data/lib/steep/server/base_worker.rb

@@ -69,6 +69,7 @@ module Steep
             end
           end
         end
+        thread.abort_on_exception = true
 
         Steep.logger.tagged "frontend" do
           begin

data/lib/steep/server/change_buffer.rb

@@ -40,7 +40,7 @@ module Steep
 
       def collect_changes(request)
         push_buffer do |changes|
-          path = project.relative_path(Pathname(URI.parse(request[:params][:textDocument][:uri]).path))
+          path = project.relative_path(Steep::PathHelper.to_pathname(request[:params][:textDocument][:uri]))
           version = request[:params][:textDocument][:version]
           Steep.logger.info { "Updating source: path=#{path}, version=#{version}..." }
 

data/lib/steep/server/interaction_worker.rb

@@ -53,8 +53,7 @@ module Steep
         when "textDocument/hover"
           id = request[:id]
 
-          uri = URI.parse(request[:params][:textDocument][:uri])
-          path = project.relative_path(Pathname(uri.path))
+          path = project.relative_path(Steep::PathHelper.to_pathname(request[:params][:textDocument][:uri]))
           line = request[:params][:position][:line]+1
           column = request[:params][:position][:character]
 
@@ -64,8 +63,7 @@ module Steep
           id = request[:id]
 
           params = request[:params]
-          uri = URI.parse(params[:textDocument][:uri])
-          path = project.relative_path(Pathname(uri.path))
+          path = project.relative_path(Steep::PathHelper.to_pathname(params[:textDocument][:uri]))
           line, column = params[:position].yield_self {|hash| [hash[:line]+1, hash[:character]] }
           trigger = params.dig(:context, :triggerCharacter)
 
@@ -144,7 +142,7 @@ module Steep
               decls = sig_service.files[relative_path].decls
               locator = RBS::Locator.new(decls: decls)
 
-              hd, tail = locator.find2(line: job.line, column: job.column)
+              _hd, tail = locator.find2(line: job.line, column: job.column)
 
               namespace = []
               tail.each do |t|

data/lib/steep/server/master.rb

@@ -21,9 +21,7 @@ module Steep
         end
 
         def uri(path)
-          URI.parse(path.to_s).tap do |uri|
-            uri.scheme = "file"
-          end
+          Steep::PathHelper.to_uri(path)
         end
 
         def as_json(assignment:)
@@ -41,7 +39,7 @@ module Steep
         end
 
         def percentage
-          checked_paths.size * 100 / total
+          checked_paths.size * 100 / all_paths.size
         end
 
         def all_paths
@@ -50,12 +48,7 @@ module Steep
 
         def checking_path?(path)
           [library_paths, signature_paths, code_paths].any? do |paths|
-            if Gem.win_platform?
-              # FIXME: Sometimes drive letter is missing, so comparing without drive letter.
-              paths.any? {|p| p.to_s.split("/", 2)[1] == path.to_s.split("/", 2)[1]}
-            else
-              paths.include?(path)
-            end
+            paths.include?(path)
           end
         end
 
@@ -463,7 +456,7 @@ module Steep
       end
 
       def pathname(uri)
-        Pathname(URI.parse(uri).path)
+        Steep::PathHelper.to_pathname(uri)
       end
 
       def work_done_progress_supported?
@@ -524,40 +517,54 @@ module Steep
           end
 
         when "textDocument/didChange"
-          broadcast_notification(message)
-          path = pathname(message[:params][:textDocument][:uri])
-          controller.push_changes(path)
+          if path = pathname(message[:params][:textDocument][:uri])
+            broadcast_notification(message)
+            controller.push_changes(path)
+          end
 
         when "textDocument/didSave"
-          if typecheck_automatically
-            if request = controller.make_request(last_request: current_type_check_request)
-              start_type_check(
-                request,
-                last_request: current_type_check_request,
-                start_progress: request.total > 10
-              )
+          if path = pathname(message[:params][:textDocument][:uri])
+            if typecheck_automatically
+              if request = controller.make_request(last_request: current_type_check_request)
+                start_type_check(
+                  request,
+                  last_request: current_type_check_request,
+                  start_progress: request.total > 10
+                )
+              end
             end
           end
 
         when "textDocument/didOpen"
-          path = pathname(message[:params][:textDocument][:uri])
-          controller.update_priority(open: path)
+          if path = pathname(message[:params][:textDocument][:uri])
+            controller.update_priority(open: path)
+          end
 
         when "textDocument/didClose"
-          path = pathname(message[:params][:textDocument][:uri])
-          controller.update_priority(close: path)
+          if path = pathname(message[:params][:textDocument][:uri])
+            controller.update_priority(close: path)
+          end
 
         when "textDocument/hover", "textDocument/completion"
           if interaction_worker
-            result_controller << send_request(method: message[:method], params: message[:params], worker: interaction_worker) do |handler|
-              handler.on_completion do |response|
-                job_queue << SendMessageJob.to_client(
-                  message: {
-                    id: message[:id],
-                    result: response[:result]
-                  }
-                )
+            if path = pathname(message[:params][:textDocument][:uri])
+              result_controller << send_request(method: message[:method], params: message[:params], worker: interaction_worker) do |handler|
+                handler.on_completion do |response|
+                  job_queue << SendMessageJob.to_client(
+                    message: {
+                      id: message[:id],
+                      result: response[:result]
+                    }
+                  )
+                end
               end
+            else
+              job_queue << SendMessageJob.to_client(
+                message: {
+                  id: message[:id],
+                  result: nil
+                }
+              )
             end
           end
 
@@ -594,20 +601,29 @@ module Steep
           end
 
         when "textDocument/definition", "textDocument/implementation"
-          result_controller << group_request do |group|
-            typecheck_workers.each do |worker|
-              group << send_request(method: message[:method], params: message[:params], worker: worker)
-            end
+          if path = pathname(message[:params][:textDocument][:uri])
+            result_controller << group_request do |group|
+              typecheck_workers.each do |worker|
+                group << send_request(method: message[:method], params: message[:params], worker: worker)
+              end
 
-            group.on_completion do |handlers|
-              links = handlers.flat_map(&:result)
-              job_queue << SendMessageJob.to_client(
-                message: {
-                  id: message[:id],
-                  result: links
-                }
-              )
+              group.on_completion do |handlers|
+                links = handlers.flat_map(&:result)
+                job_queue << SendMessageJob.to_client(
+                  message: {
+                    id: message[:id],
+                    result: links
+                  }
+                )
+              end
             end
+          else
+            job_queue << SendMessageJob.to_client(
+              message: {
+                id: message[:id],
+                result: []
+              }
+            )
           end
 
         when "$/typecheck"

data/lib/steep/server/type_check_worker.rb

@@ -86,10 +86,10 @@ module Steep
           queue << StartTypeCheckJob.new(guid: guid, changes: changes)
         end
 
-        priority_paths = Set.new(params[:priority_uris].map {|uri| Pathname(URI.parse(uri).path) })
-        library_paths = params[:library_uris].map {|uri| Pathname(URI.parse(uri).path) }
-        signature_paths = params[:signature_uris].map {|uri| Pathname(URI.parse(uri).path) }
-        code_paths = params[:code_uris].map {|uri| Pathname(URI.parse(uri).path) }
+        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) }
 
         library_paths.each do |path|
           if priority_paths.include?(path)
@@ -135,21 +135,6 @@ module Steep
       end
 
       def handle_job(job)
-        job_path = if job.respond_to?(:path)
-                     if Gem.win_platform?
-                       # FIXME: Sometimes drive letter is missing, using base_dir
-                       if job.path.to_s.start_with?(%r{/[a-z](:|%3A)/}i)
-                         job.path.to_s
-                       else
-                         "/#{project.base_dir.to_s.split("/").first}/#{job.path}"
-                       end
-                     else
-                       job.path.to_s
-                     end
-                   else
-                     nil
-                   end
-
         case job
         when StartTypeCheckJob
           Steep.logger.info { "Processing StartTypeCheckJob for guid=#{job.guid}" }
@@ -164,7 +149,7 @@ module Steep
               writer.write(
                 method: :"textDocument/publishDiagnostics",
                 params: LSP::Interface::PublishDiagnosticsParams.new(
-                  uri: URI.parse(job_path).tap {|uri| uri.scheme = "file"},
+                  uri: Steep::PathHelper.to_uri(job.path),
                   diagnostics: diagnostics.map {|diagnostic| formatter.format(diagnostic) }.uniq
                 )
               )
@@ -182,7 +167,7 @@ module Steep
               writer.write(
                 method: :"textDocument/publishDiagnostics",
                 params: LSP::Interface::PublishDiagnosticsParams.new(
-                  uri: URI.parse(job_path).tap {|uri| uri.scheme = "file"},
+                  uri: Steep::PathHelper.to_uri(job.path),
                   diagnostics: diagnostics.map {|diagnostic| formatter.format(diagnostic) }.uniq.compact
                 )
               )
@@ -201,7 +186,7 @@ module Steep
               writer.write(
                 method: :"textDocument/publishDiagnostics",
                 params: LSP::Interface::PublishDiagnosticsParams.new(
-                  uri: URI.parse(job_path).tap {|uri| uri.scheme = "file"},
+                  uri: Steep::PathHelper.to_uri(job.path),
                   diagnostics: diagnostics.map {|diagnostic| formatter.format(diagnostic) }.uniq.compact
                 )
               )
@@ -251,7 +236,7 @@ module Steep
               location: symbol.location.yield_self do |location|
                 path = Pathname(location.buffer.name)
                 {
-                  uri: URI.parse(project.absolute_path(path).to_s).tap {|uri| uri.scheme = "file" },
+                  uri: Steep::PathHelper.to_uri(project.absolute_path(path)),
                   range: {
                     start: { line: location.start_line - 1, character: location.start_column },
                     end: { line: location.end_line - 1, character: location.end_column }
@@ -279,7 +264,7 @@ module Steep
       end
 
       def goto(job)
-        path = Pathname(URI.parse(job.params[:textDocument][:uri]).path)
+        path = Steep::PathHelper.to_pathname(job.params[:textDocument][:uri])
         line = job.params[:position][:line] + 1
         column = job.params[:position][:character]
 
@@ -306,7 +291,7 @@ module Steep
           path = project.absolute_path(path)
 
           {
-            uri: URI.parse(path.to_s).tap {|uri| uri.scheme = "file" }.to_s,
+            uri: Steep::PathHelper.to_uri(path.to_s).to_s,
             range: loc.as_lsp_range
           }
         end

data/lib/steep/services/completion_provider.rb

@@ -1,16 +1,20 @@
 module Steep
   module Services
     class CompletionProvider
-      Position = Struct.new(:line, :column, keyword_init: true) do
+      Position = _ = Struct.new(:line, :column, keyword_init: true) do
+        # @implements Position
         def -(size)
           Position.new(line: line, column: column - size)
         end
       end
-      Range = Struct.new(:start, :end, keyword_init: true)
 
-      InstanceVariableItem = Struct.new(:identifier, :range, :type, keyword_init: true)
-      LocalVariableItem = Struct.new(:identifier, :range, :type, keyword_init: true)
-      ConstantItem = Struct.new(:env, :identifier, :range, :type, :full_name, keyword_init: true) do
+      Range = _ = Struct.new(:start, :end, keyword_init: true)
+
+      InstanceVariableItem = _ = Struct.new(:identifier, :range, :type, keyword_init: true)
+      LocalVariableItem = _ = Struct.new(:identifier, :range, :type, keyword_init: true)
+      ConstantItem = _ = Struct.new(:env, :identifier, :range, :type, :full_name, keyword_init: true) do
+        # @implements ConstantItem
+
         def class?
           if decl = env.class_decls[full_name]
             decl.primary.decl.is_a?(RBS::AST::Declarations::Class)
@@ -34,20 +38,23 @@ module Steep
           end
         end
       end
-      MethodNameItem = Struct.new(:identifier, :range, :receiver_type, :method_type, :method_decls, keyword_init: true) do
+      MethodNameItem = _ = Struct.new(:identifier, :range, :receiver_type, :method_type, :method_decls, keyword_init: true) do
+        # @implements MethodNameItem
+
         def comment
           case method_decls.size
           when 0
             nil
           when 1
-            method_decls.to_a.first.method_def&.comment
+            method = method_decls.to_a.first or raise
+            method.method_def&.comment
           else
             nil
           end
         end
 
         def inherited?
-          case receiver_type
+          case receiver_type = receiver_type()
           when AST::Types::Name::Instance, AST::Types::Name::Singleton, AST::Types::Name::Interface
             method_decls.any? do |decl|
               decl.method_name.type_name != receiver_type.name
@@ -157,7 +164,7 @@ module Steep
       end
 
       def items_for_trigger(position:)
-        node, *parents = source.find_nodes(line: position.line, column: position.column)
+        node, *_parents = source.find_nodes(line: position.line, column: position.column)
         node ||= source.node
 
         return [] unless node
@@ -265,7 +272,7 @@ module Steep
       def items_for_dot(position:)
         # foo. ←
         shift_pos = position-1
-        node, *parents = source.find_nodes(line: shift_pos.line, column: shift_pos.column)
+        node, *_parents = source.find_nodes(line: shift_pos.line, column: shift_pos.column)
         node ||= source.node
 
         return [] unless node
@@ -355,7 +362,7 @@ module Steep
             end
           end
         end
-      rescue RuntimeError => exn
+      rescue RuntimeError => _exn
         # nop
       end
 
@@ -365,11 +372,11 @@ module Steep
 
       def local_variable_items_for_context(context, position:, prefix:, items:)
         range = range_for(position, prefix: prefix)
-        context.lvar_env.each do |name, type|
+        context.type_env.local_variable_types.each do |name, pair|
+          type, _ = pair
+
           if name.to_s.start_with?(prefix)
-            items << LocalVariableItem.new(identifier: name,
-                                           range: range,
-                                           type: type)
+            items << LocalVariableItem.new(identifier: name, range: range, type: type)
           end
         end
       end
@@ -381,10 +388,10 @@ module Steep
           case parent.type
           when :const
             const_name = typing.source_index.reference(constant_node: parent)
-            consts = context.module_context.const_env.children(const_name)
+            consts = context.type_env.constant_env.children(const_name)
           end
         else
-          consts = context.module_context.const_env.constants
+          consts = context.type_env.constant_env.constants
         end
 
         if consts
@@ -400,7 +407,7 @@ module Steep
 
       def instance_variable_items_for_context(context, position:, prefix:, items:)
         range = range_for(position, prefix: prefix)
-        context.type_env.ivar_types.map do |name, type|
+        context.type_env.instance_variable_types.each do |name, type|
           if name.to_s.start_with?(prefix)
             items << InstanceVariableItem.new(identifier: name,
                                               range: range,

data/lib/steep/services/goto_service.rb

@@ -35,7 +35,7 @@ module Steep
       def implementation(path:, line:, column:)
         locations = []
 
-        relative_path = project.relative_path(path)
+        # relative_path = project.relative_path(path)
 
         queries = query_at(path: path, line: line, column: column)
         queries.uniq!
@@ -57,8 +57,6 @@ module Steep
       def definition(path:, line:, column:)
         locations = []
 
-        relative_path = project.relative_path(path)
-
         queries = query_at(path: path, line: line, column: column)
         queries.uniq!
 
@@ -108,7 +106,7 @@ module Steep
         case
         when target = type_check.source_file?(relative_path)
           source = type_check.source_files[relative_path]
-          typing, signature = type_check_path(target: target, path: relative_path, content: source.content, line: line, column: column)
+          typing, _signature = type_check_path(target: target, path: relative_path, content: source.content, line: line, column: column)
           if typing
             node, *parents = typing.source.find_nodes(line: line, column: column)
 

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

@@ -26,7 +26,7 @@ module Steep
           return if decls.nil?
 
           loc_key, path = ::RBS::Locator.new(decls: decls).find2(line: line, column: column) || return
-          head, *tail = path
+          head, *_tail = path
 
           case head
           when ::RBS::Types::Alias

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

@@ -2,22 +2,36 @@ module Steep
   module Services
     module HoverProvider
       class Ruby
-        TypeContent = Struct.new(:node, :type, :location, keyword_init: true)
-        VariableContent = Struct.new(:node, :name, :type, :location, keyword_init: true)
-        MethodCallContent = Struct.new(:node, :method_call, :location, keyword_init: true)
-        DefinitionContent = Struct.new(:node, :method_name, :method_type, :definition, :location, keyword_init: true)
-        ConstantContent = Struct.new(:location, :full_name, :type, :decl, keyword_init: true) do
+        TypeContent = _ = Struct.new(:node, :type, :location, keyword_init: true)
+        VariableContent = _ = Struct.new(:node, :name, :type, :location, keyword_init: true)
+        MethodCallContent = _ = Struct.new(:node, :method_call, :location, keyword_init: true)
+        DefinitionContent = _ = Struct.new(:node, :method_name, :method_type, :definition, :location, keyword_init: true)
+        ConstantContent = _ = Struct.new(:location, :full_name, :type, :decl, keyword_init: true) do
+          # @implements ConstantContent
+
           def comments
             case
-            when class_or_module?
-              decl.decls.filter_map {|d| d.decl.comment }
-            when constant?
+            when decl = class_decl
+              decl.decls.map {|d| d.decl.comment }
+            when decl = constant_decl
               [decl.decl.comment]
             else
-              []
+              raise
             end.compact
           end
 
+          def class_decl
+            if (decl = decl()).is_a?(::RBS::Environment::MultiEntry)
+              decl
+            end
+          end
+
+          def constant_decl
+            if (decl = decl()).is_a?(::RBS::Environment::SingleEntry)
+              decl
+            end
+          end
+
           def constant?
             decl.is_a?(::RBS::Environment::SingleEntry)
           end
@@ -49,6 +63,8 @@ module Steep
             else
               methods[singleton_method]
             end
+          else
+            raise "One of the instance_method or singleton_method is required"
           end
         end
 
@@ -72,6 +88,8 @@ module Steep
               InstanceMethodName.new(type_name: defined_in, method_name: method_name)
             when builder.build_singleton(defined_in).methods.key?(method_name)
               SingletonMethodName.new(type_name: defined_in, method_name: method_name)
+            else
+              raise
             end
           else
             InstanceMethodName.new(type_name: defined_in, method_name: method_name)
@@ -83,19 +101,19 @@ module Steep
           typing = typecheck(target, path: path, content: file.content, line: line, column: column) or return
           node, *parents = typing.source.find_nodes(line: line, column: column)
 
-          if node
+          if node && parents
             case node.type
             when :lvar
               var_name = node.children[0]
               context = typing.context_at(line: line, column: column)
-              var_type = context.lvar_env[var_name] || AST::Types::Any.new(location: nil)
+              var_type = context.type_env[var_name] || AST::Types::Any.new(location: nil)
 
               return VariableContent.new(node: node, name: var_name, type: var_type, location: node.location.name)
 
             when :lvasgn
               var_name, rhs = node.children
               context = typing.context_at(line: line, column: column)
-              type = context.lvar_env[var_name] || typing.type_of(node: rhs)
+              type = context.type_env[var_name] || typing.type_of(node: node)
 
               return VariableContent.new(node: node, name: var_name, type: type, location: node.location.name)
 

data/lib/steep/services/stats_calculator.rb

@@ -39,7 +39,6 @@ module Steep
           typed = 0
           untyped = 0
           errors = 0
-          total = 0
           typing.method_calls.each_value do |call|
             case call
             when TypeInference::MethodCall::Typed