Fix rubocop part1

euglena1215 · Jun 17, 2024 · a07644e · a07644e
1 parent 24c315e
commit a07644e
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 24 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.3
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
@@ -9,3 +9,11 @@ Style/StringLiteralsInInterpolation:
 
 Layout/LeadingCommentSpace:
   Enabled: false
+
+Metrics/ClassLength:
+  Exclude:
+    - 'test/**/*'
+
+Metrics/MethodLength:
+  Exclude:
+    - 'test/**/*'
diff --git a/lib/rbs_inline_data/cli.rb b/lib/rbs_inline_data/cli.rb
@@ -6,6 +6,7 @@
 require "rbs_inline_data/writer"
 
 module RbsInlineData
+  # Process executed when running the rbs-inline-data command.
   class CLI
     #:: (Array[String]) -> void
     def run(args)

diff --git a/lib/rbs_inline_data/parser.rb b/lib/rbs_inline_data/parser.rb
@@ -18,11 +18,13 @@ class Parser < Prism::Visitor
     # @rbs @definitions: Array[RbsInlineData::Parser::TypedDefinition]
     # @rbs @surronding_class_or_module: Array[Symbol]
 
+    # rubocop:disable Lint/MissingSuper
     #:: (Array[RbsInlineData::Parser::TypedDefinition]) -> void
     def initialize(definitions)
       @definitions = definitions
       @surronding_class_or_module = []
     end
+    # rubocop:enable Lint/MissingSuper
 
     #:: (Prism::ParseResult) -> Array[RbsInlineData::Parser::TypedDefinition]
     def self.parse(result)
@@ -86,21 +88,21 @@ def extract_definition(node)
 
       fields = field_text.split("\n").map(&:strip).reject(&:empty?).map do |str|
         case str
-        when /:(\w+),? #:: ([\w\:\[\], ]+)/
+        when /:(\w+),? #:: ([\w:\[\], ]+)/
           [::Regexp.last_match(1), ::Regexp.last_match(2)]
         when /:(\w+),?/
           [::Regexp.last_match(1), "untyped"]
         end
       end.compact.map do |field_name, type|
         TypedField.new(
-          field_name: field_name,
-          type: type
+          field_name:,
+          type:
         )
       end
 
       TypedDefinition.new(
-        class_name: class_name,
-        fields: fields
+        class_name:,
+        fields:
       )
     end
   end

diff --git a/test/rbs_inline_data/parser_test.rb b/test/rbs_inline_data/parser_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 require "rbs_inline_data/parser"
 
@@ -22,13 +24,15 @@ class Foo
       assert_equal definitions[0], Parser::TypedDefinition.new(
         class_name: "Foo::Bar",
         fields: [
-          Parser::TypedField.new(field_name: "value", type: "String"),
-        ])
+          Parser::TypedField.new(field_name: "value", type: "String")
+        ]
+      )
       assert_equal definitions[1], Parser::TypedDefinition.new(
         class_name: "Foo::Bar2",
         fields: [
-          Parser::TypedField.new(field_name: "value", type: "Integer"),
-        ])
+          Parser::TypedField.new(field_name: "value", type: "Integer")
+        ]
+      )
     end
 
     def test_multiple_definition
@@ -46,13 +50,15 @@ class Foo
       assert_equal definitions[0], Parser::TypedDefinition.new(
         class_name: "Foo::Bar",
         fields: [
-          Parser::TypedField.new(field_name: "string_value", type: "String"),
-        ])
+          Parser::TypedField.new(field_name: "string_value", type: "String")
+        ]
+      )
       assert_equal definitions[1], Parser::TypedDefinition.new(
         class_name: "Foo::Bar2",
         fields: [
-          Parser::TypedField.new(field_name: "string_value", type: "String"),
-        ])
+          Parser::TypedField.new(field_name: "string_value", type: "String")
+        ]
+      )
     end
 
     def test_untyped
@@ -71,18 +77,21 @@ class Foo
       assert_equal definitions[0], Parser::TypedDefinition.new(
         class_name: "Foo::Bar",
         fields: [
-          Parser::TypedField.new(field_name: "value", type: "untyped"),
-        ])
+          Parser::TypedField.new(field_name: "value", type: "untyped")
+        ]
+      )
       assert_equal definitions[1], Parser::TypedDefinition.new(
         class_name: "Foo::Bar2",
         fields: [
-          Parser::TypedField.new(field_name: "value", type: "untyped"),
-        ])
+          Parser::TypedField.new(field_name: "value", type: "untyped")
+        ]
+      )
       assert_equal definitions[2], Parser::TypedDefinition.new(
         class_name: "Foo::Bar3",
         fields: [
-          Parser::TypedField.new(field_name: "value", type: "untyped"),
-        ])
+          Parser::TypedField.new(field_name: "value", type: "untyped")
+        ]
+      )
     end
 
     def test_nested_type
@@ -102,8 +111,9 @@ class C; end
         class_name: "A::B::D",
         fields: [
           Parser::TypedField.new(field_name: "x", type: "A::B::C"),
-          Parser::TypedField.new(field_name: "y", type: "Array[A::B::C]"),
-        ])
+          Parser::TypedField.new(field_name: "y", type: "Array[A::B::C]")
+        ]
+      )
     end
 
     def test_hash_type
@@ -118,8 +128,9 @@ class A
       assert_equal definitions[0], Parser::TypedDefinition.new(
         class_name: "A::B",
         fields: [
-          Parser::TypedField.new(field_name: "x", type: "Hash[Symbol, String]"),
-        ])
+          Parser::TypedField.new(field_name: "x", type: "Hash[Symbol, String]")
+        ]
+      )
     end
   end
 end