Merge branch 'ruby:master' into Add_type_arguments_support_to_singleton_types

Author: allcre

.clangd

@@ -0,0 +1,2 @@
+CompileFlags:
+    CompilationDatabase: ext/rbs_extension

.gitignore

@@ -21,3 +21,7 @@ lib/**/*.dll
 doc/
 
 **/*.gem
+
+# For clangd's editor integration
+ext/rbs_extension/compile_commands.json
+ext/rbs_extension/.cache

Gemfile

@@ -20,6 +20,7 @@ gem "rdoc"
 gem "fileutils"
 gem "raap"
 gem "activesupport", "~> 7.0"
+gem "extconf_compile_commands_json"
 
 group :libs do
   # Libraries required for stdlib test

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (4.0.0.dev.2)
+    rbs (4.0.0.dev.4)
       logger
       prism (>= 1.3.0)
 
@@ -40,6 +40,8 @@ GEM
     diff-lcs (1.6.2)
     digest (3.2.0)
     drb (2.2.1)
+    erb (5.0.1)
+    extconf_compile_commands_json (0.0.7)
     ffi (1.17.2)
     fileutils (1.7.3)
     goodcheck (3.1.0)
@@ -49,19 +51,19 @@ GEM
       strong_json (>= 1.1, < 2.2)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.10.2)
+    json (2.12.0)
     json-schema (5.1.1)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
     marcel (1.0.4)
     memory_profiler (1.1.0)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.25.5)
     mutex_m (0.3.0)
     net-protocol (0.2.2)
@@ -95,7 +97,8 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.13.1)
+    rdoc (6.14.0)
+      erb
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     rspec (3.13.0)
@@ -111,7 +114,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.3)
-    rubocop (1.75.5)
+    rubocop (1.75.6)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -125,7 +128,7 @@ GEM
     rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
-    rubocop-on-rbs (1.6.0)
+    rubocop-on-rbs (1.7.0)
       lint_roller (~> 1.1)
       rbs (~> 3.5)
       rubocop (>= 1.72.1, < 2.0)
@@ -184,6 +187,7 @@ DEPENDENCIES
   csv
   dbm
   digest
+  extconf_compile_commands_json
   fileutils
   goodcheck
   json

Rakefile

@@ -11,6 +11,14 @@ bin = File.join(__dir__, "bin")
 
 Rake::ExtensionTask.new("rbs_extension")
 
+compile_task = Rake::Task[:compile]
+
+task :setup_extconf_compile_commands_json do
+  ENV["COMPILE_COMMANDS_JSON"] = "1"
+end
+
+compile_task.prerequisites.unshift(:setup_extconf_compile_commands_json)
+
 test_config = lambda do |t|
   t.libs << "test"
   t.libs << "lib"

ext/rbs_extension/extconf.rb

@@ -25,3 +25,11 @@
 end
 
 create_makefile 'rbs_extension'
+
+# Only generate compile_commands.json when compiling through Rake tasks
+# This is to avoid adding extconf_compile_commands_json as a runtime dependency
+if ENV["COMPILE_COMMANDS_JSON"]
+  require 'extconf_compile_commands_json'
+  ExtconfCompileCommandsJson.generate!
+  ExtconfCompileCommandsJson.symlink!
+end

lib/rbs/namespace.rb

@@ -116,10 +116,3 @@ def ascend
     end
   end
 end
-
-module Kernel
-  def Namespace(name)
-    warn "Kernel#Namespace() is deprecated. Use RBS::Namespace.parse instead.", category: :deprecated
-    RBS::Namespace.parse(name)
-  end
-end

lib/rbs/type_name.rb

@@ -100,10 +100,3 @@ def self.parse(string)
     end
   end
 end
-
-module Kernel
-  def TypeName(string)
-    warn "Kernel#TypeName() is deprecated. Use RBS::TypeName.parse instead.", category: :deprecated
-    RBS::TypeName.parse(string)
-  end
-end

lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "4.0.0.dev.2"
+  VERSION = "4.0.0.dev.4"
 end

sig/namespace.rbs

@@ -139,8 +139,3 @@ module RBS
               | () -> Enumerator[Namespace, void]
   end
 end
-
-module Kernel
-  # Deprecated: Use `RBS::Namespace.parse` instead
-  %a{deprecated} def Namespace: (String) -> RBS::Namespace
-end