Rust: Jump-to-def for operations and indexing #20900
+197
−48
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -26,6 +26,19 @@ abstract class Use extends Locatable { | |||||||
| * Gets the type of use. | ||||||||
| */ | ||||||||
| abstract string getUseType(); | ||||||||
|
|
||||||||
| /** | ||||||||
| * Holds if this element is at the specified location. | ||||||||
| * The location spans column `startcolumn` of line `startline` to | ||||||||
| * column `endcolumn` of line `endline` in file `filepath`. | ||||||||
| * For more information, see | ||||||||
| * [Providing locations in CodeQL queries](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/). | ||||||||
| */ | ||||||||
| predicate hasLocationInfo( | ||||||||
| string filepath, int startline, int startcolumn, int endline, int endcolumn | ||||||||
| ) { | ||||||||
| this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| cached | ||||||||
|
|
@@ -166,6 +179,43 @@ private class MethodUse extends Use instanceof NameRef { | |||||||
| override string getUseType() { result = "method" } | ||||||||
| } | ||||||||
|
|
||||||||
| private class OperationUse extends Use instanceof Operation { | ||||||||
| override Definition getDefinition() { result.asItemNode() = this.(Call).getStaticTarget() } | ||||||||
|
|
||||||||
| override string getUseType() { result = "method" } | ||||||||
|
|
||||||||
| override predicate hasLocationInfo( | ||||||||
| string filepath, int startline, int startcolumn, int endline, int endcolumn | ||||||||
| ) { | ||||||||
| // We don't have entities for the operator symbols, so approximate a location | ||||||||
| this = | ||||||||
| any(PrefixExpr pe | | ||||||||
| pe.getLocation().hasLocationInfo(filepath, startline, startcolumn, _, _) and | ||||||||
| pe.getExpr().getLocation().hasLocationInfo(_, endline, endcolumn + 2, _, _) | ||||||||
| ) | ||||||||
| or | ||||||||
| this = | ||||||||
| any(BinaryExpr be | | ||||||||
| be.getLhs().getLocation().hasLocationInfo(filepath, _, _, startline, startcolumn - 2) and | ||||||||
| be.getRhs().getLocation().hasLocationInfo(filepath, endline, endcolumn + 2, _, _) | ||||||||
| ) | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| private class IndexExprUse extends Use instanceof IndexExpr { | ||||||||
| override Definition getDefinition() { result.asItemNode() = this.(Call).getStaticTarget() } | ||||||||
|
|
||||||||
| override string getUseType() { result = "method" } | ||||||||
|
|
||||||||
| override predicate hasLocationInfo( | ||||||||
| string filepath, int startline, int startcolumn, int endline, int endcolumn | ||||||||
| ) { | ||||||||
| // We don't have entities for the brackets, so approximate a location | ||||||||
| super.getIndex().getLocation().hasLocationInfo(filepath, _, _, startline, startcolumn - 2) and | ||||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
? |
||||||||
| this.getLocation().hasLocationInfo(_, _, _, endline, endcolumn) | ||||||||
|
Comment on lines
+237
to
+238
There was a problem hiding this comment. The location calculation results in inverted columns where end column is before start column. For an index expression like Looking at the logic:
The issue is that Consider revising the location calculation to ensure endcolumn >= startcolumn, or compute the bracket positions more accurately.
Suggested change
|
||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| private class FileUse extends Use instanceof Name { | ||||||||
| override Definition getDefinition() { | ||||||||
| exists(Module m | | ||||||||
|
|
||||||||
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
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.
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.
The location calculation appears to have the start and end columns inverted. For a prefix expression like
-Son line 67, the expected output shows67:5:67:4(start column 5, end column 4), where the end column is before the start column. This will likely cause issues with jump-to-definition functionality.Looking at the logic:
pe.getLocation().hasLocationInfo(filepath, startline, startcolumn, _, _)gets the prefix expression's start locationpe.getExpr().getLocation().hasLocationInfo(_, endline, endcolumn + 2, _, _)gets the operand's end locationThe issue is that for
-S, the prefix expression location is the entire-S, and the operandScomes after the-. So using the prefix expression's start column and the operand's end column (which comes before it) results in inverted columns.Consider calculating the operator location more directly, or ensure endcolumn >= startcolumn.