Merge remote-tracking branch 'upstream/master' into update-rdoc

Author: ksss

Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     rbs (4.0.0.dev)
       logger
       rdoc (>= 6.13)
+      prism (>= 1.3.0)
 
 PATH
   remote: test/assets/test-gem
@@ -37,7 +38,7 @@ GEM
     connection_pool (2.5.0)
     csv (3.3.3)
     dbm (1.1.0)
-    diff-lcs (1.6.0)
+    diff-lcs (1.6.1)
     digest (3.2.0)
     drb (2.2.1)
     ffi (1.17.1)
@@ -58,7 +59,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.6)
+    logger (1.7.0)
     marcel (1.0.4)
     memory_profiler (1.1.0)
     mini_portile2 (2.8.8)
@@ -69,16 +70,17 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nkf (0.2.0)
-    nokogiri (1.18.5)
+    nokogiri (1.18.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     ostruct (0.6.1)
     parallel (1.26.3)
-    parser (3.3.7.2)
+    parser (3.3.7.4)
       ast (~> 2.4.1)
       racc
     pathname (0.4.0)
     power_assert (2.0.5)
+    prism (1.4.0)
     pstore (0.2.0)
     psych (4.0.6)
       stringio
@@ -110,22 +112,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.74.0)
+    rubocop (1.75.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.40.0)
-      parser (>= 3.3.1.0)
-    rubocop-on-rbs (1.4.2)
+    rubocop-ast (1.44.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-on-rbs (1.5.0)
+      lint_roller (~> 1.1)
       rbs (~> 3.5)
-      rubocop (~> 1.61)
+      rubocop (>= 1.72.1, < 2.0)
       zlib
     rubocop-rubycw (0.2.2)
       lint_roller (~> 1.1)
@@ -152,13 +156,13 @@ GEM
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 5)
       uri (>= 0.12.0)
-    stringio (3.1.5)
+    stringio (3.1.6)
     strong_json (2.1.2)
     strscan (3.1.2)
     tempfile (0.3.1)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    test-unit (3.6.7)
+    test-unit (3.6.8)
       power_assert
     timeout (0.4.3)
     tzinfo (2.0.6)

Rakefile

@@ -141,16 +141,21 @@ task :stdlib_test => :compile do
 end
 
 task :typecheck_test => :compile do
-  FileList["test/typecheck/*"].each do |test|
-    Dir.chdir(test) do
-      expectations = File.join(test, "steep_expectations.yml")
-      if File.exist?(expectations)
-        sh "steep check --with_expectations"
-      else
-        sh "steep check"
-      end
-    end
-  end
+  puts
+  puts
+  puts "⛔️⛔️⛔️⛔️⛔️⛔️ Skipping type check test because RBS is incompatible with Steep (#{__FILE__}:#{__LINE__})"
+  puts
+  puts
+  # FileList["test/typecheck/*"].each do |test|
+  #   Dir.chdir(test) do
+  #     expectations = File.join(test, "steep_expectations.yml")
+  #     if File.exist?(expectations)
+  #       sh "steep check --with_expectations"
+  #     else
+  #       sh "steep check"
+  #     end
+  #   end
+  # end
 end
 
 task :raap => :compile do

Steepfile

@@ -9,6 +9,7 @@ target :lib do
   )
 
   library "pathname", "json", "logger", "monitor", "tsort", "uri", 'dbm', 'pstore', 'singleton', 'shellwords', 'fileutils', 'find', 'digest', 'prettyprint', 'yaml', "psych", "securerandom"
+  library "prism"
   signature "stdlib/strscan/0/"
   signature "stdlib/optparse/0/"
   signature "stdlib/rdoc/0/"

lib/rbs.rb

@@ -10,6 +10,7 @@
 require "logger"
 require "tsort"
 require "strscan"
+require "prism"
 
 require "rbs/errors"
 require "rbs/buffer"
@@ -24,8 +25,15 @@
 require "rbs/ast/members"
 require "rbs/ast/annotation"
 require "rbs/ast/visitor"
+require "rbs/ast/ruby/helpers/constant_helper"
+require "rbs/ast/ruby/helpers/location_helper"
+require "rbs/ast/ruby/declarations"
+require "rbs/source"
+require "rbs/inline_parser"
 require "rbs/environment"
 require "rbs/environment/use_map"
+require "rbs/environment/class_entry"
+require "rbs/environment/module_entry"
 require "rbs/environment_loader"
 require "rbs/builtin_names"
 require "rbs/definition"

lib/rbs/ast/ruby/declarations.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module RBS
+  module AST
+    module Ruby
+      module Declarations
+        class Base
+          attr_reader :buffer
+
+          include Helpers::ConstantHelper
+          include Helpers::LocationHelper
+
+          def initialize(buffer)
+            @buffer = buffer
+          end
+        end
+
+        class ClassDecl < Base
+          attr_reader :class_name
+
+          attr_reader :members
+
+          attr_reader :node
+
+          def initialize(buffer, name, node)
+            super(buffer)
+            @class_name = name
+            @node = node
+            @members = []
+          end
+
+          def each_decl(&block)
+            return enum_for(:each_decl) unless block
+
+            @members.each do |member|
+              if member.is_a?(Base)
+                yield member
+              end
+            end
+          end
+
+          def super_class = nil
+
+          def type_params = []
+
+          def location
+            rbs_location(node.location)
+          end
+        end
+
+        class ModuleDecl < Base
+          attr_reader :module_name
+
+          attr_reader :members
+
+          attr_reader :node
+
+          def initialize(buffer, name, node)
+            super(buffer)
+            @module_name = name
+            @node = node
+            @members = []
+          end
+
+          def each_decl(&block)
+            return enum_for(:each_decl) unless block
+
+            @members.each do |member|
+              if member.is_a?(Base)
+                yield member
+              end
+            end
+          end
+
+          def type_params = []
+
+          def self_types = []
+
+          def location
+            rbs_location(node.location)
+          end
+        end
+      end
+    end
+  end
+end

lib/rbs/ast/ruby/helpers/constant_helper.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module RBS
+  module AST
+    module Ruby
+      module Helpers
+        module ConstantHelper
+          module_function
+
+          def constant_as_type_name(node)
+            case node
+            when Prism::ConstantPathNode, Prism::ConstantReadNode
+              begin
+                TypeName.parse(node.full_name)
+              rescue Prism::ConstantPathNode::DynamicPartsInConstantPathError
+                nil
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

lib/rbs/ast/ruby/helpers/location_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RBS
+  module AST
+    module Ruby
+      module Helpers
+        module LocationHelper
+          def rbs_location(location)
+            Location.new(buffer, location.start_character_offset, location.end_character_offset)
+          end
+        end
+      end
+    end
+  end
+end

lib/rbs/cli.rb

@@ -175,10 +175,9 @@ def run_ast(args, options)
 
       env = Environment.from_loader(loader).resolve_type_names
 
-      decls = env.declarations.select do |decl|
-        loc = decl.location or raise
+      decls = env.sources.select do |source|
         # @type var name: String
-        name = loc.buffer.name
+        name = source.buffer.name.to_s
 
         patterns.empty? || patterns.any? do |pat|
           case pat
@@ -188,7 +187,7 @@ def run_ast(args, options)
             name.end_with?(pat) || File.fnmatch(pat, name, File::FNM_EXTGLOB)
           end
         end
-      end
+      end.flat_map { _1.declarations }
 
       stdout.print JSON.generate(decls)
       stdout.flush
@@ -913,7 +912,7 @@ def run_parse(args, options)
           Buffer.new(content: file_path.read, name: file_path)
         end
       end
-      bufs << Buffer.new(content: e_code, name: '-e') if e_code
+      bufs << Buffer.new(content: e_code, name: Pathname('-e')) if e_code
 
       bufs.each do |buf|
         RBS.logger.info "Parsing #{buf.name}..."