tapioca 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e53d805bebee7cb1898eb795daebc5c7f586b5dea934a6056dfc2e1037168e83
-  data.tar.gz: a9baac8cc53cc87f24495961dfe738603900e9818542c722b79211da2aaea84a
+  metadata.gz: c9cda50b7996366aafe00f6b8643f17385088e842c9626c23b922202702d8ee4
+  data.tar.gz: 040d9732ca74f020d475c3965392b63c2b9a525876cfd765b2c21fa0d031df54
 SHA512:
-  metadata.gz: 101e3405eb9fbc011e3ddb8ad33a622c74f18cde1d3b6be204aa7840fc7d1f89b1c61e61585cfe9d26c397e67839d09fcd85671c5c0b92f2c8b78741ee4e5ded
-  data.tar.gz: 0a7ad144e5860f72158c194de01213809a5294b69eb2a6de12288d827ca574efdc8937c967ec5c578b1a7c429d4f9e29bd5a1ee6738a373cf4cc57ca2ed8163a
+  metadata.gz: a7678c337e77326cedb49b06088ec1b24ae9b08f2047f02efc741134dc6a6efe851a702f45e02c571850c1762aca4de134067015aa8f2da06be9aa1cabb2050b
+  data.tar.gz: edd3d2148f8c4ee3c04bdc5025502e859f8d726bf38c741d4357a152770608ba639ad420070a8e071a261b4459bb20b7b637a390991877fd757e9d04a3d0d4b7

data/lib/tapioca/gem/listeners/source_location.rb

@@ -45,12 +45,19 @@ module Tapioca
           path = Pathname.new(file)
           return unless File.exist?(path)
 
+          # On native extensions, the source location may point to a shared object (.so, .bundle) file, which we cannot
+          # use for jump to definition. Only add source comments on Ruby files
+          return unless path.extname == ".rb"
+
           path = if path.realpath.to_s.start_with?(gem.full_gem_path)
             "#{gem.name}-#{gem.version}/#{path.realpath.relative_path_from(gem.full_gem_path)}"
           else
-            path.sub("#{Bundler.bundle_path}/gems/", "")
+            path.sub("#{Bundler.bundle_path}/gems/", "").to_s
           end
 
+          # Strip out the RUBY_ROOT prefix, which is different for each user
+          path = path.sub(RbConfig::CONFIG["rubylibdir"], "RUBY_ROOT")
+
           node.comments << RBI::Comment.new("") if node.comments.any?
           node.comments << RBI::Comment.new("source://#{path}:#{line}")
         end

data/lib/tapioca/helpers/rbi_helper.rb

@@ -93,15 +93,36 @@ module Tapioca
 
     sig { params(name: String).returns(T::Boolean) }
     def valid_method_name?(name)
-      name == "==" || !(
-        name.to_sym.inspect.start_with?(':"', ":@", ":$") ||
-        name.delete_suffix("=").to_sym.inspect.start_with?(':"', ":@", ":$")
-      )
+      # try to parse a method definition with this name
+      iseq = RubyVM::InstructionSequence.compile("def #{name}; end", nil, nil, 0, false)
+      # pull out the first operation in the instruction sequence and its first argument
+      op, arg, _data = iseq.to_a.dig(-1, 0)
+      # make sure that the operation is a method definition and the method that was
+      # defined has the expected name, for example, for `def !foo; end` we don't get
+      # a syntax error but instead get a method defined as `"foo"`
+      op == :definemethod && arg == name.to_sym
+    rescue SyntaxError
+      false
     end
 
     sig { params(name: String).returns(T::Boolean) }
     def valid_parameter_name?(name)
-      /^([[:lower:]]|_|[^[[:ascii:]]])([[:alnum:]]|_|[^[[:ascii:]]])*$/.match?(name)
+      sentinel_method_name = :sentinel_method_name
+      # try to parse a method definition with this name as the name of a
+      # keyword parameter. If we use a positional parameter, then parameter names
+      # like `&` (and maybe others) will be treated like `def foo(&); end` and will
+      # thus be considered valid. Using a required keyword parameter prevents that
+      # confusion between Ruby syntax and parameter name.
+      iseq = RubyVM::InstructionSequence.compile("def #{sentinel_method_name}(#{name}:); end", nil, nil, 0, false)
+      # pull out the first operation in the instruction sequence and its first argument and data
+      op, arg, data = iseq.to_a.dig(-1, 0)
+      # make sure that:
+      # 1. a method was defined, and
+      # 2. the method has the expected method name, and
+      # 3. the method has a keyword parameter with the expected name
+      op == :definemethod && arg == sentinel_method_name && data.dig(11, :keyword, 0) == name.to_sym
+    rescue SyntaxError
+      false
     end
   end
 end

data/lib/tapioca/internal.rb

@@ -34,6 +34,7 @@ require "tapioca/helpers/rbi_helper"
 require "tapioca/sorbet_ext/fixed_hash_patch"
 require "tapioca/sorbet_ext/name_patch"
 require "tapioca/sorbet_ext/generic_name_patch"
+require "tapioca/sorbet_ext/proc_bind_patch"
 require "tapioca/runtime/generic_type_registry"
 
 require "tapioca/helpers/cli_helper"

data/lib/tapioca/runtime/trackers/constant_definition.rb

@@ -25,16 +25,16 @@ module Tapioca
 
           key = tp.self
 
-          if tp.path == "(eval)"
+          path = tp.path
+          if File.exist?(path)
+            loc = build_constant_location(tp, caller_locations)
+          else
             caller_location = T.must(caller_locations)
-              .drop_while { |loc| loc.path == "(eval)" }
-              .first
+              .find { |loc| loc.path && File.exist?(loc.path) }
 
             next unless caller_location
 
             loc = ConstantLocation.new(path: caller_location.absolute_path || "", lineno: caller_location.lineno)
-          else
-            loc = build_constant_location(tp, caller_locations)
           end
 
           (@class_files[key] ||= Set.new) << loc

data/lib/tapioca/sorbet_ext/proc_bind_patch.rb

@@ -0,0 +1,40 @@
+# typed: true
+# frozen_string_literal: true
+
+module T
+  module Types
+    module ProcBindPatch
+      def initialize(arg_types, returns, bind = T::Private::Methods::ARG_NOT_PROVIDED)
+        super(arg_types, returns)
+
+        unless bind == T::Private::Methods::ARG_NOT_PROVIDED
+          @bind = T.let(T::Utils.coerce(bind), T::Types::Base)
+        end
+      end
+
+      def name
+        name = super
+        name = name.sub("T.proc", "T.proc.bind(#{@bind})") unless @bind.nil?
+        name
+      end
+    end
+
+    Proc.prepend(ProcBindPatch)
+  end
+end
+
+module T
+  module Private
+    module Methods
+      module ProcBindPatch
+        def finalize_proc(decl)
+          super
+
+          T.unsafe(T::Types::Proc).new(decl.params, decl.returns, decl.bind)
+        end
+      end
+
+      singleton_class.prepend(ProcBindPatch)
+    end
+  end
+end

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -256,6 +256,7 @@ files:
 - lib/tapioca/sorbet_ext/fixed_hash_patch.rb
 - lib/tapioca/sorbet_ext/generic_name_patch.rb
 - lib/tapioca/sorbet_ext/name_patch.rb
+- lib/tapioca/sorbet_ext/proc_bind_patch.rb
 - lib/tapioca/static/requires_compiler.rb
 - lib/tapioca/static/symbol_loader.rb
 - lib/tapioca/static/symbol_table_parser.rb