From 24815acaeaeeb25a8ca2ccd0fedea1d0d889cfd1 Mon Sep 17 00:00:00 2001
From: ksss <co000ri@gmail.com>
Date: Fri, 27 Sep 2024 15:39:53 +0900
Subject: [PATCH] Should set self_type to self

---
 core/module.rbs               |  4 ++--
 test/typecheck/eval/Steepfile |  7 +++++++
 test/typecheck/eval/test.rb   | 26 ++++++++++++++++++++++++++
 test/typecheck/eval/test.rbs  | 11 +++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 test/typecheck/eval/Steepfile
 create mode 100644 test/typecheck/eval/test.rb
 create mode 100644 test/typecheck/eval/test.rbs

diff --git a/core/module.rbs b/core/module.rbs
index 7ed46c08f..de4bdcb0e 100644
--- a/core/module.rbs
+++ b/core/module.rbs
@@ -377,7 +377,7 @@ class Module < Object
   #         or method `code' for Thing:Class
   #
   def class_eval: (String arg0, ?String filename, ?Integer lineno) -> untyped
-                | [U] () { (self m) -> U } -> U
+                | [U] () { (self m) [self: self] -> U } -> U
 
   # <!-- rdoc-file=vm_eval.c -->
   # Evaluates the given block in the context of the class/module. The method
@@ -1083,7 +1083,7 @@ class Module < Object
   #         or method `code' for Thing:Class
   #
   def module_eval: (String arg0, ?String filename, ?Integer lineno) -> untyped
-                 | [U] () { (self m) -> U } -> U
+                 | [U] () { (self m) [self: self] -> U } -> U
 
   # <!--
   #   rdoc-file=vm_eval.c
diff --git a/test/typecheck/eval/Steepfile b/test/typecheck/eval/Steepfile
new file mode 100644
index 000000000..77b233465
--- /dev/null
+++ b/test/typecheck/eval/Steepfile
@@ -0,0 +1,7 @@
+D = Steep::Diagnostic
+
+target :test do
+  signature "."
+  check "."
+  configure_code_diagnostics(D::Ruby.all_error)
+end
diff --git a/test/typecheck/eval/test.rb b/test/typecheck/eval/test.rb
new file mode 100644
index 000000000..b564a0c1d
--- /dev/null
+++ b/test/typecheck/eval/test.rb
@@ -0,0 +1,26 @@
+class Foo
+  def self.singleton
+  end
+
+  private
+
+  def private_method
+  end
+end
+
+module Bar
+  def self.singleton
+  end
+end
+
+Foo.class_eval do
+  singleton
+end
+
+Foo.new.instance_eval do
+  private_method
+end
+
+Bar.module_eval do
+  singleton
+end
diff --git a/test/typecheck/eval/test.rbs b/test/typecheck/eval/test.rbs
new file mode 100644
index 000000000..60ea069f0
--- /dev/null
+++ b/test/typecheck/eval/test.rbs
@@ -0,0 +1,11 @@
+class Foo
+  def self.singleton: () -> void
+
+  private
+
+  def private_method: () -> void
+end
+
+module Bar
+  def self.singleton: () -> void
+end