From dc2649d3dddc279c12903cbde196eda67b6b6ba7 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 2 Sep 2016 14:32:54 +0300 Subject: [PATCH] Cleanup (formatting; warnings) --- .../quickfix/ArgumentFixerActionFactory.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java index 78f94f8ae52a..026709f05226 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,9 +44,10 @@ public abstract class ArgumentFixerActionFactory { if (candidates.length == 0) return; List methodCandidates = new ArrayList<>(Arrays.asList(candidates)); PsiExpressionList list = call.getArgumentList(); + if (list == null) return; PsiExpression[] expressions = list.getExpressions(); if (expressions.length == 0) return; - // filter out not castable candidates + // filter out not cast-able candidates nextMethod: for (int i = methodCandidates.size() - 1; i >= 0; i--) { CandidateInfo candidate = methodCandidates.get(i); @@ -83,7 +84,6 @@ public abstract class ArgumentFixerActionFactory { for (CandidateInfo candidate : methodCandidates) { PsiMethod method = (PsiMethod)candidate.getElement(); PsiSubstitutor substitutor = candidate.getSubstitutor(); - assert method != null; PsiParameter[] parameters = method.getParameterList().getParameters(); PsiType originalParameterType = parameters[i].getType(); PsiType parameterType = substitutor.substitute(originalParameterType); @@ -101,7 +101,9 @@ public abstract class ArgumentFixerActionFactory { PsiCall newCall = (PsiCall) call.copy(); PsiExpression modifiedExpression = getModifiedArgument(expression, parameterType); if (modifiedExpression == null) continue; - newCall.getArgumentList().getExpressions()[i].replace(modifiedExpression); + PsiExpressionList argumentList = newCall.getArgumentList(); + if (argumentList == null) continue; + argumentList.getExpressions()[i].replace(modifiedExpression); JavaResolveResult resolveResult = newCall.resolveMethodGenerics(); if (resolveResult.getElement() != null && resolveResult.isValidResult()) { suggestedCasts.add(parameterType.getCanonicalText()); @@ -115,8 +117,7 @@ public abstract class ArgumentFixerActionFactory { } } - public abstract boolean areTypesConvertible(@NotNull final PsiType exprType, @NotNull final PsiType parameterType, @NotNull final PsiElement context); + public abstract boolean areTypesConvertible(@NotNull PsiType exprType, @NotNull PsiType parameterType, @NotNull PsiElement context); - public abstract MethodArgumentFix createFix(final PsiExpressionList list, final int i, final PsiType parameterType); - -} + public abstract MethodArgumentFix createFix(PsiExpressionList list, int i, PsiType parameterType); +} \ No newline at end of file