-
Notifications
You must be signed in to change notification settings - Fork 3
fix: avoid overlapping definition for T::Enum synthetic serialize() method #246
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.
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
fix: avoid overlapping definition for T::Enum synthetic serialize() method #246
Conversation
|
This change is part of the following stack: Change managed by git-spice. |
f978d5f to
63c20ad
Compare
63c20ad to
e870522
Compare
754c74f to
57c1b53
Compare
e870522 to
2391c4c
Compare
57c1b53 to
db7c6fd
Compare
2391c4c to
15e48fc
Compare
15e48fc to
d7969ce
Compare
jupblb
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left two comments. Looks ok.
tenum-serialize-fix.patch
Outdated
| @@ -0,0 +1,59 @@ | |||
| From f360b43dedfb38b386180fe5847a77b90e823faa Mon Sep 17 00:00:00 2001 | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this patch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
accidentally added
| } | ||
| } | ||
| } | ||
| if (core::isa_type<core::ClassType>(serializeReturnType) && !serializeReturnType.isUntyped() && |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removing this is a serious deviation from the upstream:
Lines 241 to 257 in 0a7b175
| if (core::isa_type<core::ClassType>(serializeReturnType) && !serializeReturnType.isUntyped() && | |
| !serializeReturnType.isBottom()) { | |
| auto serializeReturnTypeClass = core::cast_type_nonnull<core::ClassType>(serializeReturnType); | |
| ast::ExpressionPtr return_type_ast = ast::MK::Constant(klass->declLoc, serializeReturnTypeClass.symbol); | |
| auto sig = ast::MK::Sig0(klass->declLoc, std::move(return_type_ast)); | |
| auto method = ast::MK::SyntheticMethod0(klass->loc, klass->declLoc, core::Names::serialize(), | |
| ast::MK::RaiseTypedUnimplemented(klass->declLoc)); | |
| ast::Send::ARGS_store nargs; | |
| ast::Send::Flags flags; | |
| flags.isPrivateOk = true; | |
| auto visibility = ast::MK::Send(klass->declLoc, ast::MK::Self(klass->declLoc), core::Names::public_(), | |
| klass->declLoc, 0, std::move(nargs), flags); | |
| klass->rhs.emplace_back(std::move(visibility)); | |
| klass->rhs.emplace_back(std::move(sig)); | |
| klass->rhs.emplace_back(std::move(method)); | |
| } |
This is not bad but something worth noting. I hope this doesn't break anything.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we need to track this in case of rebases. We have this commit including PR and reasons why this has been removed
…ping symbols ## Problem The synthetic serialize() method definition was emitted at the same location as the class name, causing two overlapping definitions. This broke Find References in Sourcegraph UI, which would pick up serialize references instead of class references. ## Solution Remove the synthetic serialize() method generation entirely. Since serialize() is a Sorbet stdlib method (not user-defined), omitting the definition is acceptable - users can still navigate via the class inheritance chain. ## Before ```ruby class Foo < T::Enum # ^^^ definition [..] Foo# # ^^^ definition [..] Foo#serialize(). # ^ reference [..] T# # ^^^^ reference [..] Module#public(). # ^^^^ reference [..] String# # ^^^^ reference [..] T#Enum# ``` ## After ```ruby class Foo < T::Enum # ^^^ definition [..] Foo# # ^ reference [..] T# # ^^^^ reference [..] T#Enum# ``` Fixes CU-2372 Amp-Thread-ID: https://ampcode.com/threads/T-019c2423-1e50-751d-9ebb-17cbf138874d Co-authored-by: Amp <amp@ampcode.com>
d7969ce to
a84476a
Compare
CU-2372 Removes the synthetic
serialize()definition generation.Motivation
When users click "Find References" on a
T::Enumclass name in Sourcegraph, the UI sometimes shows references to theserialize()method instead of references to the class itself.This happens because
scip-rubyemits two definitions at the exact same source location:Foo#)serialize()method (e.g.,Foo#serialize().)When the Sourcegraph frontend queries for the symbol at a position and finds multiple overlapping definitions, it may pick the wrong one, causing Find References to return incorrect results.
Now only definition for the class is provided:
Problem
The synthetic serialize() method definition was emitted at the T::Enum class
declaration location, causing overlapping definitions with the class itself.
This broke Find References in Sourcegraph UI, which would pick up serialize
references instead of class references.
Before
After
Test plan
See included automated tests.