Merge branch 'master' into byte-offset

Author: soutaro

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/soutaro/steep.git
-  revision: c8549eae3ca6aa7e93d225d69fa909593f6938d1
+  revision: 86f2b023c454f84964c6bab4aef0aafb0610c088
   specs:
     steep (2.0.0.dev)
       activesupport (>= 5.1)
@@ -49,7 +49,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.8)
+    addressable (2.8.9)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     base64 (0.3.0)
@@ -92,6 +92,8 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
     marcel (1.1.0)
+    mcp (0.8.0)
+      json-schema (>= 4.1)
     memory_profiler (1.1.0)
     minitest (6.0.2)
       drb (~> 2.0)
@@ -144,14 +146,15 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.84.2)
+    rubocop (1.85.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
+      mcp (~> 0.6)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)

include/rbs.h

@@ -1,6 +1,14 @@
 #ifndef RBS_H
 #define RBS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "rbs/parser.h"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

stdlib/psych/0/psych.rbs

@@ -400,4 +400,56 @@ module Psych
   #
   %a{annotate:rdoc:copy:Psych.unsafe_load}
   def self.unsafe_load: (String yaml, ?filename: String | _ToStr | _ToS?, ?fallback: untyped, ?symbolize_names: bool, ?freeze: bool, ?strict_integer: bool) -> untyped
+
+  # <!--
+  #   rdoc-file=ext/psych/lib/psych.rb
+  #   - safe_load_file(filename, **kwargs)
+  # -->
+  # Safely loads the document contained in `filename`.  Returns the yaml contained
+  # in `filename` as a Ruby object, or if the file is empty, it returns the
+  # specified `fallback` return value, which defaults to `nil`. See safe_load for
+  # options.
+  #
+  %a{annotate:rdoc:copy:Psych.safe_load_file}
+  def self.safe_load_file: (path, ?permitted_classes: Array[Class], ?permitted_symbols: Array[Symbol], ?aliases: bool, ?fallback: untyped, ?symbolize_names: bool, ?freeze: bool) -> untyped
+
+  # <!--
+  #   rdoc-file=ext/psych/lib/psych.rb
+  #   - unsafe_load_file(filename, **kwargs)
+  # -->
+  # Load the document contained in `filename`.  Returns the yaml contained in
+  # `filename` as a Ruby object, or if the file is empty, it returns the specified
+  # `fallback` return value, which defaults to `false`.
+  #
+  # NOTE: This method *should not* be used to parse untrusted documents, such as
+  # YAML documents that are supplied via user input.  Instead, please use the
+  # safe_load_file method.
+  #
+  %a{annotate:rdoc:copy:Psych.unsafe_load_file}
+  def self.unsafe_load_file: (path, ?fallback: untyped, ?symbolize_names: bool, ?freeze: bool) -> untyped
+
+  class Exception < ::RuntimeError
+  end
+
+  class SyntaxError < ::Psych::Exception
+    attr_reader file: String?
+    attr_reader line: Integer?
+    attr_reader column: Integer?
+    attr_reader offset: Integer?
+    attr_reader problem: String?
+    attr_reader context: String?
+
+    # <!--
+    #   rdoc-file=ext/psych/lib/psych/syntax_error.rb
+    #   - new(file, line, col, offset, problem, context)
+    # -->
+    #
+    def initialize: (?String? file, ?Integer? line, ?Integer? column, ?Integer? offset, ?String? problem, ?String? context) -> void
+  end
+
+  class BadAlias < ::Psych::Exception
+  end
+
+  class DisallowedClass < ::Psych::Exception
+  end
 end

test/stdlib/psych_test.rb

@@ -59,6 +59,42 @@ def test_safe_load
     )
   end
 
+  def test_safe_load_file
+    Dir.mktmpdir do |dir|
+      (Pathname(dir) + "test.yaml").write(<<-YAML)
+foo: 123
+      YAML
+
+      assert_send_type(
+        "(::String) -> untyped",
+        Psych, :safe_load_file, File.join(dir, "test.yaml")
+      )
+
+      assert_send_type(
+        "(::_ToPath, permitted_classes: ::Array[::Class], permitted_symbols: ::Array[::Symbol], aliases: bool, fallback: ::Symbol, symbolize_names: bool, freeze: bool) -> untyped",
+        Psych, :safe_load_file, Pathname(File.join(dir, "test.yaml")), permitted_classes: [Integer], permitted_symbols: [:foo], aliases: true, fallback: :foo, symbolize_names: true, freeze: false
+      )
+    end
+  end
+
+  def test_unsafe_load_file
+    Dir.mktmpdir do |dir|
+      (Pathname(dir) + "test.yaml").write(<<-YAML)
+foo: 123
+      YAML
+
+      assert_send_type(
+        "(::String) -> untyped",
+        Psych, :unsafe_load_file, File.join(dir, "test.yaml")
+      )
+
+      assert_send_type(
+        "(::_ToPath, fallback: ::String, symbolize_names: bool, freeze: bool) -> untyped",
+        Psych, :unsafe_load_file, Pathname(File.join(dir, "test.yaml")), fallback: "foo", symbolize_names: false, freeze: false
+      )
+    end
+  end
+
   def test_dump
     assert_send_type(
       "(::Array[::Integer]) -> ::String",