This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Context: return lines around symbol match#63773
Merged
jtibshirani merged 1 commit intomainfrom Jul 11, 2024
Merged
Conversation
github-actions
bot
added
team/product-platform
team/search-platform
stefanhengl
approved these changes
Jul 11, 2024
stefanhengl
reviewed
Jul 11, 2024
| func fileMatchToContextMatch(fm *result.FileMatch) FileChunkContext { | ||
| if len(fm.ChunkMatches) == 0 { | ||
| var startLine int | ||
| if len(fm.Symbols) != 0 { |
Member
There was a problem hiding this comment.
Just a thought. In the code I see that we do this kind of check in several places. I wonder whether it would help to just make this a method of FileMatch.
Contributor
Author
There was a problem hiding this comment.
hmm, what are you suggesting we could pull out? A method like containsSymbols? Or something like firstStartLine?
Contributor
Author
|
I'm going to merge but happy to make any follow-ups. |
sourcegraph-release-bot
pushed a commit
that referenced
this pull request
Jul 11, 2024
This PR fixes an important bug in #62976, where we didn't properly map the symbol line match to the return type. Instead, we accidentally treated symbol matches like file matches and returned the start of the file. ## Test plan Add new unit test for symbol match conversion. Extensive manual testing. (cherry picked from commit 004eb0f)
Collaborator
|
The backport to To backport this PR manually, you can either: Via the sg toolUse the sg backport -r 5.5.x -p 63773Via your terminalTo backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.5.x 5.5.x
# Navigate to the new working tree
cd .worktrees/backport-5.5.x
# Create a new branch
git switch --create backport-63773-to-5.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 004eb0fd830755376c8ee6b895a814d79bd8f21b
# Push it to GitHub
git push --set-upstream origin backport-63773-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.xIf you encouter conflict, first resolve the conflict and stage all files, then run the commands below: git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-63773-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.x
Once the pull request has been created, please ensure the following:
|
sourcegraph-release-bot
added
backports
release-blocker
jdpleiness
pushed a commit
that referenced
this pull request
Jul 11, 2024
This PR fixes an important bug in #62976, where we didn't properly map the symbol line match to the return type. Instead, we accidentally treated symbol matches like file matches and returned the start of the file. ## Test plan Add new unit test for symbol match conversion. Extensive manual testing. <br> Backport 004eb0f from #63773 Co-authored-by: Julie Tibshirani <[email protected]>
jtibshirani
removed
release-blocker
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes an important bug in #62976, where we didn't properly map the
symbol line match to the return type. Instead, we accidentally treated symbol
matches like file matches and returned the start of the file.
Test plan
Add new unit test for symbol match conversion. Extensive manual testing.