Skip to content

fix: Correctly emit refs for entities in the Opus namespace #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
varungandhi-src merged 2 commits into from
Oct 1, 2024
Merged

fix: Correctly emit refs for entities in the Opus namespace #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c81298
test: Add negative test for Opus references being missed
varungandhi-src Oct 1, 2024
a839dce
fix: Correctly emit refs for entities in the Opus namespace
varungandhi-src Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions scip_indexer/SCIPSymbolRef.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

#include "common/FileSystem.h"
#include "common/sort/sort.h"
#include "core/source_generator/source_generator.h"
#include "core/Loc.h"
#include "core/source_generator/source_generator.h"
#include "main/lsp/LSPLoop.h"

#include "scip_indexer/Debug.h"
Expand Down Expand Up @@ -184,10 +184,6 @@ bool GenericSymbolRef::isSorbetInternal(const core::GlobalState &gs, core::Symbo
if (klass == core::Symbols::Sorbet_Private() || klass == core::Symbols::T() || klass == classT) {
return true;
}
auto name = klass.data(gs)->name;
if (name == core::Names::Constants::Opus()) {
return true;
}
}
visited.insert(sym);
sym = sym.owner(gs);
Expand Down Expand Up @@ -228,7 +224,8 @@ void GenericSymbolRef::saveDocStrings(const core::GlobalState &gs, core::TypePtr
auto ref = this->selfOrOwner.asMethodRef();
auto recvType = ref.data(gs)->owner.data(gs)->resultType;
checkType(recvType, fmt::format("receiver type for {}", ref.showFullName(gs)));
markdown = core::source_generator::prettyTypeForMethod(gs, ref, recvType, nullptr, nullptr, core::ShowOptions());
markdown =
core::source_generator::prettyTypeForMethod(gs, ref, recvType, nullptr, nullptr, core::ShowOptions());
// FIXME(varun): For some reason, it looks like a bunch of public methods
// get marked as private here. Avoid printing misleading info until we fix that.
// https://github.com/sourcegraph/scip-ruby/issues/33
Expand Down
12 changes: 12 additions & 0 deletions test/scip/testdata/encrypted_prop.snapshot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,23 @@ def self.encrypted_prop(opts={}); end
# ^^^^^^^^^^^^^^ definition [..] `<Class:EncryptedProp>`#encrypted_prop().
encrypted_prop :foo
# ^^^^^^^^^^^^^^^^^^^ reference [..] String#
# ^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#
# ^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#Model#
# ^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#Model#Mixins#
# ^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#Model#Mixins#Encryptable#
# ^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#Model#Mixins#Encryptable#EncryptedValue#
# ^^^^^^^^^^^^^^^^^^^ reference [..] Opus#
# ^^^ definition [..] EncryptedProp#`encrypted_foo=`().
# ^^^ definition [..] EncryptedProp#`foo=`().
# ^^^ definition [..] EncryptedProp#encrypted_foo().
# ^^^ definition [..] EncryptedProp#foo().
encrypted_prop :bar, migrating: true, immutable: true
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#Model#Mixins#Encryptable#
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#Model#
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#Model#Mixins#
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference [..] Opus#
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference [..] Opus#DB#Model#Mixins#Encryptable#EncryptedValue#
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference [..] String#
# ^^^ definition [..] EncryptedProp#bar().
# ^^^ definition [..] EncryptedProp#encrypted_bar().
Expand Down
17 changes: 17 additions & 0 deletions test/scip/testdata/opus.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# typed: true

class Opus::Base
end

class Opus::Derived < Opus::Base
end

TYPES = T.let({ derived: -> { Opus::Derived } }, T::Hash[Symbol, T.proc.returns(T.class_of(Opus::Base))])

module ABC
TYPES_IN_MODULE = T.let({ derived: -> { Opus::Derived } }, T::Hash[Symbol, T.proc.returns(T.class_of(Opus::Base))])
end

class Other
TYPES_IN_CLASS = T.let({ derived: -> { Opus::Derived } }, T::Hash[Symbol, T.proc.returns(T.class_of(Opus::Base))])
end
61 changes: 61 additions & 0 deletions test/scip/testdata/opus.snapshot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# typed: true

class Opus::Base
# ^^^^ reference [..] Opus#
# ^^^^ definition [..] Opus#Base#
end

class Opus::Derived < Opus::Base
# ^^^^ reference [..] Opus#
# ^^^^^^^ definition [..] Opus#Derived#
# ^^^^ reference [..] Opus#
# ^^^^ reference [..] Opus#Base#
end

TYPES = T.let({ derived: -> { Opus::Derived } }, T::Hash[Symbol, T.proc.returns(T.class_of(Opus::Base))])
#^^^^^ definition [..] TYPES.
# ^^ reference [..] Kernel#
# ^^ reference [..] Kernel#lambda().
# ^^^^ reference [..] Opus#
# ^^^^^^^ reference [..] Opus#Derived#
# ^ reference [..] T#
# ^^^^ reference [..] T#Hash#
# ^^^^^^ reference [..] Symbol#
# ^ reference [..] T#
# ^^^^ reference [..] `<Class:T>`#proc().
# ^ reference [..] T#
# ^^^^^^^^ reference [..] `<Class:T>`#class_of().
# ^^^^ reference [..] Opus#
# ^^^^ reference [..] Opus#Base#
# ^^^^^^^ definition local 4~#119448696
# ^^^^^^^^ reference [..] TYPES.

module ABC
# ^^^ definition [..] ABC#
TYPES_IN_MODULE = T.let({ derived: -> { Opus::Derived } }, T::Hash[Symbol, T.proc.returns(T.class_of(Opus::Base))])
# ^^^^^^^^^^^^^^^ definition [..] ABC#TYPES_IN_MODULE.
# ^^ reference [..] Kernel#
# ^^ reference [..] Kernel#lambda().
# ^^^^ reference [..] Opus#
# ^^^^^^^ reference [..] Opus#Derived#
# ^^^^^^ reference [..] Symbol#
# ^^^^ reference [..] Opus#
# ^^^^ reference [..] Opus#Base#
# ^^^^^^^ definition local 4~#119448696
# ^^^^^^^^ reference [..] ABC#TYPES_IN_MODULE.
end

class Other
# ^^^^^ definition [..] Other#
TYPES_IN_CLASS = T.let({ derived: -> { Opus::Derived } }, T::Hash[Symbol, T.proc.returns(T.class_of(Opus::Base))])
# ^^^^^^^^^^^^^^ definition [..] Other#TYPES_IN_CLASS.
# ^^ reference [..] Kernel#
# ^^ reference [..] Kernel#lambda().
# ^^^^ reference [..] Opus#
# ^^^^^^^ reference [..] Opus#Derived#
# ^^^^^^ reference [..] Symbol#
# ^^^^ reference [..] Opus#
# ^^^^ reference [..] Opus#Base#
# ^^^^^^^ definition local 4~#119448696
# ^^^^^^^^ reference [..] Other#TYPES_IN_CLASS.
end