Skip to content

Fix column value of tokens of interpolated expressions #537

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
guillaume-dequenne merged 1 commit into from
Jan 21, 2020
Merged

Fix column value of tokens of interpolated expressions #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions python-checks/src/test/resources/checks/undeclaredNameUsage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,4 @@ def foo(param):
print(f'{foo(param=3)}') # OK, param is a keyword argument

print(f'{foo(param)}') # Noncompliant
# ^^^^^
4 changes: 2 additions & 2 deletions python-frontend/src/main/java/org/sonar/python/tree/PythonTreeMaker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
import javax.annotation.Nullable;
import org.sonar.plugins.python.api.tree.AliasedName;
import org.sonar.plugins.python.api.tree.AnnotatedAssignment;
import org.sonar.plugins.python.api.tree.Argument;
import org.sonar.plugins.python.api.tree.AnyParameter;
import org.sonar.plugins.python.api.tree.ArgList;
import org.sonar.plugins.python.api.tree.Argument;
import org.sonar.plugins.python.api.tree.AssertStatement;
import org.sonar.plugins.python.api.tree.AssignmentStatement;
import org.sonar.plugins.python.api.tree.BreakStatement;
Expand Down Expand Up @@ -1321,7 +1321,7 @@ private static void updateTokensLineAndColumn(Token token, int startOfLiteral, L
}
int newline = (line - 1) + token.line();
// update token line and column with offset of string element.
TreeUtils.tokens(exp).forEach(t -> ((TokenImpl) t).setLineColumn(newline, col));
TreeUtils.tokens(exp).forEach(t -> ((TokenImpl) t).setLineColumn(newline, col + t.column()));
if (exp.is(Tree.Kind.STRING_LITERAL)) {
((StringLiteral) exp).stringElements().forEach(PythonTreeMaker::adjustNestedInterpolations);
}
Expand Down
1 change: 1 addition & 0 deletions sonar-python-plugin/src/test/java/org/sonar/plugins/python/SymbolVisitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public void symbol_visitor() {
verifyUsages(30, 11, reference(30, 1, 30, 4));
verifyUsages(34, 0, reference(35, 42, 35, 43), reference(38, 1, 38, 2),
reference(41, 10, 41, 11), reference(41, 36, 41, 37));
verifyUsages(43, 61, reference(43, 54, 43, 55));
}

private void verifyUsages(int line, int offset, TextRange... trs) {
Expand Down
2 changes: 2 additions & 0 deletions sonar-python-plugin/src/test/resources/org/sonar/plugins/python/sensor/symbolVisitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ def other_func(self):

nested = f'some: {f"nested interpolation：\
{u} and then some {f"more {u}"}"}'

f"symbol created and used inside interpolation: {[len(x) for x in []]}"