steep 1.9.0.dev.2 → 1.9.0

data/lib/steep/project/dsl.rb

@@ -164,6 +164,7 @@ module Steep
         end
 
         def group(name, &block)
+          name = name.to_str.to_sym unless Symbol === name
           group = GroupDSL.new(name, self)
 
           Steep.logger.tagged "group=#{name}" do
@@ -230,6 +231,7 @@ module Steep
       end
 
       def target(name, &block)
+        name = name.to_str.to_sym unless Symbol === name
         dsl = TargetDSL.new(name, project: project)
 
         Steep.logger.tagged "target=#{name}" do

data/lib/steep/server/change_buffer.rb

@@ -46,7 +46,7 @@ module Steep
 
             changes[path] ||= []
             request[:params][:contentChanges].each do |change|
-              changes[path] << Services::ContentChange.new(
+              changes.fetch(path) << Services::ContentChange.new(
                 range: change[:range]&.yield_self {|range|
                   [
                     range[:start].yield_self {|pos| Services::ContentChange::Position.new(line: pos[:line] + 1, column: pos[:character]) },

data/lib/steep/server/interaction_worker.rb

@@ -156,7 +156,7 @@ module Steep
             case
             when target = project.target_for_source_path(job.path)
               file = service.source_files[job.path] or return
-              subtyping = service.signature_services[target.name].current_subtyping or return
+              subtyping = service.signature_services.fetch(target.name).current_subtyping or return
 
               provider = Services::CompletionProvider.new(source_text: file.content, path: job.path, subtyping: subtyping)
               items = begin
@@ -184,12 +184,12 @@ module Steep
               case sig_service.status
               when Services::SignatureService::SyntaxErrorStatus, Services::SignatureService::AncestorErrorStatus
                 if buffer = sig_service.latest_env.buffers.find {|buf| Pathname(buf.name) == Pathname(relative_path) }
-                  dirs = sig_service.latest_env.signatures[buffer][0]
+                  dirs = sig_service.latest_env.signatures.fetch(buffer)[0]
                 else
                   dirs = [] #: Array[RBS::AST::Directives::t]
                 end
               else
-                signature = sig_service.files[relative_path].signature
+                signature = sig_service.files.fetch(relative_path).signature
                 signature.is_a?(Array) or raise
                 buffer, dirs, decls = signature
 
@@ -210,7 +210,7 @@ module Steep
                 end
               end
 
-              buffer = RBS::Buffer.new(name: relative_path, content: sig_service.files[relative_path].content)
+              buffer = RBS::Buffer.new(name: relative_path, content: sig_service.files.fetch(relative_path).content)
               prefix = Services::TypeNameCompletion::Prefix.parse(buffer, line: job.line, column: job.column)
 
               completion = Services::TypeNameCompletion.new(env: sig_service.latest_env, context: context, dirs: dirs)
@@ -451,7 +451,7 @@ module Steep
         Steep.logger.tagged("##{__method__}") do
           if target = project.target_for_source_path(job.path)
             file = service.source_files[job.path] or return
-            subtyping = service.signature_services[target.name].current_subtyping or return
+            subtyping = service.signature_services.fetch(target.name).current_subtyping or return
             source =
               Source.parse(file.content, path: file.path, factory: subtyping.factory)
                 .without_unrelated_defs(line: job.line, column: job.column)

data/lib/steep/server/master.rb

@@ -178,7 +178,6 @@ module Steep
       attr_reader :job_queue, :write_queue
 
       attr_reader :current_type_check_request
-      attr_reader :current_diagnostics
       attr_reader :controller
       attr_reader :result_controller
 
@@ -197,7 +196,6 @@ module Steep
         @commandline_args = []
         @job_queue = queue
         @write_queue = SizedQueue.new(100)
-        @current_diagnostics = {}
 
         @controller = TypeCheckController.new(project: project)
         @result_controller = ResultController.new()
@@ -802,15 +800,7 @@ module Steep
           Steep.logger.info "Starting new progress..."
 
           @current_type_check_request = request
-          if last_request
-            checking_paths = request.each_path.to_set
-            current_diagnostics.keep_if do |path, _|
-              checking_paths.include?(path)
-            end
-          else
-            current_diagnostics.clear
-          end
-
+          
           if progress
             # If `request:` keyword arg is not given
             request.work_done_progress.begin("Type checking", request_id: fresh_request_id)
@@ -909,15 +899,10 @@ module Steep
 
       def push_diagnostics(path, diagnostics)
         if diagnostics
-          ds = (current_diagnostics[path] ||= [])
-
-          ds.concat(diagnostics)
-          ds.uniq!
-
           write_queue.push SendMessageJob.to_client(
             message: {
               method: :"textDocument/publishDiagnostics",
-              params: { uri: Steep::PathHelper.to_uri(path).to_s, diagnostics: ds }
+              params: { uri: Steep::PathHelper.to_uri(path).to_s, diagnostics: diagnostics }
             }
           )
         end

data/lib/steep/server/type_check_controller.rb

@@ -266,7 +266,7 @@ module Steep
               request.code_paths << [target_group.name, path]
             end
           else
-            group_set = groups.map do |group_name|
+            group_set = groups.filter_map do |group_name|
               target_name, group_name = group_name.split(".", 2)
               target_name or raise
 
@@ -280,7 +280,7 @@ module Steep
               else
                 project.targets.find {|target| target.name == target_name }
               end
-            end.compact.to_set
+            end.to_set
 
             files.signature_paths.each do |path, target_group|
               if group_set.include?(target_group)

data/lib/steep/server/type_check_worker.rb

@@ -223,7 +223,7 @@ module Steep
         Steep.measure "Generating workspace symbol list for query=`#{query}`" do
           provider = Index::SignatureSymbolProvider.new(project: project, assignment: assignment)
           project.targets.each do |target|
-            index = service.signature_services[target.name].latest_rbs_index
+            index = service.signature_services.fetch(target.name).latest_rbs_index
             provider.indexes[target] = index
           end
 

data/lib/steep/services/completion_provider.rb

@@ -105,9 +105,9 @@ module Steep
         def decl
           case
           when absolute_type_name.interface?
-            env.interface_decls[absolute_type_name].decl
+            env.interface_decls.fetch(absolute_type_name).decl
           when absolute_type_name.alias?
-            env.type_alias_decls[absolute_type_name].decl
+            env.type_alias_decls.fetch(absolute_type_name).decl
           when absolute_type_name.class?
             case entry = env.module_class_entry(absolute_type_name)
             when RBS::Environment::ClassEntry, RBS::Environment::ModuleEntry
@@ -127,11 +127,11 @@ module Steep
 
           case
           when absolute_type_name.interface?
-            if comment = env.interface_decls[absolute_type_name].decl.comment
+            if comment = env.interface_decls.fetch(absolute_type_name).decl.comment
               comments << comment
             end
           when absolute_type_name.alias?
-            if comment = env.type_alias_decls[absolute_type_name].decl.comment
+            if comment = env.type_alias_decls.fetch(absolute_type_name).decl.comment
               comments << comment
             end
           when absolute_type_name.class?

data/lib/steep/services/goto_service.rb

@@ -97,7 +97,7 @@ module Steep
         relative_path = project.relative_path(path)
 
         target = type_check.project.target_for_path(relative_path) or return []
-        source = type_check.source_files[relative_path]
+        source = type_check.source_files.fetch(relative_path)
         typing, signature = type_check_path(target: target, path: relative_path, content: source.content, line: line, column: column)
 
         typing or return []
@@ -163,7 +163,7 @@ module Steep
 
         case
         when target = type_check.project.target_for_source_path(relative_path)
-          source = type_check.source_files[relative_path] or return []
+          source = type_check.source_files.fetch(relative_path, nil) or return []
           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)
@@ -284,7 +284,7 @@ module Steep
       end
 
       def type_check_path(target:, path:, content:, line:, column:)
-        signature_service = type_check.signature_services[target.name]
+        signature_service = type_check.signature_services.fetch(target.name)
         subtyping = signature_service.current_subtyping or return
         source = Source.parse(content, path: path, factory: subtyping.factory)
         source = source.without_unrelated_defs(line: line, column: column)

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

@@ -17,7 +17,7 @@ module Steep
         end
 
         def content_for(target:, path:, line:, column:)
-          service = self.service.signature_services[target.name]
+          service = self.service.signature_services.fetch(target.name)
 
           env = service.latest_env
           buffer = env.buffers.find {|buf| buf.name.to_s == path.to_s } or return

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

@@ -65,14 +65,14 @@ module Steep
         def method_definition_for(factory, type_name, singleton_method: nil, instance_method: nil)
           case
           when instance_method
-            factory.definition_builder.build_instance(type_name).methods[instance_method]
+            factory.definition_builder.build_instance(type_name).methods.fetch(instance_method)
           when singleton_method
             methods = factory.definition_builder.build_singleton(type_name).methods
 
             if singleton_method == :new
-              methods[:new] || methods[:initialize]
+              methods[:new] || methods.fetch(:initialize)
             else
-              methods[singleton_method]
+              methods.fetch(singleton_method)
             end
           else
             raise "One of the instance_method or singleton_method is required"
@@ -80,7 +80,7 @@ module Steep
         end
 
         def typecheck(target, path:, content:, line:, column:)
-          subtyping = service.signature_services[target.name].current_subtyping or return
+          subtyping = service.signature_services.fetch(target.name).current_subtyping or return
           source = Source.parse(content, path: path, factory: subtyping.factory)
           source = source.without_unrelated_defs(line: line, column: column)
           resolver = ::RBS::Resolver::ConstantResolver.new(builder: subtyping.factory.definition_builder)
@@ -145,8 +145,8 @@ module Steep
               result_node =
                 case parents[0]&.type
                 when :block, :numblock
-                  if node == parents[0].children[0]
-                    parents[0]
+                  if node == parents.fetch(0).children[0]
+                    parents.fetch(0)
                   else
                     node
                   end

data/lib/steep/services/signature_help_provider.rb

@@ -145,13 +145,13 @@ module Steep
           # Cursor is not on the argument (maybe on comma after argument)
           return 0 if last_argument_nodes.nil?  # No arguments
 
-          case last_argument_nodes[-2].type
+          case last_argument_nodes.fetch(-2).type
           when :splat
             method_type.type.required_positionals.size + method_type.type.optional_positionals.size + 1 if method_type.type.rest_positionals
           when :kwargs
-            case last_argument_nodes[-3].type
+            case last_argument_nodes.fetch(-3).type
             when :pair
-              argname = last_argument_nodes[-3].children.first.children.first
+              argname = last_argument_nodes.fetch(-3).children.first.children.first
               if method_type.type.required_keywords.key?(argname)
                 positionals + method_type.type.required_keywords.keys.index(argname).to_i + 1
               elsif method_type.type.optional_keywords.key?(argname)
@@ -163,7 +163,7 @@ module Steep
               positionals + method_type.type.required_keywords.size + method_type.type.optional_keywords.size if method_type.type.rest_keywords
             end
           else
-            pos = (node.children[2...] || raise).index { |c| c.location == last_argument_nodes[-2].location }.to_i
+            pos = (node.children[2...] || raise).index { |c| c.location == last_argument_nodes.fetch(-2).location }.to_i
             if method_type.type.rest_positionals
               [pos + 1, positionals - 1].min
             else
@@ -172,14 +172,14 @@ module Steep
           end
         else
           # Cursor is on the argument
-          case argument_nodes[-2].type
+          case argument_nodes.fetch(-2).type
           when :splat
             method_type.type.required_positionals.size + method_type.type.optional_positionals.size if method_type.type.rest_positionals
           when :kwargs
             if argument_nodes[-3]
-              case argument_nodes[-3].type
+              case argument_nodes.fetch(-3).type
               when :pair
-                argname = argument_nodes[-3].children.first.children.first
+                argname = argument_nodes.fetch(-3).children.first.children.first
                 if method_type.type.required_keywords.key?(argname)
                   positionals + method_type.type.required_keywords.keys.index(argname).to_i
                 elsif method_type.type.optional_keywords.key?(argname)
@@ -192,7 +192,7 @@ module Steep
               end
             end
           else
-            pos = (node.children[2...] || raise).index { |c| c.location == argument_nodes[-2].location }.to_i
+            pos = (node.children[2...] || raise).index { |c| c.location == argument_nodes.fetch(-2).location }.to_i
             [pos, positionals - 1].min
           end
         end

data/lib/steep/services/type_check_service.rb

@@ -94,7 +94,7 @@ module Steep
         signature_diagnostics = {}
 
         project.targets.each do |target|
-          service = signature_services[target.name]
+          service = signature_services.fetch(target.name)
 
           service.each_rbs_path do |path|
             signature_diagnostics[path] ||= []
@@ -105,13 +105,13 @@ module Steep
             service.status.diagnostics.group_by {|diag| diag.location&.buffer&.name&.to_s }.each do |path_string, diagnostics|
               if path_string
                 path = Pathname(path_string)
-                signature_diagnostics[path].push(*diagnostics)
+                signature_diagnostics.fetch(path).push(*diagnostics)
               end
             end
           when SignatureService::LoadedStatus
             validation_diagnostics = signature_validation_diagnostics[target.name] || {}
             validation_diagnostics.each do |path, diagnostics|
-              signature_diagnostics[path].push(*diagnostics)
+              signature_diagnostics.fetch(path).push(*diagnostics)
             end
           end
         end
@@ -154,7 +154,7 @@ module Steep
       def validate_signature(path:, target:)
         Steep.logger.tagged "#validate_signature(path=#{path})" do
           Steep.measure "validation" do
-            service = signature_services[target.name]
+            service = signature_services.fetch(target.name)
 
             raise "#{path} is not library nor signature of #{target.name}" unless target.possible_signature_file?(path) || service.env_rbs_paths.include?(path)
 
@@ -221,7 +221,7 @@ module Steep
               end
             end
 
-            signature_validation_diagnostics[target.name][path] = diagnostics
+            signature_validation_diagnostics.fetch(target.name)[path] = diagnostics
           end
         end
       end
@@ -231,11 +231,11 @@ module Steep
 
         Steep.logger.tagged "#typecheck_source(path=#{path})" do
           Steep.measure "typecheck" do
-            signature_service = signature_services[target.name]
+            signature_service = signature_services.fetch(target.name)
             subtyping = signature_service.current_subtyping
 
             if subtyping
-              text = source_files[path].content
+              text = source_files.fetch(path).content
               file = type_check_file(target: target, subtyping: subtyping, path: path, text: text) { signature_service.latest_constant_resolver }
               source_files[path] = file
 
@@ -287,7 +287,7 @@ module Steep
           SourceFile.with_typing(path: path, content: text, node: source.node, typing: typing, ignores: ignores)
         end
       rescue AnnotationParser::SyntaxError => exn
-        error = Diagnostic::Ruby::SyntaxError.new(message: exn.message, location: exn.location)
+        error = Diagnostic::Ruby::AnnotationSyntaxError.new(message: exn.message, location: exn.location)
         SourceFile.with_syntax_error(path: path, content: text, error: error)
       rescue ::Parser::SyntaxError => exn
         error = Diagnostic::Ruby::SyntaxError.new(message: exn.message, location: (_ = exn).diagnostic.location)

data/lib/steep/signature/validator.rb

@@ -130,7 +130,7 @@ module Steep
             ]
           when RBS::Types::Alias
             type_name = env.normalize_type_name?(type.name) or return
-            entry = env.type_alias_decls[type_name]
+            entry = env.type_alias_decls.fetch(type_name)
 
             [
               type_name,
@@ -485,7 +485,7 @@ module Steep
           location =
             case ancestor.source
             when :super
-              primary_decl = env.class_decls[name].primary.decl
+              primary_decl = env.class_decls.fetch(name).primary.decl
               primary_decl.is_a?(RBS::AST::Declarations::Class) or raise
               if super_class = primary_decl.super_class
                 super_class.location
@@ -594,7 +594,7 @@ module Steep
         end
       end
 
-      def validate_one_alias(name, entry = env.type_alias_decls[name])
+      def validate_one_alias(name, entry = env.type_alias_decls.fetch(name))
         *, inner_most_outer_module = entry.outer
         if inner_most_outer_module
           class_type = AST::Types::Name::Singleton.new(name: inner_most_outer_module.name)

data/lib/steep/source.rb

@@ -88,7 +88,7 @@ module Steep
 
       annotations.each do |annot|
         map[node] ||= []
-        map[node] << annot
+        map.fetch(node) << annot
       end
 
       ignores = comments.filter_map do |comment|
@@ -269,7 +269,7 @@ module Steep
 
       associated_annotations.each do |annot|
         mapping[node] ||= []
-        mapping[node] << annot
+        mapping.fetch(node) << annot
       end
 
       annotations.replace(other_annotations)
@@ -379,7 +379,7 @@ module Steep
       position = buffer.loc_to_pos([line, column])
 
       if heredoc_nodes = find_heredoc_nodes(line, column, position)
-        Source.each_child_node(heredoc_nodes[0]) do |child|
+        Source.each_child_node(heredoc_nodes.fetch(0)) do |child|
           if nodes = find_nodes_loc(child, position, heredoc_nodes)
             return nodes
           end
@@ -442,7 +442,7 @@ module Steep
 
         annotations.each do |annot|
           mapping[node_] ||= []
-          mapping[node_] << annot
+          mapping.fetch(node_) << annot
         end
 
         Source.new(buffer: buffer, path: path, node: node_, mapping: mapping, comments: comments, ignores: ignores)

data/lib/steep/subtyping/check.rb

@@ -515,7 +515,7 @@ module Steep
                 types: relation.sub_type.types
               )
 
-            check_type(Relation.new(sub_type: tuple_element_type, super_type: super_type.args[0]))
+            check_type(Relation.new(sub_type: tuple_element_type, super_type: super_type.args.fetch(0)))
           end
 
         when relation.sub_type.is_a?(AST::Types::Tuple)
@@ -1057,10 +1057,10 @@ module Steep
 
         sup_flat_kws.each do |name, _|
           if sub_flat_kws.key?(name)
-            pairs << [sub_flat_kws[name], sup_flat_kws[name]]
+            pairs << [sub_flat_kws.fetch(name), sup_flat_kws.fetch(name)]
           else
             if sub_params.rest_keywords
-              pairs << [sub_params.rest_keywords, sup_flat_kws[name]]
+              pairs << [sub_params.rest_keywords, sup_flat_kws.fetch(name)]
             else
               return failure
             end

data/lib/steep/subtyping/constraints.rb

@@ -102,7 +102,7 @@ module Steep
       end
 
       def add(var, sub_type: nil, super_type: nil, skip: false)
-        subs, supers, skips = dictionary[var]
+        subs, supers, skips = dictionary.fetch(var)
 
         if sub_type.is_a?(AST::Types::Logic::Base)
           sub_type = AST::Builtin.bool_type
@@ -204,7 +204,7 @@ module Steep
         if skip
           upper_bound = upper_bound_types(var)
         else
-          _, upper_bound, _ = dictionary[var]
+          _, upper_bound, _ = dictionary.fetch(var)
         end
 
         case upper_bound.size
@@ -320,12 +320,12 @@ module Steep
       end
 
       def lower_bound_types(var_name)
-        lower, _, _ = dictionary[var_name]
+        lower, _, _ = dictionary.fetch(var_name)
         lower
       end
 
       def upper_bound_types(var_name)
-        _, upper, skips = dictionary[var_name]
+        _, upper, skips = dictionary.fetch(var_name)
 
         case
         when upper.empty?