rbs 2.8.1 → 3.0.0.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7260861dc5546d0f4673c4cbff61a97b222553fbedb0f0cf7b45fffa7e70fc29
-  data.tar.gz: 3a354b926470d26670ac209c3190f0a934289126b4ed484180eebf81d9c9a076
+  metadata.gz: 7a07433a652ee9bdc6b90162eb974d289fafabed916044ffa8e83b78063b8c0b
+  data.tar.gz: 1339eae3040ab4714dd241497bbc20d643ae5eaef62b03a02138806ecf4737c5
 SHA512:
-  metadata.gz: '07842180f916e2726333424a6263e05f8cfff54a1165c144fd6dab1137ab26a129ca0a5d22531483868a2cf1b3008bc8e617893f98de4d9433bb0b482fc910ce'
-  data.tar.gz: 861ac0661a1784d29c2bff49683d4d679d84bf788f20bf899a5c6596d341437a38dc1eb8072f027c44f199f17b0e056203db097056306c6363ac5076072045a8
+  metadata.gz: 8b414da0d750aefbfdaadcd0a309d2ee4157969112f6806149597fd402b4ca43aaae5cbf162e14f7bfe0a21e3369fad2b94a54f5d3610e15362afd2bd9d83d8f
+  data.tar.gz: 884514e8cf52edbd3e17b6c214cd113b58a6107b4a00f73f826d471521d883997a3bee6c3f0c3e7a2770e23468e6a964878504f1a5cf7de9a6ab2d5ec66fbb4e

data/.github/workflows/comments.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     runs-on: "ubuntu-latest"
     container:
-      image: rubylang/ruby:3.1-focal
+      image: rubylang/ruby:3.1-dev-focal
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies

data/.github/workflows/ruby.yml

@@ -6,6 +6,9 @@ on:
       - master
   pull_request: {}
 
+env:
+  LANG: 'C.UTF-8'
+
 jobs:
   test:
     runs-on: "ubuntu-latest"
@@ -13,9 +16,9 @@ jobs:
       matrix:
         container_tag:
           - master-nightly-focal
-          - 3.1-focal
-          - 3.0-focal
-          - 2.7-bionic
+          - 3.1-dev-focal
+          - 3.0-dev-focal
+          - 2.7-dev-bionic
           - 2.6-bionic
         job:
           - test
@@ -28,16 +31,16 @@ jobs:
             job: confirm_lexer
           - container_tag: 2.6-bionic
             job: stdlib_test
-          - container_tag: 2.7-bionic
+          - container_tag: 2.7-dev-bionic
             job: stdlib_test
-          - container_tag: 3.0-focal
+          - container_tag: 3.0-dev-focal
             job: stdlib_test
     container:
       image: rubylang/ruby:${{ matrix.container_tag }}
     steps:
       - uses: actions/checkout@v3
       - name: Set working directory as safe
-        run: /usr/bin/git config --global --add safe.directory $(pwd)
+        run: git config --global --add safe.directory $(pwd)
       - name: Install dependencies
         run: |
           apt-get update

data/Gemfile

@@ -18,7 +18,7 @@ gem "dbm"
 gem 'digest'
 gem 'tempfile'
 gem "prime"
-gem "rdoc"
+gem "rdoc", "< 6.5.0"
 
 # Test gems
 gem "rbs-amber", path: "test/assets/test-gem"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (2.8.1)
+    rbs (3.0.0.dev.1)
 
 PATH
   remote: test/assets/test-gem
@@ -19,35 +19,35 @@ GEM
       debase-ruby_core_source (>= 0.10.12)
     debase-ruby_core_source (0.10.16)
     diff-lcs (1.5.0)
-    digest (3.1.0)
+    digest (3.1.1)
     forwardable (1.3.2)
     goodcheck (3.1.0)
       marcel (>= 1.0, < 2.0)
       psych (>= 3.1, < 5.0)
       rainbow (>= 3.0, < 4.0)
       strong_json (>= 1.1, < 2.2)
-    json (2.6.2)
+    json (2.6.3)
     json-schema (3.0.0)
       addressable (>= 2.8)
     marcel (1.0.2)
-    minitest (5.16.3)
+    minitest (5.17.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
-    power_assert (2.0.1)
+    power_assert (2.0.2)
     prime (0.1.2)
       forwardable
       singleton
-    psych (4.0.4)
+    psych (4.0.6)
       stringio
     public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    rake-compiler (1.2.0)
+    rake-compiler (1.2.1)
       rake
     rdoc (6.4.0)
       psych (>= 4.0.0)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -62,7 +62,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.39.0)
+    rubocop (1.40.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -72,7 +72,7 @@ GEM
       rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
+    rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
     rubocop-rubycw (0.1.6)
       rubocop (~> 1.0)
@@ -80,11 +80,11 @@ GEM
       rake (>= 0.8.1)
     ruby-progressbar (1.11.0)
     singleton (0.1.1)
-    stackprof (0.2.22)
-    stringio (3.0.2)
+    stackprof (0.2.23)
+    stringio (3.0.4)
     strong_json (2.1.2)
-    tempfile (0.1.2)
-    test-unit (3.5.5)
+    tempfile (0.1.3)
+    test-unit (3.5.7)
       power_assert
     unicode-display_width (2.3.0)
 
@@ -105,7 +105,7 @@ DEPENDENCIES
   rake-compiler
   rbs!
   rbs-amber!
-  rdoc
+  rdoc (< 6.5.0)
   rspec
   rubocop
   rubocop-rubycw

data/ext/rbs_extension/constants.c

@@ -30,6 +30,7 @@ VALUE RBS_AST_Members_Extend;
 VALUE RBS_AST_Members_Include;
 VALUE RBS_AST_Members_InstanceVariable;
 VALUE RBS_AST_Members_MethodDefinition;
+VALUE RBS_AST_Members_MethodDefinition_Overload;
 VALUE RBS_AST_Members_Prepend;
 VALUE RBS_AST_Members_Private;
 VALUE RBS_AST_Members_Public;
@@ -99,6 +100,7 @@ void rbs__init_constants(void) {
   RBS_AST_Members_Include = rb_const_get(RBS_AST_Members, rb_intern("Include"));
   RBS_AST_Members_InstanceVariable = rb_const_get(RBS_AST_Members, rb_intern("InstanceVariable"));
   RBS_AST_Members_MethodDefinition = rb_const_get(RBS_AST_Members, rb_intern("MethodDefinition"));
+  RBS_AST_Members_MethodDefinition_Overload = rb_const_get(RBS_AST_Members_MethodDefinition, rb_intern("Overload"));
   RBS_AST_Members_Prepend = rb_const_get(RBS_AST_Members, rb_intern("Prepend"));
   RBS_AST_Members_Private = rb_const_get(RBS_AST_Members, rb_intern("Private"));
   RBS_AST_Members_Public = rb_const_get(RBS_AST_Members, rb_intern("Public"));

data/ext/rbs_extension/constants.h

@@ -29,6 +29,7 @@ extern VALUE RBS_AST_Members_Extend;
 extern VALUE RBS_AST_Members_Include;
 extern VALUE RBS_AST_Members_InstanceVariable;
 extern VALUE RBS_AST_Members_MethodDefinition;
+extern VALUE RBS_AST_Members_MethodDefinition_Overload;
 extern VALUE RBS_AST_Members_Prepend;
 extern VALUE RBS_AST_Members_Private;
 extern VALUE RBS_AST_Members_Public;

data/ext/rbs_extension/parser.c

@@ -1485,7 +1485,7 @@ VALUE parse_member_def(parserstate *state, bool instance_only, bool accept_overl
   range keyword_range;
   range name_range;
   range kind_range;
-  range overload_range = NULL_RANGE;
+  range overloading_range = NULL_RANGE;
 
   VALUE visibility;
 
@@ -1524,8 +1524,8 @@ VALUE parse_member_def(parserstate *state, bool instance_only, bool accept_overl
   }
 
   VALUE name = parse_method_name(state, &name_range);
-  VALUE method_types = rb_ary_new();
-  VALUE overload = Qfalse;
+  VALUE overloads = rb_ary_new();
+  VALUE overloading = Qfalse;
 
   if (state->next_token.type == pDOT && RB_SYM2ID(name) == rb_intern("self?")) {
     raise_syntax_error(
@@ -1541,23 +1541,33 @@ VALUE parse_member_def(parserstate *state, bool instance_only, bool accept_overl
 
   bool loop = true;
   while (loop) {
+    VALUE annotations = rb_ary_new();
+    position overload_annot_pos = NullPosition;
+
+    if (state->next_token.type == tANNOTATION) {
+      parse_annotations(state, annotations, &overload_annot_pos);
+    }
+
     switch (state->next_token.type) {
     case pLPAREN:
     case pARROW:
     case pLBRACE:
     case pLBRACKET:
     case pQUESTION:
-      rb_ary_push(method_types, parse_method_type(state));
-      member_range.end = state->current_token.range.end;
-      break;
+      {
+        VALUE method_type = parse_method_type(state);
+        rb_ary_push(overloads, rbs_ast_members_method_definition_overload(annotations, method_type));
+        member_range.end = state->current_token.range.end;
+        break;
+      }
 
     case pDOT3:
       if (accept_overload) {
-        overload = Qtrue;
+        overloading = Qtrue;
         parser_advance(state);
         loop = false;
-        overload_range = state->current_token.range;
-        member_range.end = overload_range.end;
+        overloading_range = state->current_token.range;
+        member_range.end = overloading_range.end;
         break;
       } else {
         raise_syntax_error(
@@ -1604,17 +1614,17 @@ VALUE parse_member_def(parserstate *state, bool instance_only, bool accept_overl
   rbs_loc_add_required_child(loc, rb_intern("keyword"), keyword_range);
   rbs_loc_add_required_child(loc, rb_intern("name"), name_range);
   rbs_loc_add_optional_child(loc, rb_intern("kind"), kind_range);
-  rbs_loc_add_optional_child(loc, rb_intern("overload"), overload_range);
+  rbs_loc_add_optional_child(loc, rb_intern("overloading"), overloading_range);
   rbs_loc_add_optional_child(loc, rb_intern("visibility"), visibility_range);
 
   return rbs_ast_members_method_definition(
     name,
     k,
-    method_types,
+    overloads,
     annotations,
     location,
     comment,
-    overload,
+    overloading,
     visibility
   );
 }
@@ -2343,7 +2353,7 @@ VALUE parse_class_decl_super(parserstate *state, range *lt_range) {
     args = rb_ary_new();
     class_instance_name(state, CLASS_NAME, &name, args, &name_range, &args_range);
 
-    super_range.end = args_range.end;
+    super_range.end = state->current_token.range.end;
 
     location = rbs_new_location(state->buffer, super_range);
     loc = rbs_check_location(location);

data/ext/rbs_extension/ruby_objs.c

@@ -402,15 +402,27 @@ VALUE rbs_ast_decl_module(VALUE name, VALUE type_params, VALUE self_types, VALUE
   );
 }
 
-VALUE rbs_ast_members_method_definition(VALUE name, VALUE kind, VALUE types, VALUE annotations, VALUE location, VALUE comment, VALUE overload, VALUE visibility) {
+VALUE rbs_ast_members_method_definition_overload(VALUE annotations, VALUE method_type) {
+  VALUE args = rb_hash_new();
+  rb_hash_aset(args, ID2SYM(rb_intern("annotations")), annotations);
+  rb_hash_aset(args, ID2SYM(rb_intern("method_type")), method_type);
+
+  return CLASS_NEW_INSTANCE(
+    RBS_AST_Members_MethodDefinition_Overload,
+    1,
+    &args
+  );
+}
+
+VALUE rbs_ast_members_method_definition(VALUE name, VALUE kind, VALUE overloads, VALUE annotations, VALUE location, VALUE comment, VALUE overloading, VALUE visibility) {
   VALUE args = rb_hash_new();
   rb_hash_aset(args, ID2SYM(rb_intern("name")), name);
   rb_hash_aset(args, ID2SYM(rb_intern("kind")), kind);
-  rb_hash_aset(args, ID2SYM(rb_intern("types")), types);
+  rb_hash_aset(args, ID2SYM(rb_intern("overloads")), overloads);
   rb_hash_aset(args, ID2SYM(rb_intern("annotations")), annotations);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
-  rb_hash_aset(args, ID2SYM(rb_intern("overload")), overload);
+  rb_hash_aset(args, ID2SYM(rb_intern("overloading")), overloading);
   rb_hash_aset(args, ID2SYM(rb_intern("visibility")), visibility);
 
   return CLASS_NEW_INSTANCE(

data/ext/rbs_extension/ruby_objs.h

@@ -17,7 +17,8 @@ VALUE rbs_ast_decl_module_self(VALUE name, VALUE args, VALUE location);
 VALUE rbs_ast_decl_module(VALUE name, VALUE type_params, VALUE self_types, VALUE members, VALUE annotations, VALUE location, VALUE comment);
 VALUE rbs_ast_members_alias(VALUE new_name, VALUE old_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment);
 VALUE rbs_ast_members_attribute(VALUE klass, VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
-VALUE rbs_ast_members_method_definition(VALUE name, VALUE kind, VALUE types, VALUE annotations, VALUE location, VALUE comment, VALUE overload, VALUE visibility);
+VALUE rbs_ast_members_method_definition(VALUE name, VALUE kind, VALUE overloads, VALUE annotations, VALUE location, VALUE comment, VALUE overloading, VALUE visibility);
+VALUE rbs_ast_members_method_definition_overload(VALUE annotations, VALUE method_type);
 VALUE rbs_ast_members_mixin(VALUE klass, VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
 VALUE rbs_ast_members_variable(VALUE klass, VALUE name, VALUE type, VALUE location, VALUE comment);
 VALUE rbs_ast_members_visibility(VALUE klass, VALUE location);

data/lib/rbs/ast/members.rb

@@ -7,23 +7,57 @@ module RBS
       end
 
       class MethodDefinition < Base
+        class Overload
+          attr_reader :method_type, :annotations
+
+          def initialize(method_type:, annotations:)
+            @method_type = method_type
+            @annotations = annotations
+          end
+
+          def ==(other)
+            other.is_a?(Overload) && other.method_type == method_type && other.annotations == annotations
+          end
+
+          def hash
+            method_type.hash ^ annotations.hash
+          end
+
+          alias eql? ==
+
+          def update(annotations: self.annotations, method_type: self.method_type)
+            Overload.new(annotations: annotations, method_type: method_type)
+          end
+
+          def sub(subst)
+            update(method_type: self.method_type.sub(subst))
+          end
+
+          def to_json(state = _ = nil)
+            {
+              annotations: annotations,
+              method_type: method_type
+            }.to_json(state)
+          end
+        end
+
         attr_reader :name
         attr_reader :kind
-        attr_reader :types
+        attr_reader :overloads
         attr_reader :annotations
         attr_reader :location
         attr_reader :comment
-        attr_reader :overload
+        attr_reader :overloading
         attr_reader :visibility
 
-        def initialize(name:, kind:, types:, annotations:, location:, comment:, overload:, visibility: nil)
+        def initialize(name:, kind:, overloads:, annotations:, location:, comment:, overloading:, visibility:)
           @name = name
           @kind = kind
-          @types = types
+          @overloads = overloads
           @annotations = annotations
           @location = location
           @comment = comment
-          @overload = overload ? true : false
+          @overloading = overloading
           @visibility = visibility
         end
 
@@ -31,15 +65,15 @@ module RBS
           other.is_a?(MethodDefinition) &&
             other.name == name &&
             other.kind == kind &&
-            other.types == types &&
-            other.overload == overload &&
+            other.overloads == overloads &&
+            other.overloading? == overloading? &&
             other.visibility == visibility
         end
 
         alias eql? ==
 
         def hash
-          name.hash ^ kind.hash ^ types.hash ^ overload.hash
+          name.hash ^ kind.hash ^ overloads.hash ^ overloading?.hash ^ visibility.hash
         end
 
         def instance?
@@ -50,19 +84,19 @@ module RBS
           kind == :singleton || kind == :singleton_instance
         end
 
-        def overload?
-          overload
+        def overloading?
+          overloading
         end
 
-        def update(name: self.name, kind: self.kind, types: self.types, annotations: self.annotations, location: self.location, comment: self.comment, overload: self.overload, visibility: self.visibility)
+        def update(name: self.name, kind: self.kind, overloads: self.overloads, annotations: self.annotations, location: self.location, comment: self.comment, overloading: self.overloading?, visibility: self.visibility)
           self.class.new(
             name: name,
             kind: kind,
-            types: types,
+            overloads: overloads,
             annotations: annotations,
             location: location,
             comment: comment,
-            overload: overload,
+            overloading: overloading,
             visibility: visibility
           )
         end
@@ -72,11 +106,11 @@ module RBS
             member: :method_definition,
             name: name,
             kind: kind,
-            types: types,
+            overloads: overloads,
             annotations: annotations,
             location: location,
             comment: comment,
-            overload: overload,
+            overloading: overloading?,
             visibility: visibility
           }.to_json(state)
         end

data/lib/rbs/cli.rb

@@ -29,7 +29,12 @@ module RBS
         end
 
         loader = EnvironmentLoader.new(core_root: core_root, repository: repository)
-        lock = config_path&.then { |p| Collection::Config.lockfile_of(p) }
+        if config_path
+          lock_path = Collection::Config.to_lockfile_path(config_path)
+          if lock_path.file?
+            lock = Collection::Config::Lockfile.from_lockfile(lockfile_path: lock_path, data: YAML.load_file(lock_path.to_s))
+          end
+        end
         loader.add_collection(lock) if lock
 
         dirs.each do |dir|

data/lib/rbs/collection/config/lockfile.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module RBS
+  module Collection
+    class Config
+      class Lockfile
+        attr_reader :lockfile_path, :lockfile_dir, :path, :gemfile_lock_path, :sources, :gems
+
+        def initialize(lockfile_path:, path:, gemfile_lock_path:)
+          @lockfile_path = lockfile_path
+          @lockfile_dir = lockfile_path.parent
+          @path = path
+          @gemfile_lock_path = gemfile_lock_path
+
+          @sources = {}
+          @gems = {}
+        end
+
+        def fullpath
+          lockfile_dir + path
+        end
+
+        def gemfile_lock_fullpath
+          if gemfile_lock_path
+            lockfile_dir + gemfile_lock_path
+          end
+        end
+
+        def each_source(&block)
+          if block
+            sources.each_value(&block)
+            yield Sources::Rubygems.instance
+            yield Sources::Stdlib.instance
+          else
+            enum_for :each_source
+          end
+        end
+
+        def to_lockfile
+          # @type var data: lockfile_data
+
+          data = {
+            "sources" => sources.each_value.sort_by {|s| s.name }.map {|source| source.to_lockfile },
+            "path" => path.to_s,
+            "gems" => gems.each_value.sort_by {|g| g[:name] }.map {|hash| library_data(hash) },
+            "gemfile_lock_path" => gemfile_lock_path.to_s
+          }
+
+          data.delete("sources") if sources.empty?
+          data.delete("gems") if gems.empty?
+
+          data
+        end
+
+        def self.from_lockfile(lockfile_path:, data:)
+          path = Pathname(data["path"])
+          if p = data["gemfile_lock_path"]
+            gemfile_lock_path = Pathname(p)
+          end
+
+          lockfile = Lockfile.new(lockfile_path: lockfile_path, path: path, gemfile_lock_path: gemfile_lock_path)
+
+          if sources = data["sources"]
+            sources.each do |src|
+              git = Sources::Git.new(
+                name: src["name"],
+                revision: src["revision"],
+                remote: src["remote"],
+                repo_dir: src["repo_dir"]
+              )
+              lockfile.sources[git.name] = git
+            end
+          end
+
+          if gems = data["gems"]
+            gems.each do |gem|
+              src = gem["source"]
+              source = Sources.from_config_entry(src)
+              lockfile.gems[gem["name"]] = {
+                name: gem["name"],
+                version: gem["version"],
+                source: source
+              }
+            end
+          end
+
+          lockfile
+        end
+
+        def library_data(lib)
+          {
+            "name" => lib[:name],
+            "version" => lib[:version],
+            "source" => lib[:source].to_lockfile
+          }
+        end
+
+        def check_rbs_availability!
+          raise CollectionNotAvailable unless fullpath.exist?
+
+          gems.each_value do |gem|
+            source = gem[:source]
+
+            case source
+            when Sources::Git
+              meta_path = fullpath.join(gem[:name], gem[:version], Sources::Git::METADATA_FILENAME)
+              raise CollectionNotAvailable unless meta_path.exist?
+              raise CollectionNotAvailable unless library_data(gem) == YAML.load(meta_path.read)
+            end
+          end
+        end
+      end
+    end
+  end
+end