rbi 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad10c5d34005d6a802652c77c317986852dedeb6fb32203f04cb54af2e3390a5
-  data.tar.gz: d502093f1ea3f802c525fa7c9c5065f5b83c164031a1a9882e783200cb58c06f
+  metadata.gz: fb13c49bd19a95d439f7249770add05929979892daa3ba9c55de8241a596a8d2
+  data.tar.gz: bc772396cd7997b9443782775854993cb9e4b0d1241415020c258aa8f49186b2
 SHA512:
-  metadata.gz: 5e551429e890318d60b66b3331d001e1e9b0489746fbf218f5f347a6e2647e168c76eddcf5e4628e3128d7cda28d77a29bc872bd696cdfb347b78e98a839a2ba
-  data.tar.gz: 60ec408e5cfc4b94157b6f8028c0b699ebf5e01632dc691adeff7f22c245a45abbe44d400533ddf526b32d8e9de9b4fbfa1f1e06a7ce450cf77911754633579e
+  metadata.gz: 9990c9fd5fa2bc0925f06ce07f02079165f431e9535874d0204b0e2afbc6ad1919578e3ecd13a33b69ef575ec84911fadb34d3a71df917437fd46182bb07aa6e
+  data.tar.gz: 2818b3db38a03e58eb8bd6dd160ca50fac237242192620a6910dd73c451a3ee90e5dd483502e721870329724f0b4237899225d3c4e5f429b37abd667e0183c87

data/lib/rbi/parser.rb

@@ -1,7 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "unparser"
+require "parser"
 
 module RBI
   class ParseError < StandardError
@@ -27,6 +27,12 @@ module RBI
     ::Parser::Builders::Default.emit_index                = true
     ::Parser::Builders::Default.emit_arg_inside_procarg0  = true
 
+    sig { void }
+    def initialize
+      # Delay load unparser and only if it has not been loaded already.
+      require "unparser" unless defined?(::Unparser)
+    end
+
     sig { params(string: String).returns(Tree) }
     def self.parse_string(string)
       Parser.new.parse_string(string)

data/lib/rbi/printer.rb

@@ -97,7 +97,7 @@ module RBI
         v.visit_all(comments)
       end
 
-      unless root.empty?
+      unless root.empty? && root.comments.empty?
         v.printn if strictness || !comments.empty?
         v.visit(root)
       end
@@ -156,10 +156,18 @@ module RBI
 
     sig { override.params(v: Printer).void }
     def accept_printer(v)
-      text = self.text.strip
-      v.printt("#")
-      v.print(" #{text}") unless text.empty?
-      v.printn
+      lines = text.lines
+
+      if lines.empty?
+        v.printl("#")
+      end
+
+      lines.each do |line|
+        text = line.strip
+        v.printt("#")
+        v.print(" #{text}") unless text.empty?
+        v.printn
+      end
     end
   end
 
@@ -366,13 +374,14 @@ module RBI
             v.printt
             v.visit(param)
             v.print(",") if pindex < params.size - 1
-            param.comments.each_with_index do |comment, cindex|
+
+            param.comments_lines.each_with_index do |comment, cindex|
               if cindex > 0
                 param.print_comment_leading_space(v, last: pindex == params.size - 1)
               else
                 v.print(" ")
               end
-              v.print("# #{comment.text.strip}")
+              v.print("# #{comment}")
             end
             v.printn
           end
@@ -410,6 +419,11 @@ module RBI
       v.print(" " * (name.size + 1))
       v.print(" ") unless last
     end
+
+    sig { returns(T::Array[String]) }
+    def comments_lines
+      comments.flat_map { |comment| comment.text.lines.map(&:strip) }
+    end
   end
 
   class OptParam
@@ -576,13 +590,13 @@ module RBI
             v.printt
             v.visit(param)
             v.print(",") if pindex < params.size - 1
-            param.comments.each_with_index do |comment, cindex|
+            param.comments_lines.each_with_index do |comment, cindex|
               if cindex == 0
                 v.print(" ")
               else
                 param.print_comment_leading_space(v, last: pindex == params.size - 1)
               end
-              v.print("# #{comment.text.strip}")
+              v.print("# #{comment}")
             end
             v.printn
           end
@@ -633,6 +647,11 @@ module RBI
       v.print(" " * (name.size + type.size + 3))
       v.print(" ") unless last
     end
+
+    sig { returns(T::Array[String]) }
+    def comments_lines
+      comments.flat_map { |comment| comment.text.lines.map(&:strip) }
+    end
   end
 
   class TStructField

data/lib/rbi/version.rb

@@ -1,7 +1,6 @@
 # typed: true
-# typed: false
 # frozen_string_literal: true
 
 module RBI
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast