rubocop-on-rbs 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f48492da2f7f96f52584db83f1ead670446908414b91ebf0a27a7d6ccb82c1e
-  data.tar.gz: c5374fcc49b860034ef0852e3a4d2a86c99867e96581033884116b707844c597
+  metadata.gz: af5e7c84d5044bb2a7d6e95b4de88a076e9624c96011d0eb41dae6f2de20fec6
+  data.tar.gz: 6270af5147ea7981766721a24b70e6cb5adcf82c82c82ba91c5dbe8f0409de43
 SHA512:
-  metadata.gz: fceeab927591e1507529a6b55d1b30f8b8bd7b5d700846777109a0e2b84c61380b5bee05d721d5eb5a08ffee4c184875d7956327c7feea6d469742c66f5affc7
-  data.tar.gz: 618f0de58a7bf00f68f0df67cca9d82da6723715af26eb1740211ab16bf53be66604782ec251fcbfdb313c933f30eb535e19f932b1d029fc462c8782189599a0
+  metadata.gz: 7b66215eae031a7c9f9cf95498b57998d0942da9a96920684d34227230ab250868e5a3d75cb5bbbf15a90ce8b43dcf0e8a9dd532b4fb41edf486eecdd2df411f
+  data.tar.gz: 477c78f1eacc84844b52bf1e2626597d3304a97ed47f4a7641a0be9fff7ddd6f00789aa0953c54cc9dc802419919997206531dffa0ef42f615ea49001a3fb40b

data/config/default.yml

@@ -27,6 +27,10 @@ RBS:
 RBS/Layout:
   Enabled: true
 
+RBS/Layout/AnnotationIndentation:
+  Description: 'Use 2 spaces for annotation indentation'
+  Enabled: true
+
 RBS/Layout/CommentIndentation:
   Description: 'Use 2 spaces for comment indentation'
   Enabled: true

data/lib/rubocop/cop/rbs/layout/annotation_indentation.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RBS
+      module Layout
+        # Checks the indentation of annotations in RBS.
+        #
+        # @example
+        #   # bad
+        #   # comment
+        #     %a{pure}
+        #   def foo: () -> void
+        #
+        #   # good
+        #   # comment
+        #   %a{pure}
+        #   def foo: () -> void
+        #
+        class AnnotationIndentation < RuboCop::RBS::CopBase
+          extend AutoCorrector
+
+          MSG = "Incorrect indentation detected (column %<expect>s instead of %<actual>s)."
+
+          def on_rbs_new_investigation
+            indent_start_lines = Set.new
+            indent_end_lines = Set.new
+            ignore_poses = Set.new
+            processed_rbs_source.decls.each do |decl|
+              walk_decl(decl) do |d|
+                indent_start_lines << d.location.start_line
+                indent_end_lines << d.location.end_line
+                d.members.each do |member|
+                  case member
+                  when ::RBS::AST::Members::MethodDefinition
+                    member.overloads.each do |overload|
+                      overload.annotations.each do |annotation|
+                        ignore_poses << annotation.location.start_pos
+                      end
+                    end
+                  end
+                end
+              end
+            end
+
+            expected_width = 0
+            last_annotation_line = -1
+            processed_rbs_source.tokens.each do |token|
+              case token.type
+              when :kMODULE, :kCLASS, :kINTERFACE
+                next unless indent_start_lines.include?(token.location.start_line)
+
+                expected_width += 2
+              when :kEND
+                next unless indent_end_lines.include?(token.location.start_line)
+
+                expected_width -= 2
+              when :tANNOTATION
+                next if ignore_poses.include?(token.location.start_pos)
+
+                if token.location.start_column == expected_width
+                  last_annotation_line = token.location.start_line
+                  next
+                end
+                next if last_annotation_line == token.location.start_line
+
+                token_range = location_to_range(token.location)
+                message = format(MSG, expect: expected_width, actual: token.location.start_column)
+                last_annotation_line = token.location.start_line
+                add_offense(token_range, message: message) do |corrector|
+                  line_start_pos = processed_source.buffer.line_range(token.location.start_line).begin_pos
+                  indent = range_between(line_start_pos, token.location.start_pos)
+                  corrector.replace(indent, ' ' * expected_width)
+                end
+              end
+            end
+          end
+
+          def walk_decl(decl, &block)
+            if decl.respond_to?(:members)
+              yield decl
+              decl.members.each { |member| walk_decl(member, &block) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rbs/layout/comment_indentation.rb

@@ -21,45 +21,47 @@ module RuboCop
           MSG = "Incorrect indentation detected (column %<expect>s instead of %<actual>s)."
 
           def on_rbs_new_investigation
-            indent_start_lines = Set.new
-            indent_end_lines = Set.new
-            processed_rbs_source.decls.each do |decl|
-              walk_decl(decl) do |d|
-                indent_start_lines << d.location.start_line
-                indent_end_lines << d.location.end_line
-              end
+            comments = processed_rbs_source.tokens.select { |token| token.type == :tLINECOMMENT }
+            comments.each_with_index do |token, comment_index|
+              check(token, comment_index)
             end
+          end
 
-            expected_width = 0
-            processed_rbs_source.tokens.each do |token|
-              case token.type
-              when :kMODULE, :kCLASS, :kINTERFACE
-                next unless indent_start_lines.include?(token.location.start_line)
+          def check(comment_token, _comment_index)
+            next_line = line_after_comment(comment_token)
+            correct_comment_indentation = correct_indentation(next_line)
+            column = comment_token.location.start_column
 
-                expected_width += 2
-              when :kEND
-                next unless indent_end_lines.include?(token.location.start_line)
+            column_delta = correct_comment_indentation - column
+            return if column_delta.zero?
 
-                expected_width -= 2
-              when :tLINECOMMENT
-                if token.location.start_column != expected_width
-                  token_range = location_to_range(token.location)
-                  message = format(MSG, expect: expected_width, actual: token.location.start_column)
-                  add_offense(token_range, message: message) do |corrector|
-                    line_start_pos = processed_source.buffer.line_range(token.location.start_line).begin_pos
-                    indent = range_between(line_start_pos, token.location.start_pos)
-                    corrector.replace(indent, ' ' * expected_width)
-                  end
-                end
-              end
+            token_range = location_to_range(comment_token.location)
+            message = format(MSG, expect: correct_comment_indentation, actual: column)
+            add_offense(token_range, message: message) do |corrector|
+              line_start_pos = processed_source.buffer.line_range(comment_token.location.start_line).begin_pos
+              indent = range_between(line_start_pos, comment_token.location.start_pos)
+              corrector.replace(indent, ' ' * correct_comment_indentation)
             end
           end
 
-          def walk_decl(decl, &block)
-            if decl.respond_to?(:members)
-              yield decl
-              decl.members.each { |member| walk_decl(member, &block) }
-            end
+          def line_after_comment(comment)
+            lines = processed_source.lines
+            lines[comment.location.start_line..].find { |line| !line.blank? }
+          end
+
+          def correct_indentation(next_line)
+            return 0 unless next_line
+
+            indentation_of_next_line = next_line =~ /\S/
+            indentation_of_next_line + if less_indented?(next_line)
+                                         2
+                                       else
+                                         0
+                                       end
+          end
+
+          def less_indented?(line)
+            /\A\s*end\b/.match?(line)
           end
         end
       end

data/lib/rubocop/cop/rbs/layout/empty_lines_around_access_modifier.rb

@@ -68,7 +68,7 @@ module RuboCop
           end
 
           def previous_line_ignoring_comments(processed_source, send_line)
-            processed_source[0..send_line - 2].reverse.find { |line| !comment_line?(line) }
+            processed_source[0..(send_line - 2)].reverse.find { |line| !comment_line?(line) }
           end
 
           def previous_line_empty?(send_line)

data/lib/rubocop/cop/rbs/layout/space_around_operators.rb

@@ -14,8 +14,15 @@ module RuboCop
         class SpaceAroundOperators < RuboCop::RBS::CopBase
           extend AutoCorrector
 
+          def on_rbs_class(decl)
+            check_type_params(decl)
+          end
+          alias on_rbs_module on_rbs_class
+          alias on_rbs_interface on_rbs_class
+
           def on_rbs_def(decl)
             decl.overloads.each do |overload|
+              check_type_params(overload.method_type)
               overload.method_type.each_type do |type|
                 check_type(type)
               end
@@ -26,10 +33,14 @@ module RuboCop
             check_type(decl.type)
           end
           alias on_rbs_global on_rbs_constant
-          alias on_rbs_type_alias on_rbs_constant
           alias on_rbs_attribute on_rbs_constant
           alias on_rbs_var on_rbs_constant
 
+          def on_rbs_type_alias(decl)
+            check_type_params(decl)
+            check_type(decl.type)
+          end
+
           def check_type(type)
             case type
             when ::RBS::Types::Union
@@ -42,6 +53,13 @@ module RuboCop
             end
           end
 
+          def check_type_params(decl)
+            decl.type_params.each do |type_param|
+              check_type(type_param.default_type) if type_param.default_type
+              check_type(type_param.upper_bound_type) if type_param.upper_bound_type
+            end
+          end
+
           def check_operator(type, operator)
             type.types.each_cons(2) do |before, after|
               next unless before.location.end_line == after.location.start_line

data/lib/rubocop/cop/rbs/style/block_return_boolish.rb

@@ -13,6 +13,7 @@ module RuboCop
         #
         class BlockReturnBoolish < RuboCop::RBS::CopBase
           extend AutoCorrector
+
           MSG = 'Use `boolish` instead of `bool` in block return type.'
 
           # @sig decl: ::RBS::AST::Members::MethodDefinition

data/lib/rubocop/cop/rbs/style/class_with_singleton.rb

@@ -16,6 +16,7 @@ module RuboCop
         #
         class ClassWithSingleton < RuboCop::RBS::CopBase
           extend AutoCorrector
+
           MSG = 'Use `self` instead of `class`.'
 
           # @rbs decl: RBS::AST::Members::MethodDefinition

data/lib/rubocop/cop/rbs/style/initialize_return_type.rb

@@ -22,6 +22,7 @@ module RuboCop
         #
         class InitializeReturnType < RuboCop::RBS::CopBase
           extend AutoCorrector
+
           MSG = '`#initialize` method should return `void`'
 
           def on_rbs_def(decl)

data/lib/rubocop/cop/rbs/style/instance_with_instance.rb

@@ -16,6 +16,7 @@ module RuboCop
         #
         class InstanceWithInstance < RuboCop::RBS::CopBase
           extend AutoCorrector
+
           MSG = 'Use `self` instead of `instance`.'
 
           # @rbs decl: RBS::AST::Declarations::Class

data/lib/rubocop/cop/rbs/style/redundant_parentheses.rb

@@ -49,6 +49,7 @@ module RuboCop
           class ParenChecker
             include BeforeTokenIfLparen
             include RangeHelp
+
             attr_reader :processed_source
 
             def initialize(processed_source:, base:, tokens:, type:, skip:, cop:)

data/lib/rubocop/cop/rbs_cops.rb

@@ -2,6 +2,7 @@
 
 require 'rbs'
 
+require_relative 'rbs/layout/annotation_indentation'
 require_relative 'rbs/layout/comment_indentation'
 require_relative 'rbs/layout/empty_line_between_declarations'
 require_relative 'rbs/layout/empty_lines_around_access_modifier'

data/lib/rubocop/rbs/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module RBS
-    VERSION = '1.8.0'
+    VERSION = '1.9.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-on-rbs
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - ksss
@@ -84,6 +84,7 @@ files:
 - README.md
 - config/default.yml
 - lib/rubocop-on-rbs.rb
+- lib/rubocop/cop/rbs/layout/annotation_indentation.rb
 - lib/rubocop/cop/rbs/layout/comment_indentation.rb
 - lib/rubocop/cop/rbs/layout/empty_line_between_declarations.rb
 - lib/rubocop/cop/rbs/layout/empty_lines.rb
@@ -159,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 4.0.3
 specification_version: 4
 summary: RuboCop extension for RBS file.
 test_files: []