Skip to content

Fix various NPEs caused by dynamically computed method calls #1704

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

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+13 −9
Open

Fix various NPEs caused by dynamically computed method calls #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc969f8
Fix NPEs in CompletionVisitor when visiting dynamic method calls
ljfa-ag Sep 3, 2025
42b9e7b
Also fix NPEs in DocumentSymbolVisitor
ljfa-ag Sep 3, 2025
a63ec10
Also fix NPE for dynamic method calls in dependencies block
ljfa-ag Sep 3, 2025
f67a040
Don't show 'null' in the symbol outline for dynamic calls
ljfa-ag Sep 3, 2025
67d8f3e
Return empty completion list if containing method call is dynamic
ljfa-ag Sep 3, 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
9 changes: 5 additions & 4 deletions gradle-language-server/src/main/java/com/microsoft/gradle/compile/CompletionVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,14 @@ public void visitModule(ModuleNode node) {
@Override
public void visitMethodCallExpression(MethodCallExpression node) {
this.methodCalls.get(this.currentUri).add(node);
if (node.getMethodAsString().equals("dependencies")) {
String methodName = node.getMethodAsString();
if ("dependencies".equals(methodName)) {
this.dependencies.get(this.currentUri).addAll(getDependencies(node));
} else if (node.getMethodAsString().equals("plugins")) {
} else if ("plugins".equals(methodName)) {
// match plugins { id: ${id} }
List<String> plugins = getPluginFromPlugins(node);
this.plugins.get(this.currentUri).addAll(plugins);
} else if (node.getMethodAsString().equals("apply")) {
} else if ("apply".equals(methodName)) {
// match apply plugins: '${id}'
String plugin = getPluginFromApply(node);
if (plugin != null) {
Expand Down Expand Up @@ -203,7 +204,7 @@ private List<String> getPluginFromPlugins(MethodCallExpression node) {
if (argument instanceof ArgumentListExpression) {
List<Expression> expressions = ((ArgumentListExpression) argument).getExpressions();
for (Expression expression : expressions) {
if (expression instanceof ConstantExpression && node.getMethodAsString().equals("id")) {
if (expression instanceof ConstantExpression && "id".equals(node.getMethodAsString())) {
results.add(expression.getText());
} else if (expression instanceof ClosureExpression) {
Statement code = ((ClosureExpression) expression).getCode();
Expand Down
10 changes: 5 additions & 5 deletions gradle-language-server/src/main/java/com/microsoft/gradle/compile/DocumentSymbolVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ private DocumentSymbol getDocumentSymbol(MethodCallExpression expression) {
}
symbol.setSelectionRange(LSPUtils.toRange(expression));
symbol.setRange(LSPUtils.toRange(expression));
if (expression.getMethodAsString().equals("dependencies")) {
if ("dependencies".equals(expression.getMethodAsString())) {
List<DocumentSymbol> dependencySymbols = getDependencies(expression);
symbol.setChildren(dependencySymbols);
this.dependencies.get(currentUri).addAll(dependencySymbols);
Expand All @@ -131,7 +131,7 @@ private String getSymbolName(MethodCallExpression expression) {
builder.append(objectText);
builder.append(".");
}
builder.append(expression.getMethodAsString());
builder.append(expression.getMethod().getText());
Expression arguments = expression.getArguments();
if (arguments instanceof ArgumentListExpression) {
List<Expression> expressions = ((ArgumentListExpression) arguments).getExpressions();
Expand All @@ -149,7 +149,7 @@ private String getSymbolName(MethodCallExpression expression) {
StringBuilder builder = new StringBuilder();
builder.append(getSymbolName((PropertyExpression) objectExpression));
builder.append(".");
builder.append(expression.getMethodAsString());
builder.append(expression.getMethod().getText());
return builder.toString();
}
return null;
Expand Down Expand Up @@ -205,12 +205,12 @@ private String getSymbolDetail(MethodCallExpression expression) {

private List<DocumentSymbol> getDependencies(MethodCallExpression expression) {
Expression argument = expression.getArguments();
if (expression.getMethodAsString().equals("dependencies")) {
String name = expression.getMethod().getText();
if ("dependencies".equals(name)) {
return getDependencies((ArgumentListExpression) argument);
}
List<DocumentSymbol> results = new ArrayList<>();
DocumentSymbol symbol = new DocumentSymbol();
String name = expression.getMethodAsString();
symbol.setName(name);
String detail = getDetail(expression);
if (detail != null) {
Expand Down
3 changes: 3 additions & 0 deletions gradle-language-server/src/main/java/com/microsoft/gradle/handlers/CompletionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ public List<CompletionItem> getCompletionItems(MethodCallExpression containingCa
results.addAll(getCompletionItemsFromExtClosures(resolver, projectPath, resultSet));
} else {
String methodName = containingCall.getMethodAsString();
if (methodName == null) {
return Collections.emptyList();
}
List<CompletionItem> re = getCompletionItemsFromExtClosures(resolver, projectPath, methodName, resultSet);
results.addAll(re);
List<String> delegates = GradleDelegate.getDelegateMap().get(methodName);
Expand Down