Skip to content

FEDX-4020: Populate enclosing_range #193

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
merged 4 commits into from
Sep 30, 2025
Merged

FEDX-4020: Populate enclosing_range #193

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2969b02
populate enclosing range
matthewnitschke-wk Sep 27, 2025
ff8dbf7
fmt
matthewnitschke-wk Sep 27, 2025
3f184fd
updated changelog
matthewnitschke-wk Sep 27, 2025
9d6e59a
fixed incorrect range calculation
matthewnitschke-wk Sep 29, 2025
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
2 changes: 2 additions & 0 deletions lib/src/scip_visitor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ class ScipVisitor extends GeneralizingAstVisitor {
range: _lineInfo.getRange(offset, length),
symbol: symbol,
diagnostics: meta.diagnostics,
enclosingRange: _lineInfo.getRange(node.parent!.offset, node.parent!.length)
));

if (!element.source!.fullName.startsWith(_projectRoot)) {
Expand Down Expand Up @@ -179,6 +180,7 @@ class ScipVisitor extends GeneralizingAstVisitor {
symbol: symbol,
symbolRoles: SymbolRole.Definition.value,
diagnostics: meta.diagnostics,
enclosingRange: _lineInfo.getRange(node.parent!.offset, node.parent!.length)
));
}
}
22 changes: 17 additions & 5 deletions lib/src/utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,24 @@ void display(String input, {DisplayLevel level = DisplayLevel.warn}) {

extension LineInfoExtension on LineInfo {
List<int> getRange(int offset, int nameLength) {
final loc = getLocation(offset);
return [
loc.lineNumber - 1,
loc.columnNumber - 1,
loc.columnNumber - 1 + nameLength
final start = getLocation(offset);
final end = getLocation(offset + nameLength);
Copy link
Contributor Author

@matthewnitschke-wk matthewnitschke-wk Sep 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enclosing_range is the first symbol that will commonly span multiple lines. as such our old getRange function wasn't built to handle this. That's what these updates are doing


final res = [
start.lineNumber - 1,
start.columnNumber - 1,
end.lineNumber - 1,
end.columnNumber - 1,
];

// if the range starts and ends on the same line, only return
// 3 elements, where the first is the line number, and the others
// are startCol and endCol. This is apart of the scip spec
if (res[0] == res[2]) {
res.removeAt(2);
}

return res;
}
}

Expand Down
Loading