rbi 0.0.2 → 0.0.3

data/lib/rbi/rewriters/nest_non_public_methods.rb

@@ -12,18 +12,18 @@ module RBI
 
         case node
         when Tree
-          public_group = VisibilityGroup.new(Visibility::Public)
-          protected_group = VisibilityGroup.new(Visibility::Protected)
-          private_group = VisibilityGroup.new(Visibility::Private)
+          public_group = VisibilityGroup.new(Public.new)
+          protected_group = VisibilityGroup.new(Protected.new)
+          private_group = VisibilityGroup.new(Private.new)
 
           node.nodes.dup.each do |child|
             visit(child)
             next unless child.is_a?(Method)
             child.detach
             case child.visibility
-            when Visibility::Protected
+            when Protected
               protected_group << child
-            when Visibility::Private
+            when Private
               private_group << child
             else
               public_group << child

data/lib/rbi/rewriters/sort_nodes.rb

@@ -10,11 +10,11 @@ module RBI
       def visit(node)
         return unless node.is_a?(Tree)
         visit_all(node.nodes)
+        original_order = node.nodes.map.with_index.to_h
         node.nodes.sort! do |a, b|
-          return 0 if a.is_a?(Mixin) || b.is_a?(Mixin)
-
           res = node_rank(a) <=> node_rank(b)
           res = node_name(a) <=> node_name(b) if res == 0
+          res = (original_order[a] || 0) <=> (original_order[b] || 0) if res == 0
           res || 0
         end
       end
@@ -24,29 +24,29 @@ module RBI
       sig { params(node: Node).returns(Integer) }
       def node_rank(node)
         case node
-        when Group                then kind_rank(node.kind)
-        when Include, Extend      then 0
-        when Helper               then 1
-        when TypeMember           then 2
-        when MixesInClassMethods  then 3
-        when TStructField         then 4
-        when TEnumBlock           then 5
+        when Group                then group_rank(node.kind)
+        when Include, Extend      then 10
+        when Helper               then 20
+        when TypeMember           then 30
+        when MixesInClassMethods  then 40
+        when TStructField         then 50
+        when TEnumBlock           then 60
         when Method
           if node.name == "initialize"
-            7
+            71
           elsif !node.is_singleton
-            8
+            72
           else
-            9
+            73
           end
-        when Scope, Const then 9
+        when Scope, Const then 80
         else
-          10
+          100
         end
       end
 
       sig { params(kind: Group::Kind).returns(Integer) }
-      def kind_rank(kind)
+      def group_rank(kind)
         case kind
         when Group::Kind::Mixins              then 0
         when Group::Kind::Helpers             then 1
@@ -65,7 +65,7 @@ module RBI
       sig { params(node: Node).returns(T.nilable(String)) }
       def node_name(node)
         case node
-        when Module, Class, Const, Method, Helper, TStructField
+        when Module, Class, Struct, Const, Method, Helper, TStructField
           node.name
         end
       end

data/lib/rbi/version.rb

@@ -3,5 +3,5 @@
 # frozen_string_literal: true
 
 module RBI
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rbi.rb

@@ -12,6 +12,7 @@ require "rbi/loc"
 require "rbi/model"
 require "rbi/visitor"
 require "rbi/index"
+require "rbi/rewriters/add_sig_templates"
 require "rbi/rewriters/merge_trees"
 require "rbi/rewriters/nest_singleton_methods"
 require "rbi/rewriters/nest_non_public_methods"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -82,7 +82,7 @@ dependencies:
         version: '0'
 description: 
 email:
-- alexandre.terrasa@shopify.com
+- ruby@shopify.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,6 +96,7 @@ files:
 - lib/rbi/model.rb
 - lib/rbi/parser.rb
 - lib/rbi/printer.rb
+- lib/rbi/rewriters/add_sig_templates.rb
 - lib/rbi/rewriters/group_nodes.rb
 - lib/rbi/rewriters/merge_trees.rb
 - lib/rbi/rewriters/nest_non_public_methods.rb