rbi 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 570f1035fa8bb56861eabd49590fbf2374f428c053f0fc189e27958feedf0c4b
-  data.tar.gz: 0dbb944e45b675851de18089c22a23c4c527f03dfca281426db8fb3cff94372e
+  metadata.gz: bda85d642d83b25177d24ab2bc789631861302ebc31c862ea40bcd56b034ec68
+  data.tar.gz: 23071846fc0c1edaa681ab3cbb4c2663fc27a00666ef890fcdb404546128307d
 SHA512:
-  metadata.gz: 45e5f53144cc46f1cd2c86b55c1d490ab5bd4b2d3bf5e593b3f6405e6b4583645c13130cdc6762f0e5eb18f5f74bfa1dfe990d108f6db21da394ba4d30a7b810
-  data.tar.gz: 603617b73fc3e4e862f897bf0b10b165efd4ac608c07b71e3ef43e1190e4d1fff2f26484a65d8f4d9e5965eafa99435d02bf668fef756abe5a24f1fa3e41f52b
+  metadata.gz: f7678a81e3e9e66a858c72c5093ebc0fdc0bec4d0e4d08ac662341959f1e82dfa5ef5898a5c166442c718907faef2ad826e979dd7dd98a48c5496969209ffdc8
+  data.tar.gz: c4616ce80159a71fea63a23ce90d6eaf7527fabda7200224ea213aedf0926610a974d1a428c569d0f2bfe0b3efa84fd73b7476bd29312189dd3df2e3ef321c56

data/Gemfile

@@ -14,5 +14,5 @@ group(:development, :test) do
   gem("rubocop-shopify", require: false)
   gem("rubocop-sorbet", require: false)
   gem("sorbet", ">= 0.5.9204", require: false)
-  gem("tapioca", "0.5.2", require: false)
+  gem("tapioca", require: false)
 end

data/lib/rbi/parser.rb

@@ -178,6 +178,7 @@ module RBI
       @scopes_stack = T.let([@tree], T::Array[Tree])
       @last_node = T.let(nil, T.nilable(::AST::Node))
       @last_sigs = T.let([], T::Array[RBI::Sig])
+      @last_sigs_comments = T.let([], T::Array[Comment])
 
       separate_header_comments
     end
@@ -208,11 +209,12 @@ module RBI
         node = parse_send(node)
         current_scope << node if node
       when :block
-        node = parse_block(node)
-        if node.is_a?(Sig)
-          @last_sigs << node
-        elsif node
-          current_scope << node
+        rbi_node = parse_block(node)
+        if rbi_node.is_a?(Sig)
+          @last_sigs << rbi_node
+          @last_sigs_comments.concat(node_comments(node))
+        elsif rbi_node
+          current_scope << rbi_node
         end
       else
         visit_all(node.children)
@@ -268,7 +270,7 @@ module RBI
           params: node.children[1].children.map { |child| parse_param(child) },
           sigs: current_sigs,
           loc: loc,
-          comments: node_comments(node)
+          comments: current_sigs_comments + node_comments(node)
         )
       when :defs
         Method.new(
@@ -277,7 +279,7 @@ module RBI
           is_singleton: true,
           sigs: current_sigs,
           loc: loc,
-          comments: node_comments(node)
+          comments: current_sigs_comments + node_comments(node)
         )
       else
         raise ParseError.new("Unsupported def node type `#{node.type}`", loc)
@@ -324,13 +326,13 @@ module RBI
       case method_name
       when :attr_reader
         symbols = node.children[2..-1].map { |child| child.children[0] }
-        AttrReader.new(*symbols, sigs: current_sigs, loc: loc, comments: comments)
+        AttrReader.new(*symbols, sigs: current_sigs, loc: loc, comments: current_sigs_comments + comments)
       when :attr_writer
         symbols = node.children[2..-1].map { |child| child.children[0] }
-        AttrWriter.new(*symbols, sigs: current_sigs, loc: loc, comments: comments)
+        AttrWriter.new(*symbols, sigs: current_sigs, loc: loc, comments: current_sigs_comments + comments)
       when :attr_accessor
         symbols = node.children[2..-1].map { |child| child.children[0] }
-        AttrAccessor.new(*symbols, sigs: current_sigs, loc: loc, comments: comments)
+        AttrAccessor.new(*symbols, sigs: current_sigs, loc: loc, comments: current_sigs_comments + comments)
       when :include
         names = node.children[2..-1].map { |child| parse_expr(child) }
         Include.new(*names, loc: loc, comments: comments)
@@ -533,6 +535,13 @@ module RBI
       sigs
     end
 
+    sig { returns(T::Array[Comment]) }
+    def current_sigs_comments
+      comments = @last_sigs_comments.dup
+      @last_sigs_comments.clear
+      comments
+    end
+
     sig { void }
     def assoc_dangling_comments
       last_line = T.let(nil, T.nilable(Integer))

data/lib/rbi/rewriters/sort_nodes.rb

@@ -81,10 +81,12 @@ module RBI
       sig { params(node: Node).returns(T.nilable(String)) }
       def node_name(node)
         case node
-        when Module, Class, Struct, Const, Method, Helper, TStructField, RequiresAncestor
+        when Module, Class, Struct, Const, Method, Helper, RequiresAncestor
           node.name
         when Attr
           node.names.first.to_s
+        when TStructField, Mixin
+          nil # we never want to sort these nodes by their name
         end
       end
 

data/lib/rbi/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module RBI
-  VERSION = "0.0.14"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -107,14 +107,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: RBI generation framework