rbs 1.2.0 → 1.2.1

data/lib/rbs/parser.y

@@ -608,7 +608,6 @@ rule
   method_member:
       annotations attributes overload kDEF method_kind def_name method_types {
         location = val[3].location + val[6].last.location
-        children = {}
 
         required_children = { keyword: val[3].location, name: val[5].location }
         optional_children = { kind: nil, overload: nil }

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/rbs.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) }
   end
   spec.files << "lib/rbs/parser.rb"
   spec.bindir        = "exe"

data/steep/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -9,36 +9,36 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.2)
     concurrent-ruby (1.1.8)
-    ffi (1.15.0)
+    ffi (1.15.1)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    language_server-protocol (3.16.0.0)
+    language_server-protocol (3.16.0.1)
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.14.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.1.1)
-    steep (0.43.1)
+    rbs (1.2.0)
+    steep (0.44.1)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       parallel (>= 1.0.0)
       parser (>= 2.7)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (~> 1.1.0)
+      rbs (>= 1.2.0)
       terminal-table (>= 2, < 4)
-    terminal-table (3.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.1)
+      unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -48,4 +48,4 @@ DEPENDENCIES
   steep
 
 BUNDLED WITH
-   2.2.3
+   2.2.15

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies: []
 description: RBS is the language for type signatures for Ruby and standard library
   definitions.
@@ -29,15 +29,6 @@ files:
 - README.md
 - Rakefile
 - Steepfile
-- bin/annotate-with-rdoc
-- bin/console
-- bin/query-rdoc
-- bin/rbs-prof
-- bin/run_in_md.rb
-- bin/setup
-- bin/sort
-- bin/steep
-- bin/test_runner.rb
 - core/array.rbs
 - core/basic_object.rbs
 - core/binding.rbs
@@ -290,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Type signature for Ruby.

data/bin/annotate-with-rdoc

@@ -1,153 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "rbs"
-require "rdoc"
-
-def store_for_class(name, stores:)
-  stores.find do |store|
-    store.find_class_named(name) || store.find_module_named(name)
-  end
-end
-
-def format_comment(comment)
-  out = RDoc::Markup::Document.new
-  out << comment
-  formatter = RDoc::Markup::ToMarkdown.new
-  out.accept(formatter).lines.map(&:rstrip).join("\n")
-end
-
-def comment_for_constant(decl, stores:)
-  class_name = decl.name.namespace.to_type_name.to_s
-  klass = store_for_class(class_name, stores: stores)&.yield_self {|store|
-    store.find_class_named(class_name) || store.find_module_named(class_name)
-  }
-
-  if klass
-    constant = klass.constants.find do |const|
-      const.name == decl.name.name.to_s
-    end
-
-    if constant&.documented?
-      string = format_comment(constant.comment)
-      RBS::AST::Comment.new(location: nil, string: string)
-    end
-  end
-end
-
-def comment_for_class(decl, stores:)
-  name = decl.name.to_s
-  klass = store_for_class(name, stores: stores)&.yield_self {|store|
-    store.find_class_named(name) || store.find_module_named(name)
-  }
-
-  if klass&.documented?
-    string = format_comment(klass.comment)
-    RBS::AST::Comment.new(location: nil, string: string)
-  end
-end
-
-def comment_for_method(klass, method, stores:)
-  method = store_for_class(klass, stores: stores)&.load_method(klass, method)
-
-  if method&.documented?
-    out = RDoc::Markup::Document.new
-
-    out << method.comment
-
-    if method.arglists
-      out << RDoc::Markup::Heading.new(1, "arglists 💪👽🚨 << Delete this section")
-      arglists = method.arglists.chomp.split("\n").map {|line| line + "\n" }
-      out << RDoc::Markup::Verbatim.new(*arglists)
-    end
-
-    string = out.accept(RDoc::Markup::ToMarkdown.new)
-    RBS::AST::Comment.new(location: nil, string: string)
-  end
-
-rescue RDoc::Store::MissingFileError
-  puts "  👺 No document found for #{klass}#{method}"
-  nil
-end
-
-if ARGV.empty?
-  puts 'annotate-with-rdoc [RBS files...]'
-  exit
-end
-
-def print_members(stores, klass_name, members)
-  members.each do |member|
-    case member
-    when RBS::AST::Members::MethodDefinition
-      puts "    Processing #{member.name}..."
-
-      method_name = case
-                    when member.instance?
-                      "##{member.name}"
-                    when member.singleton?
-                      "::#{member.name}"
-                    end
-
-      comment = comment_for_method(klass_name, method_name, stores: stores)
-
-      unless comment
-        if member.instance? && member.name == :initialize
-          comment = comment_for_method(klass_name, '::new', stores: stores)
-        end
-      end
-
-      member.instance_variable_set(:@comment, comment)
-    when RBS::AST::Members::AttrReader, RBS::AST::Members::AttrAccessor, RBS::AST::Members::AttrWriter
-      puts "    👻 Attributes not supported (#{klass_name})"
-    when RBS::AST::Members::Alias
-      puts "    Processing #{member.new_name}(alias)..."
-      prefix = case
-               when member.instance?
-                 "#"
-               when member.singleton?
-                 "."
-               end
-      name = "#{prefix}#{member.new_name}"
-
-      comment = comment_for_method(klass_name, name, stores: stores)
-      member.instance_variable_set(:@comment, comment)
-    end
-  end
-end
-
-stores = []
-RDoc::RI::Paths.each true, true, false, false do |path, type|
-  puts "Loading store from #{path}..."
-  store = RDoc::RI::Store.new(path, type)
-  store.load_all
-  stores << store
-end
-
-ARGV.map {|f| Pathname(f) }.each do |path|
-  puts "Opening #{path}..."
-
-  buffer = RBS::Buffer.new(name: path, content: path.read)
-  sigs = RBS::Parser.parse_signature(buffer)
-
-  sigs.each do |decl|
-    case decl
-    when RBS::AST::Declarations::Constant
-      puts "  Importing documentation for #{decl.name}..."
-      comment = comment_for_constant(decl, stores: stores)
-      decl.instance_variable_set(:@comment, comment)
-    when RBS::AST::Declarations::Class, RBS::AST::Declarations::Module
-      puts "  Importing documentation for #{decl.name}..."
-      comment = comment_for_class(decl, stores: stores)
-      decl.instance_variable_set(:@comment, comment)
-
-      print_members stores, decl.name.to_s, decl.members
-    end
-  end
-
-  puts "Writing #{path}..."
-  path.open('w') do |out|
-    writer = RBS::Writer.new(out: out)
-    writer.write sigs
-  end
-end
-

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "rbs"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/query-rdoc

@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-
-require "rdoc"
-
-def store_for_class(name, stores:)
-  stores.find do |store|
-    store.find_class_named(name) || store.find_module_named(name)
-  end
-end
-
-def format_comment(comment)
-  out = RDoc::Markup::Document.new
-  out << comment
-  formatter = RDoc::Markup::ToMarkdown.new
-  out.accept(formatter)
-end
-
-def comment_for_constant(name, stores:)
-  *class_components, const_name = name.split(/::/)
-  class_name = class_components.join("::")
-
-  klass = store_for_class(class_name, stores: stores)&.yield_self {|store|
-    store.find_class_named(class_name) || store.find_module_named(class_name)
-  }
-
-  constant = klass.constants.find do |const|
-    const.name == const_name
-  end
-
-  if constant&.documented?
-    format_comment(constant.comment)
-  end
-end
-
-def comment_for_class(class_name, stores:)
-  klass = store_for_class(class_name, stores: stores)&.yield_self {|store|
-    store.find_class_named(class_name) || store.find_module_named(class_name)
-  }
-
-  if klass&.documented?
-    format_comment(klass.comment)
-  end
-end
-
-def comment_for_method(klass, method, stores:)
-  method = store_for_class(klass, stores: stores)&.load_method(klass, method)
-
-  if method&.documented?
-    out = RDoc::Markup::Document.new
-
-    out << method.comment
-
-    if method.arglists
-      out << RDoc::Markup::Heading.new(1, "arglists 💪👽🚨 << Delete this section")
-      arglists = method.arglists.chomp.split("\n").map {|line| line + "\n" }
-      out << RDoc::Markup::Verbatim.new(*arglists)
-    end
-
-    out.accept(RDoc::Markup::ToMarkdown.new)
-  end
-rescue RDoc::Store::MissingFileError
-  nil
-end
-
-if ARGV.empty?
-  puts 'query-rdoc [subject]'
-  puts "  subject ::= ClassName         (class, module, or constant)"
-  puts "            | ClassName.method  (singleton method)"
-  puts "            | ClassName#method  (instance method)"
-  exit
-end
-
-stores = []
-RDoc::RI::Paths.each true, true, false, false do |path, type|
-  STDERR.puts "Loading store from #{path}..."
-  store = RDoc::RI::Store.new(path, type)
-  store.load_all
-  stores << store
-end
-
-subject = ARGV[0]
-
-case
-when match = subject.match(/(?<constant_name>[^#]+)#(?<method_name>.+)/)
-  STDERR.puts "Finding instance method #{match[:constant_name]} # #{match[:method_name]} ..."
-  comment = comment_for_method(match[:constant_name], "##{match[:method_name]}", stores: stores)
-when match = subject.match(/(?<constant_name>[^.]+)\.(?<method_name>.+)/)
-  STDERR.puts "Finding singleton method #{match[:constant_name]} . #{match[:method_name]} ..."
-  comment = comment_for_method(match[:constant_name], "::#{match[:method_name]}", stores: stores)
-else
-  STDERR.puts "Finding class/module/constant #{subject} ..."
-  comment = comment_for_class(subject, stores: stores) || comment_for_constant(subject, stores: stores)
-end
-
-if comment
-  STDERR.puts "Printing document..."
-  comment.each_line do |line|
-    puts "# #{line}"
-  end
-else
-  STDERR.puts "Nothing to print; failed to query the document..."
-  exit 1
-end

data/bin/rbs-prof

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-require "stackprof"
-
-out = ENV["RBS_STACKPROF_OUT"] || 'tmp/stackprof-cpu-rbs.dump'
-
-StackProf.run(mode: :cpu, out: out, raw: true) do
-  load File.join(__dir__, "../exe/rbs")
-end

data/bin/run_in_md.rb

@@ -1,49 +0,0 @@
-require "tmpdir"
-require "shellwords"
-
-ARGV.each do |path|
-  puts "~~~~~~~ Checking #{path} ~~~~~~"
-  content = File.read(path)
-
-  snippets = []
-  lines = []
-  content.lines.each.with_index do |line, index|
-    case line
-    when /run-start:/
-      lines = [[line, index+1]]
-    when /run-end/
-      lines << [line, index+1]
-      snippets << lines
-      lines = []
-    else
-      lines << [line, index+1]
-    end
-  end
-
-  snippets.each do |lines|
-    puts ">>> Code detected: "
-    hd, _, *code_lines, _, _ = lines
-
-    head = hd[0]
-    head.gsub!(/^<!-- +/, "").gsub!(/ +-->$/, "")
-    _,name,command = head.split(/:/)
-
-    puts "# command=#{Shellwords.split(command).inspect}"
-    puts "# name=#{name}"
-    puts code_lines.map {|line, i| "#{"%4d" % i}  #{line}" }.join
-
-    code = code_lines.map(&:first).join
-
-    puts ">>> Running..."
-    Dir.mktmpdir do |dir|
-      File.write(File.join(dir, name), code)
-      pid = spawn({ "BUNDLE_GEMFILE" => File.join(__dir__, "../Gemfile") },
-                  *Shellwords.split(command),
-                  chdir: dir)
-
-      _, status = Process.waitpid2(pid)
-
-      status.success? or raise "Failed to execute code: #{code_lines.join}"
-    end
-  end
-end