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

diagnostics for groovy type inference NPE

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-04-06 10:21:22 +04:00
parent 8283bd828d
commit 0d7fe0196f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/TypeInferenceHelper.java
+6 -2
View File
@@ -134,7 +134,7 @@ public class TypeInferenceHelper {
}
@Nullable
private static PsiType getInferredType(String varName, Instruction instruction, Instruction[] flow, GrControlFlowOwner scope) {
private static PsiType getInferredType(@NotNull String varName, @NotNull Instruction instruction, @NotNull Instruction[] flow, @NotNull GrControlFlowOwner scope) {
final Pair<ReachingDefinitionsDfaInstance, List<TIntObjectHashMap<TIntHashSet>>> pair = getDefUseMaps(scope);
List<TIntObjectHashMap<TIntHashSet>> dfaResult = pair.second;
@@ -216,7 +216,11 @@ public class TypeInferenceHelper {
@Override
@Nullable
public PsiType compute() {
final PsiType original = getInferredType(instruction.getVariableName(), instruction.getInstructionToMixin(flow), flow, scope);
String varName = instruction.getVariableName();
LOG.assertTrue(varName != null, scope.getText());
ReadWriteVariableInstruction originalInstr = instruction.getInstructionToMixin(flow);
LOG.assertTrue(originalInstr != null, scope.getText());
final PsiType original = getInferredType(varName, originalInstr, flow, scope);
final PsiType mixin = instruction.inferMixinType();
if (mixin == null) return original;
if (original == null) return mixin;