rubocop-rbs_inline 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 493b7e1647144c43522e4942ef4bcfbf5c79212f9fbe8640faf31e4431f9c8bd
-  data.tar.gz: be48b787c6ca85eab710bd9dbb32cba5a8d0854668d87ea0f86142b330585f27
+  metadata.gz: c65d1d4e37ea73dd5b79770f8fc0918073146d2ffd98e0fd586d8aec79aae444
+  data.tar.gz: 5159368f17e584d01b6c7154bb26e12786abac1d76f48d1da2374390b4bf7b44
 SHA512:
-  metadata.gz: 35ac9302a3b6d02143db3168c5439732461816077b675ad150a6957933284d6124b30065c112f9fdf75364cc6203afef3a3dba68948c9d5edba05571ec3c3a3c
-  data.tar.gz: 6ce6535243b8f0ef9f17aff0d41ca646ebc07b3fbb6271c1a46715b6c63226e1662795cce9dc864cfbbf3c3f2b5023c8d3729581e495f68f519c0978d4283c9c
+  metadata.gz: 1361c8832f82fed8f3ad92943b3d3d563cd109a479b7b6095cc6e8f887712c8a2bcaa06d2a1fc67abab2e122f0a97dd0b181a34b134a16baa707498318d7ac71
+  data.tar.gz: 84151f32b0ad2aa4d5b948a0bd4350031cf0112f1548688689f71dc05eccc3f68a39d214494c2ee82f314300a871f80f51509d7c3c3a6564c19deaf08a4fef91

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.5.3 (2026-03-02)
+
+### Enhancements
+
+- **Style/RbsInline/MissingTypeAnnotation**: Added `method_type_signature_or_return_annotation` style. Methods with arguments require a leading `#:` method type signature; methods without arguments accept either a leading `#:` signature or a trailing `#:` return type annotation.
+
 ## 1.5.2 (2026-02-26)
 
 ### Bug Fixes

data/README.md

@@ -204,9 +204,10 @@ Enforces that method definitions and `attr_*` declarations have RBS inline type
 
 **Configuration:**
 - `EnforcedStyle` (default: `doc_style`)
-  - `method_type_signature`: Requires `#:` annotation comments
   - `doc_style`: Requires `# @rbs` annotations
   - `doc_style_and_return_annotation`: Requires `# @rbs` parameters and inline `#:` return type
+  - `method_type_signature`: Requires `#:` annotation comments
+  - `method_type_signature_or_return_annotation`: Requires `#:` annotation for methods with arguments; accepts either `#:` annotation or trailing `#:` return type for methods without arguments
 - `Visibility` (default: `all`)
   - `all`: Checks all methods regardless of visibility
   - `public`: Only checks public methods and `attr_*` declarations
@@ -228,6 +229,20 @@ def greet(name)
 end
 ```
 
+**Examples (EnforcedStyle: doc_style_and_return_annotation):**
+```ruby
+# bad - no annotation
+def greet(name)
+  "Hello, #{name}"
+end
+
+# good
+# @rbs name: String
+def greet(name) #: String
+  "Hello, #{name}"
+end
+```
+
 **Examples (EnforcedStyle: method_type_signature):**
 ```ruby
 # bad - no annotation
@@ -242,18 +257,34 @@ def greet(name)
 end
 ```
 
-**Examples (EnforcedStyle: doc_style_and_return_annotation):**
+**Examples (EnforcedStyle: method_type_signature_or_return_annotation):**
 ```ruby
-# bad - no annotation
+# bad - method with arguments requires method_type_signature
 def greet(name)
   "Hello, #{name}"
 end
 
-# good
-# @rbs name: String
+# bad - trailing return annotation is not accepted for methods with arguments
 def greet(name) #: String
   "Hello, #{name}"
 end
+
+# good - method_type_signature for methods with arguments
+#: (String) -> String
+def greet(name)
+  "Hello, #{name}"
+end
+
+# good - method_type_signature for methods without arguments
+#: -> String
+def greet
+  "Hello"
+end
+
+# good - trailing return annotation for methods without arguments
+def greet #: String
+  "Hello"
+end
 ```
 
 ### Style/RbsInline/ParametersSeparator

data/config/default.yml

@@ -44,9 +44,10 @@ Style/RbsInline/MissingTypeAnnotation:
   VersionAdded: "1.5.0"
   EnforcedStyle: doc_style
   SupportedStyles:
-    - method_type_signature
     - doc_style
     - doc_style_and_return_annotation
+    - method_type_signature
+    - method_type_signature_or_return_annotation
   Visibility: all
 
 Style/RbsInline/ParametersSeparator:

data/lib/rubocop/cop/style/rbs_inline/missing_type_annotation.rb

@@ -11,9 +11,11 @@ module RuboCop
         #
         # The `EnforcedStyle` option determines which annotation format is required:
         #
-        # - `method_type_signature`: Requires `#:` annotation comments only
         # - `doc_style`: Requires `# @rbs` annotations
         # - `doc_style_and_return_annotation`: Requires `# @rbs` parameters and trailing `#:` return type
+        # - `method_type_signature`: Requires `#:` annotation comments only
+        # - `method_type_signature_or_return_annotation`: Requires `#:` annotation for methods with arguments;
+        #   accepts either `#:` annotation or trailing `#:` return type for methods without arguments
         #
         # The `Visibility` option determines which methods to check:
         #
@@ -22,7 +24,7 @@ module RuboCop
         #
         # Methods annotated with `# @rbs skip` are always excluded from inspection.
         #
-        # @example EnforcedStyle: method_type_signature
+        # @example EnforcedStyle: doc_style
         #   # bad
         #   def greet(name)
         #     "Hello, #{name}"
@@ -32,16 +34,38 @@ module RuboCop
         #   attr_reader :name
         #
         #   # good
-        #   #: (String) -> String
+        #   # @rbs name: String
+        #   # @rbs return: String
         #   def greet(name)
         #     "Hello, #{name}"
         #   end
         #
         #   # good
-        #   #: String
+        #   # @rbs name: String
         #   attr_reader :name
         #
-        # @example EnforcedStyle: doc_style
+        # @example EnforcedStyle: doc_style_and_return_annotation
+        #   # bad - no annotation
+        #   def greet(name)
+        #     "Hello, #{name}"
+        #   end
+        #
+        #   # bad - missing trailing return type
+        #   # @rbs name: String
+        #   def greet(name)
+        #     "Hello, #{name}"
+        #   end
+        #
+        #   # good - @rbs parameters + trailing return type
+        #   # @rbs name: String
+        #   def greet(name) #: String
+        #     "Hello, #{name}"
+        #   end
+        #
+        #   # good - attr with trailing type
+        #   attr_reader :name #: String
+        #
+        # @example EnforcedStyle: method_type_signature
         #   # bad
         #   def greet(name)
         #     "Hello, #{name}"
@@ -51,34 +75,43 @@ module RuboCop
         #   attr_reader :name
         #
         #   # good
-        #   # @rbs name: String
-        #   # @rbs return: String
+        #   #: (String) -> String
         #   def greet(name)
         #     "Hello, #{name}"
         #   end
         #
         #   # good
-        #   # @rbs name: String
+        #   #: String
         #   attr_reader :name
         #
-        # @example EnforcedStyle: doc_style_and_return_annotation
-        #   # bad - no annotation
+        # @example EnforcedStyle: method_type_signature_or_return_annotation
+        #   # bad - method with arguments requires method_type_signature
         #   def greet(name)
         #     "Hello, #{name}"
         #   end
         #
-        #   # bad - missing trailing return type
-        #   # @rbs name: String
-        #   def greet(name)
+        #   # bad - inline trailing comment is not accepted for methods with arguments
+        #   def greet(name) #: String
         #     "Hello, #{name}"
         #   end
         #
-        #   # good - @rbs parameters + trailing return type
-        #   # @rbs name: String
-        #   def greet(name) #: String
+        #   # good - method_type_signature for methods with arguments
+        #   #: (String) -> String
+        #   def greet(name)
         #     "Hello, #{name}"
         #   end
         #
+        #   # good - method_type_signature for methods without arguments
+        #   #: -> String
+        #   def greet
+        #     "Hello"
+        #   end
+        #
+        #   # good - trailing return type annotation for methods without arguments
+        #   def greet #: String
+        #     "Hello"
+        #   end
+        #
         #   # good - attr with trailing type
         #   attr_reader :name #: String
         #
@@ -88,6 +121,8 @@ module RuboCop
           include RangeHelp
 
           METHOD_TYPE_SIGNATURE_MESSAGE = 'Missing annotation comment (e.g., `#: (Type) -> ReturnType`).'
+          METHOD_TYPE_SIGNATURE_OR_RETURN_ANNOTATION_MESSAGE =
+            'Missing type annotation (e.g., `#: -> ReturnType` or trailing `#: ReturnType`).'
           DOC_STYLE_PARAM_MESSAGE = 'Missing `@rbs %<name>s:` annotation.'
           DOC_STYLE_RETURN_MESSAGE = 'Missing `@rbs return:` annotation.'
           DOC_STYLE_TRAILING_RETURN_MESSAGE = 'Missing trailing return type annotation (e.g., `#: void`).'
@@ -227,14 +262,16 @@ module RuboCop
             return if overload_type_signatures?(line)
 
             case style
-            when :method_type_signature
-              check_method_type_signature(node)
             when :doc_style
               check_method_parameters_in_doc_style(node)
               check_return_type_in_doc_style(node)
             when :doc_style_and_return_annotation
               check_method_parameters_in_doc_style(node)
               check_return_type_in_return_annotation(node)
+            when :method_type_signature
+              check_method_type_signature(node)
+            when :method_type_signature_or_return_annotation
+              check_method_type_signature_or_return_annotation_style(node)
             end
           end
 
@@ -245,6 +282,23 @@ module RuboCop
             add_offense(offense_range_for_def(node), message: METHOD_TYPE_SIGNATURE_MESSAGE)
           end
 
+          # @rbs node: Parser::AST::Node
+          def check_method_type_signature_or_return_annotation_style(node) #: void
+            if method_has_arguments?(node)
+              check_method_type_signature(node)
+            else
+              check_method_type_signature_or_return_annotation(node)
+            end
+          end
+
+          # @rbs node: Parser::AST::Node
+          def check_method_type_signature_or_return_annotation(node) #: void
+            return if find_method_type_signature_comments(node.location.line)
+            return if find_trailing_comment(method_parameter_list_end_line(node))
+
+            add_offense(offense_range_for_def(node), message: METHOD_TYPE_SIGNATURE_OR_RETURN_ANNOTATION_MESSAGE)
+          end
+
           # @rbs node: Parser::AST::Node
           def check_method_parameters_in_doc_style(node) #: void # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
             line = node.location.line
@@ -298,6 +352,11 @@ module RuboCop
             end
           end
 
+          # @rbs node: Parser::AST::Node
+          def method_has_arguments?(node) #: bool
+            args_node_for(node).children.any?
+          end
+
           # @rbs line: Integer
           def annotated_attribute_method?(line) #: boolish
             # attr_* always requires inline comment regardless of style

data/lib/rubocop/rbs_inline/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module RbsInline
-    VERSION = '1.5.2'
+    VERSION = '1.5.3'
   end
 end

data/sig/rubocop/cop/style/rbs_inline/missing_type_annotation.rbs

@@ -9,9 +9,11 @@ module RuboCop
         #
         # The `EnforcedStyle` option determines which annotation format is required:
         #
-        # - `method_type_signature`: Requires `#:` annotation comments only
         # - `doc_style`: Requires `# @rbs` annotations
         # - `doc_style_and_return_annotation`: Requires `# @rbs` parameters and trailing `#:` return type
+        # - `method_type_signature`: Requires `#:` annotation comments only
+        # - `method_type_signature_or_return_annotation`: Requires `#:` annotation for methods with arguments;
+        #   accepts either `#:` annotation or trailing `#:` return type for methods without arguments
         #
         # The `Visibility` option determines which methods to check:
         #
@@ -20,7 +22,7 @@ module RuboCop
         #
         # Methods annotated with `# @rbs skip` are always excluded from inspection.
         #
-        # @example EnforcedStyle: method_type_signature
+        # @example EnforcedStyle: doc_style
         #   # bad
         #   def greet(name)
         #     "Hello, #{name}"
@@ -30,16 +32,38 @@ module RuboCop
         #   attr_reader :name
         #
         #   # good
-        #   #: (String) -> String
+        #   # @rbs name: String
+        #   # @rbs return: String
         #   def greet(name)
         #     "Hello, #{name}"
         #   end
         #
         #   # good
-        #   #: String
+        #   # @rbs name: String
         #   attr_reader :name
         #
-        # @example EnforcedStyle: doc_style
+        # @example EnforcedStyle: doc_style_and_return_annotation
+        #   # bad - no annotation
+        #   def greet(name)
+        #     "Hello, #{name}"
+        #   end
+        #
+        #   # bad - missing trailing return type
+        #   # @rbs name: String
+        #   def greet(name)
+        #     "Hello, #{name}"
+        #   end
+        #
+        #   # good - @rbs parameters + trailing return type
+        #   # @rbs name: String
+        #   def greet(name) #: String
+        #     "Hello, #{name}"
+        #   end
+        #
+        #   # good - attr with trailing type
+        #   attr_reader :name #: String
+        #
+        # @example EnforcedStyle: method_type_signature
         #   # bad
         #   def greet(name)
         #     "Hello, #{name}"
@@ -49,34 +73,43 @@ module RuboCop
         #   attr_reader :name
         #
         #   # good
-        #   # @rbs name: String
-        #   # @rbs return: String
+        #   #: (String) -> String
         #   def greet(name)
         #     "Hello, #{name}"
         #   end
         #
         #   # good
-        #   # @rbs name: String
+        #   #: String
         #   attr_reader :name
         #
-        # @example EnforcedStyle: doc_style_and_return_annotation
-        #   # bad - no annotation
+        # @example EnforcedStyle: method_type_signature_or_return_annotation
+        #   # bad - method with arguments requires method_type_signature
         #   def greet(name)
         #     "Hello, #{name}"
         #   end
         #
-        #   # bad - missing trailing return type
-        #   # @rbs name: String
-        #   def greet(name)
+        #   # bad - inline trailing comment is not accepted for methods with arguments
+        #   def greet(name) #: String
         #     "Hello, #{name}"
         #   end
         #
-        #   # good - @rbs parameters + trailing return type
-        #   # @rbs name: String
-        #   def greet(name) #: String
+        #   # good - method_type_signature for methods with arguments
+        #   #: (String) -> String
+        #   def greet(name)
         #     "Hello, #{name}"
         #   end
         #
+        #   # good - method_type_signature for methods without arguments
+        #   #: -> String
+        #   def greet
+        #     "Hello"
+        #   end
+        #
+        #   # good - trailing return type annotation for methods without arguments
+        #   def greet #: String
+        #     "Hello"
+        #   end
+        #
         #   # good - attr with trailing type
         #   attr_reader :name #: String
         class MissingTypeAnnotation < Base
@@ -88,6 +121,8 @@ module RuboCop
 
           METHOD_TYPE_SIGNATURE_MESSAGE: ::String
 
+          METHOD_TYPE_SIGNATURE_OR_RETURN_ANNOTATION_MESSAGE: ::String
+
           DOC_STYLE_PARAM_MESSAGE: ::String
 
           DOC_STYLE_RETURN_MESSAGE: ::String
@@ -172,6 +207,12 @@ module RuboCop
           # @rbs node: Parser::AST::Node
           def check_method_type_signature: (Parser::AST::Node node) -> void
 
+          # @rbs node: Parser::AST::Node
+          def check_method_type_signature_or_return_annotation_style: (Parser::AST::Node node) -> void
+
+          # @rbs node: Parser::AST::Node
+          def check_method_type_signature_or_return_annotation: (Parser::AST::Node node) -> void
+
           # @rbs node: Parser::AST::Node
           def check_method_parameters_in_doc_style: (Parser::AST::Node node) -> void
 
@@ -191,6 +232,9 @@ module RuboCop
           # @rbs node: Parser::AST::Node
           def args_node_for: (Parser::AST::Node node) -> Parser::AST::Node
 
+          # @rbs node: Parser::AST::Node
+          def method_has_arguments?: (Parser::AST::Node node) -> bool
+
           # @rbs line: Integer
           def annotated_attribute_method?: (Integer line) -> boolish
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rbs_inline
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-26 00:00:00.000000000 Z
+date: 2026-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller