rbs-patch 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef229a0a3efd1a66cdc57652ef80b173d19311652f376422a06bad6d61d3c7b5
-  data.tar.gz: 364bff243f157949a91b88c936a953e88cf275589312c664df1a9f6cc2d89c40
+  metadata.gz: be7a77838d494748f9f51925c7d26a78a70aee45fb143942b71630c79fa31518
+  data.tar.gz: 67ad4d7de09a5a558924e609894dc19c9e2266f7b3f311008e8300f7d41c43e8
 SHA512:
-  metadata.gz: ad22a7fbeff8115b185977f5d21bfdbd51b53485f1e1896dc0e692fccbf6e8de82b90f499e3702343dbb579798cbe86b4ad871926aa8089763d4e1599d9c29e2
-  data.tar.gz: 2850321317aa8b97317f315b4dce55af70330c724cd279dadbd5f8b0c8f9edc3e4305dbfaeca0aa85365123caa1772b4bb7137487df4b7fbf6c9b6d9ab66c7aa
+  metadata.gz: 632f15418e48dca1b7a4f5202665a1b9248720ea267b6f49de41e3b8c3696ac3bc23f6010e22b3e9be8a551b593db3310be8ce6a93b27170590fd83c3b814637
+  data.tar.gz: 86fda57bc6b66c158b7c67c9b58dcc9f9bb4d13433204e0587e60338f8220aea9a52b386025ca48ab20eee27954b5779a2b54ab9382a05ad243918c5281610bf

data/lib/rbs/patch/version.rb

@@ -2,6 +2,6 @@
 
 module RBS
   class Patch
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
 end

data/lib/rbs/patch.rb

@@ -74,6 +74,43 @@ module RBS
       decl.members if decl.is_a?(::RBS::AST::Declarations::NestedDeclarationHelper)
     end
 
+    def update(decl, location:)
+      if decl.respond_to?(:update)
+        # steep:ignore:start
+        decl.update(location:)
+        # steep:ignore:end
+      elsif decl.is_a?(AST::Declarations::Constant)
+        AST::Declarations::Constant.new(
+          name: decl.name, type: decl.type, location: location, comment: decl.comment, annotations: decl.annotations
+        )
+      elsif decl.is_a?(AST::Declarations::Global)
+        AST::Declarations::Global.new(
+          name: decl.name, type: decl.type, location: location, comment: decl.comment, annotations: decl.annotations
+        )
+      elsif decl.is_a?(AST::Declarations::TypeAlias)
+        AST::Declarations::TypeAlias.new(
+          name: decl.name, type_params: decl.type_params, type: decl.type, annotations: decl.annotations,
+          location: location, comment: decl.comment
+        )
+      elsif decl.is_a?(AST::Declarations::AliasDecl)
+        decl.class.new(
+          new_name: decl.new_name, old_name: decl.old_name, location: location, comment: decl.comment,
+          annotations: decl.annotations
+        )
+      elsif decl.is_a?(AST::Members::Mixin)
+        decl.class.new(
+          name: decl.name, args: decl.args, annotations: decl.annotations, location: location, comment: decl.comment
+        )
+      elsif decl.is_a?(AST::Members::Alias)
+        decl.class.new(
+          new_name: decl.new_name, old_name: decl.old_name, kind: decl.kind, annotations: decl.annotations,
+          location: location, comment: decl.comment
+        )
+      else
+        decl
+      end
+    end
+
     def walk(decls, name_stack = [], &block)
       decls.each do |decl|
         name_stack << extract_name(decl)
@@ -104,29 +141,43 @@ module RBS
 
       target = namespace.empty? ? @decls : extract_members(map[namespace])
 
-      if target
+      unless target
+        @decls << decl # steep:ignore
+        return
+      end
+
+      if decl.is_a?(AST::Members::Var)
+        # AST::Members::Var does not support annotations.
+        index = target.rindex { |m| m.is_a?(decl.class) }
+        if index
+          decl = update(decl, location: target[index].location.dup)
+          target.insert(index + 1, decl)
+        else
+          index = target.find_index { |m| m.is_a?(AST::Members::MethodDefinition) }
+          if index
+            decl = update(decl, location: target[index].location.dup)
+            target.insert(index, decl)
+          else
+            target << decl
+          end
+        end
+      else
         decl.annotations.delete_if { |a| process_annotations([a]) } # steep:ignore
         if after
           index = target.find_index { |m| extract_name(m) == after }
-          if index
-            # steep:ignore:start
-            decl = decl.update(location: target[index].location.dup) if decl.respond_to?(:update) # rubocop:disable Style/RedundantSelfAssignment
-            # steep:ignore:end
-            target.insert(index + 1, decl)
-          end
+          return unless index
+
+          decl = update(decl, location: target[index].location.dup)
+          target.insert(index + 1, decl)
         elsif before
           index = target.find_index { |m| extract_name(m) == before }
-          if index
-            # steep:ignore:start
-            decl = decl.update(location: target[index].location.dup) if decl.respond_to?(:update) # rubocop:disable Style/RedundantSelfAssignment
-            # steep:ignore:end
-            target.insert(index, decl)
-          end
+          return unless index
+
+          decl = update(decl, location: target[index].location.dup)
+          target.insert(index, decl)
         else
           target << decl
         end
-      else
-        @decls << decl # steep:ignore
       end
     end
 

data/sig/rbs/patch.rbs

@@ -26,7 +26,9 @@ module RBS
 
     def extract_members: (t decl) -> (Array[::RBS::AST::Declarations::Class::member] | Array[::RBS::AST::Declarations::Module::member] | nil)
 
-    def walk: (Array[t] decls, ?Array[String] name_stack) { (::RBS::AST::Declarations::t | ::RBS::AST::Members::t, String) -> void } -> void
+    def update: (t decl, location: untyped) -> t
+
+    def walk: (Array[t] decls, ?Array[String] name_stack) { (t, String) -> void } -> void
 
     def decl_map: () -> Hash[String, t]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs-patch
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Koji NAKAMURA