Add Decl#update and fix sorter

Author: pocke

lib/rbs/ast/declarations.rb

@@ -104,6 +104,18 @@ def initialize(name:, type_params:, super_class:, members:, annotations:, locati
           @comment = comment
         end
 
+        def update(name: self.name, type_params: self.type_params, super_class: self.super_class, members: self.members, annotations: self.annotations, location: self.location, comment: self.comment)
+          self.class.new(
+            name: name,
+            type_params: type_params,
+            super_class: super_class,
+            members: members,
+            annotations: annotations,
+            location: location,
+            comment: comment
+          )
+        end
+
         def ==(other)
           other.is_a?(Class) &&
             other.name == name &&
@@ -192,6 +204,19 @@ def initialize(name:, type_params:, members:, self_types:, annotations:, locatio
           @comment = comment
         end
 
+        def update(name: self.name, type_params: self.type_params, members: self.members, self_types: self.self_types, annotations: self.annotations, location: self.location, comment: self.comment)
+          self.class.new(
+            name: name,
+            type_params: type_params,
+            members: members,
+            self_types: self_types,
+            annotations: annotations,
+            location: location,
+            comment: comment
+          )
+        end
+
+
         def ==(other)
           other.is_a?(Module) &&
             other.name == name &&
@@ -239,6 +264,17 @@ def initialize(name:, type_params:, members:, annotations:, location:, comment:)
           @comment = comment
         end
 
+        def update(name: self.name, type_params: self.type_params, members: self.members, annotations: self.annotations, location: self.location, comment: self.comment)
+          self.class.new(
+            name: name,
+            type_params: type_params,
+            members: members,
+            annotations: annotations,
+            location: location,
+            comment: comment
+          )
+        end
+
         def ==(other)
           other.is_a?(Interface) &&
             other.name == name &&

lib/rbs/sorter.rb

@@ -17,18 +17,18 @@ def run
       buffer = Buffer.new(name: path, content: path.read)
       _, _, sigs = Parser.parse_signature(buffer)
 
-      sigs.each do |m|
-        sort_decl! m
+      sigs = sigs.map do |m|
+        sort_decl m
       end
 
       stdout.puts "Writing #{path}..."
       path.open('w') do |out|
         writer = RBS::Writer.new(out: out)
-        writer.write sigs
+        writer.write _ = sigs
       end
     end
 
-    def sort_decl!(decl)
+    def sort_decl(decl)
       case decl
       when Declarations::Class, Declarations::Module, Declarations::Interface
         partitioned = {
@@ -52,7 +52,8 @@ def sort_decl!(decl)
           private_instance_methods: [],
         } #: partitioned
 
-        decl.members.each { |m| sort_decl! m }
+        members = decl.members.map { |m| sort_decl m }
+        decl = decl.update(members: _ = members)
 
         visibility_annotated_members = [] #: Array[member]
 
@@ -188,7 +189,9 @@ def sort_decl!(decl)
 
         members.push(*partitioned[:other_decls])
 
-        decl.members.replace(_ = members)
+        decl.update(members: _ = members)
+      else
+        decl
       end
     end
   end

sig/declarations.rbs

@@ -77,6 +77,8 @@ module RBS
 
         def initialize: (name: TypeName, type_params: Array[TypeParam], members: Array[member], super_class: Super?, annotations: Array[Annotation], location: loc?, comment: Comment?) -> void
 
+        def update: (?name: TypeName, ?type_params: Array[TypeParam], ?members: Array[member], ?super_class: Super?, ?annotations: Array[Annotation], ?location: loc?, ?comment: Comment?) -> Declarations::Class
+
         include _HashEqual
         include _ToJson
       end
@@ -131,6 +133,8 @@ module RBS
 
         def initialize: (name: TypeName, type_params: Array[TypeParam], members: Array[member], location: loc?, annotations: Array[Annotation], self_types: Array[Self], comment: Comment?) -> void
 
+        def update: (?name: TypeName, ?type_params: Array[TypeParam], ?members: Array[member], ?location: loc?, ?annotations: Array[Annotation], ?self_types: Array[Self], ?comment: Comment?) -> Declarations::Module
+
         include _HashEqual
         include _ToJson
       end
@@ -160,6 +164,8 @@ module RBS
 
         def initialize: (name: TypeName, type_params: Array[TypeParam], members: Array[member], annotations: Array[Annotation], location: loc?, comment: Comment?) -> void
 
+        def update: (?name: TypeName, ?type_params: Array[TypeParam], ?members: Array[member], ?annotations: Array[Annotation], ?location: loc?, ?comment: Comment?) -> Declarations::Interface
+
         include MixinHelper
 
         include _HashEqual

sig/sorter.rbs

@@ -36,6 +36,6 @@ module RBS
       other_decls: Array[member]
     }
 
-    def sort_decl!: (member decl) -> void
+    def sort_decl: (member decl) -> member
   end
 end