rbi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a2cb2f6b2287a3faed50161d70e0c863892c88c6eef5a3c798ccf8e16e0c441
-  data.tar.gz: e851f3b85aa62534a3a1c867085add40aa7669df3b003f17e62eb81ce36c58ed
+  metadata.gz: 0ab48b069bf534228e48c5c76caeb71daca4dd905a00cbdbfdd0ce7ce9374987
+  data.tar.gz: f301b0ce6eff170542931c88095d78ff60ffd5e20720eb04461bdbb3eeb98a8d
 SHA512:
-  metadata.gz: b566ecfc9c01ebf7524efb055302e3da780caf0e0cc3ab36bdca798ff8390cce5247bce1318c5373c8339fede498f3bc87ffd5071ace658880c0b3724a9f1d15
-  data.tar.gz: d95c6b6ea53cf84c348b2426b9bf10ad8213282f48ec9364cb9b1512aef9dd4c896d18c09c1dac79abe40f136194ab550571ac141e960eab61e4026bdbf3c578
+  metadata.gz: d2f844f5e4d6ec819125d1b91bd40e9af9821f32a4ca76036ccabe5beac985dc566d0cc8d9946ed1488c78115d3a64d798833d13256d829c686df1668353e314
+  data.tar.gz: a1bb0eabd7e81e3563e20bfb35eb0bf2044d152c0019ed78018327d6b60c4897b89a94f4fd741f077e7cb5186a82fbd7cf3c08b3340d2f1caa913b2d773adddc

data/lib/rbi/loc.rb

@@ -15,7 +15,7 @@ module RBI
           begin_line: yarp_location.start_line,
           end_line: yarp_location.end_line,
           begin_column: yarp_location.start_column,
-          end_column: yarp_location.end_column + 1, # TODO: Why is this off by one?
+          end_column: yarp_location.end_column,
         )
       end
     end
@@ -45,7 +45,11 @@ module RBI
 
     sig { returns(String) }
     def to_s
-      "#{file}:#{begin_line}:#{begin_column}-#{end_line}:#{end_column}"
+      if end_line && end_column
+        "#{file}:#{begin_line}:#{begin_column}-#{end_line}:#{end_column}"
+      else
+        "#{file}:#{begin_line}:#{begin_column}"
+      end
     end
 
     sig { returns(T.nilable(String)) }

data/lib/rbi/model.rb

@@ -353,7 +353,7 @@ module RBI
     abstract!
 
     sig { returns(T::Array[Symbol]) }
-    attr_accessor :names
+    attr_reader :names
 
     sig { returns(Visibility) }
     attr_accessor :visibility
@@ -774,7 +774,7 @@ module RBI
     abstract!
 
     sig { returns(T::Array[String]) }
-    attr_accessor :names
+    attr_reader :names
 
     sig do
       params(

data/lib/rbi/parser.rb

@@ -95,7 +95,10 @@ module RBI
     def parse(source, file:)
       result = YARP.parse(source)
       unless result.success?
-        raise ParseError.new(result.errors.map(&:message).join(" "), Loc.from_yarp(file, result.errors.first.location))
+        message = result.errors.map { |e| "#{e.message}." }.join(" ")
+        error = result.errors.first
+        location = Loc.new(file: file, begin_line: error.location.start_line, begin_column: error.location.start_column)
+        raise ParseError.new(message, location)
       end
 
       visitor = TreeBuilder.new(source, comments: result.comments, file: file)
@@ -215,7 +218,7 @@ module RBI
           TypeMember.new(
             case node
             when YARP::ConstantWriteNode
-              node.name
+              node.name.to_s
             when YARP::ConstantPathWriteNode
               node_string!(node.target)
             end,
@@ -227,7 +230,7 @@ module RBI
           Const.new(
             case node
             when YARP::ConstantWriteNode
-              node.name
+              node.name.to_s
             when YARP::ConstantPathWriteNode
               node_string!(node.target)
             end,
@@ -241,7 +244,7 @@ module RBI
       sig { override.params(node: YARP::DefNode).void }
       def visit_def_node(node)
         current_scope << Method.new(
-          node.name,
+          node.name.to_s,
           params: parse_params(node.parameters),
           sigs: current_sigs,
           loc: node_loc(node),
@@ -336,7 +339,7 @@ module RBI
           return unless body.is_a?(YARP::StatementsNode)
 
           current_scope << TEnumBlock.new(
-            body.body.map { |stmt| T.cast(stmt, YARP::ConstantWriteNode).name },
+            body.body.map { |stmt| T.cast(stmt, YARP::ConstantWriteNode).name.to_s },
             loc: node_loc(node),
             comments: node_comments(node),
           )
@@ -549,7 +552,7 @@ module RBI
         rest = node.rest
         if rest.is_a?(YARP::RestParameterNode)
           params << RestParam.new(
-            rest.name || "*args",
+            rest.name&.to_s || "*args",
             loc: node_loc(rest),
             comments: node_comments(rest),
           )
@@ -561,14 +564,14 @@ module RBI
           value = param.value
           params << if value
             KwOptParam.new(
-              param.name.delete_suffix(":"),
+              param.name.to_s.delete_suffix(":"),
               node_string!(value),
               loc: node_loc(param),
               comments: node_comments(param),
             )
           else
             KwParam.new(
-              param.name.delete_suffix(":"),
+              param.name.to_s.delete_suffix(":"),
               loc: node_loc(param),
               comments: node_comments(param),
             )
@@ -578,7 +581,7 @@ module RBI
         rest_kw = node.keyword_rest
         if rest_kw.is_a?(YARP::KeywordRestParameterNode)
           params << KwRestParam.new(
-            rest_kw.name || "**kwargs",
+            rest_kw.name&.to_s || "**kwargs",
             loc: node_loc(rest_kw),
             comments: node_comments(rest_kw),
           )
@@ -587,7 +590,7 @@ module RBI
         block = node.block
         if block.is_a?(YARP::BlockParameterNode)
           params << BlockParam.new(
-            block.name || "&block",
+            block.name&.to_s || "&block",
             loc: node_loc(block),
             comments: node_comments(block),
           )
@@ -642,7 +645,7 @@ module RBI
 
         name = case node
         when YARP::ConstantWriteNode
-          node.name
+          node.name.to_s
         when YARP::ConstantPathWriteNode
           node_string!(node.target)
         end
@@ -744,7 +747,7 @@ module RBI
       extend T::Sig
 
       sig { returns(Sig) }
-      attr_accessor :current
+      attr_reader :current
 
       sig { params(content: String, file: String).void }
       def initialize(content, file:)

data/lib/rbi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 description: 
 email:
 - ruby@shopify.com