MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

NPE

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-04-21 20:25:27 +04:00
parent 8e3281caa0
commit 549a652aea
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataReferenceCollector.java
+4 -2
View File
@@ -16,6 +16,7 @@
package com.intellij.testAssistant;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.NullableComputable;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.testFramework.UsefulTestCase;
@@ -90,7 +91,7 @@ public class TestDataReferenceCollector {
final PsiExpression[] arguments = expression.getArgumentList().getExpressions();
for (int i = 0; i < arguments.length && i < parameters.length; i++) {
final int finalI = i;
result.put(parameters [i].getName(), new Computable<String>() {
result.put(parameters [i].getName(), new NullableComputable<String>() {
public String compute() {
return evaluate(arguments [finalI], Collections.<String, Computable<String>>emptyMap());
}
@@ -121,7 +122,8 @@ public class TestDataReferenceCollector {
final PsiElement result = ((PsiReferenceExpression)expression).resolve();
if (result instanceof PsiParameter) {
final String name = ((PsiParameter)result).getName();
return arguments.get(name).compute();
final Computable<String> arg = arguments.get(name);
return arg == null ? null : arg.compute();
}
if (result instanceof PsiVariable) {
final PsiExpression initializer = ((PsiVariable)result).getInitializer();