From c6a1ea504e294e8fb8aad316a05eb01fe51d0579 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 28 Oct 2015 13:58:34 +0100 Subject: [PATCH] less repetitive class+member names in second smart completion code (IDEA-CR-6176) --- .../codeInsight/completion/ArrayMemberAccess.java | 8 ++++---- .../completion/ChainedCallCompletion.java | 8 ++++---- .../codeInsight/completion/FromArrayConversion.java | 12 ++++++------ .../ReferenceExpressionCompletionContributor.java | 2 +- .../completion/SlowerTypeConversions.java | 8 ++++---- .../codeInsight/completion/ToArrayConversion.java | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ArrayMemberAccess.java b/java/java-impl/src/com/intellij/codeInsight/completion/ArrayMemberAccess.java index 1aa48f78a47f..9847eac60ede 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ArrayMemberAccess.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ArrayMemberAccess.java @@ -33,9 +33,9 @@ import static com.intellij.codeInsight.completion.ReferenceExpressionCompletionC * @author peter */ class ArrayMemberAccess { - static void addArrayMemberAccessors(final PsiElement element, final String prefix, final PsiType itemType, - final PsiElement qualifier, final Consumer result, PsiModifierListOwner object, - final PsiType expectedType) + static void addMemberAccessors(final PsiElement element, final String prefix, final PsiType itemType, + final PsiElement qualifier, final Consumer result, PsiModifierListOwner object, + final PsiType expectedType) throws IncorrectOperationException { if (itemType instanceof PsiArrayType && expectedType.isAssignableFrom(((PsiArrayType)itemType).getComponentType())) { final PsiExpression conversion = createExpression(getQualifierText(qualifier) + prefix + "[0]", element); @@ -54,7 +54,7 @@ class ArrayMemberAccess { } @Nullable - static ExpressionLookupItem getSingleArrayElementAccess(PsiElement element, LookupElement item) { + static ExpressionLookupItem accessFirstElement(PsiElement element, LookupElement item) { if (item.getObject() instanceof PsiLocalVariable) { final PsiLocalVariable variable = (PsiLocalVariable)item.getObject(); final PsiType type = variable.getType(); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ChainedCallCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/ChainedCallCompletion.java index ba69c9d9632c..b497d44797da 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ChainedCallCompletion.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ChainedCallCompletion.java @@ -38,10 +38,10 @@ class ChainedCallCompletion { StandardPatterns.string().oneOf("hashCode", "equals", "finalize", "wait", "notify", "notifyAll", "getClass", "clone", "toString")). definedInClass(CommonClassNames.JAVA_LANG_OBJECT); - static void addChainedCallVariants(final PsiElement place, LookupElement qualifierItem, - final Consumer result, - PsiType qualifierType, - final PsiType expectedType, JavaSmartCompletionParameters parameters) throws + static void addChains(final PsiElement place, LookupElement qualifierItem, + final Consumer result, + PsiType qualifierType, + final PsiType expectedType, JavaSmartCompletionParameters parameters) throws IncorrectOperationException { final Object object = qualifierItem.getObject(); if (OBJECT_METHOD_PATTERN.accepts(object) && !allowGetClass(object, parameters)) { diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/FromArrayConversion.java b/java/java-impl/src/com/intellij/codeInsight/completion/FromArrayConversion.java index 67115bf32933..cd99db124c39 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/FromArrayConversion.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/FromArrayConversion.java @@ -36,12 +36,12 @@ import static com.intellij.codeInsight.completion.ReferenceExpressionCompletionC * @author peter */ class FromArrayConversion { - static void addConversionsFromArray(final PsiElement element, - final String prefix, - final PsiType itemType, - final Consumer result, - @Nullable PsiElement qualifier, - final PsiType expectedType) throws IncorrectOperationException { + static void addConversions(final PsiElement element, + final String prefix, + final PsiType itemType, + final Consumer result, + @Nullable PsiElement qualifier, + final PsiType expectedType) throws IncorrectOperationException { final String methodName = getArraysConversionMethod(itemType, expectedType); if (methodName == null) return; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java index 4b359b951589..aae7f356b6d9 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java @@ -108,7 +108,7 @@ public class ReferenceExpressionCompletionContributor { final Set base = JavaSmartCompletionContributor.completeReference(element, reference, filter, false, true, parameters.getParameters(), PrefixMatcher.ALWAYS_TRUE); for (final LookupElement item : new LinkedHashSet(base)) { - ExpressionLookupItem access = ArrayMemberAccess.getSingleArrayElementAccess(element, item); + ExpressionLookupItem access = ArrayMemberAccess.accessFirstElement(element, item); if (access != null) { base.add(access); PsiType type = access.getType(); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/SlowerTypeConversions.java b/java/java-impl/src/com/intellij/codeInsight/completion/SlowerTypeConversions.java index 7e076d0c44f5..982cf2c8924c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/SlowerTypeConversions.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/SlowerTypeConversions.java @@ -108,16 +108,16 @@ class SlowerTypeConversions implements Runnable { final PsiElement qualifier = element1 instanceof PsiJavaCodeReferenceElement ? ((PsiJavaCodeReferenceElement)element1).getQualifier() : null; final PsiType expectedType = parameters.getExpectedType(); - ChainedCallCompletion.addChainedCallVariants(element, baseItem, result, itemType, expectedType, parameters); + ChainedCallCompletion.addChains(element, baseItem, result, itemType, expectedType, parameters); final String prefix = getItemText(object); if (prefix == null) return; - FromArrayConversion.addConversionsFromArray(element, prefix, itemType, result, qualifier, expectedType); + FromArrayConversion.addConversions(element, prefix, itemType, result, qualifier, expectedType); - ToArrayConversion.addToArrayConversions(element, object, prefix, itemType, result, qualifier, expectedType); + ToArrayConversion.addConversions(element, object, prefix, itemType, result, qualifier, expectedType); - ArrayMemberAccess.addArrayMemberAccessors(element, prefix, itemType, qualifier, result, (PsiModifierListOwner)object, expectedType); + ArrayMemberAccess.addMemberAccessors(element, prefix, itemType, qualifier, result, (PsiModifierListOwner)object, expectedType); } catch (IncorrectOperationException ignored) { } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ToArrayConversion.java b/java/java-impl/src/com/intellij/codeInsight/completion/ToArrayConversion.java index 0365e8a7a820..c4b0e12da1f2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ToArrayConversion.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ToArrayConversion.java @@ -36,9 +36,9 @@ import static com.intellij.codeInsight.completion.ReferenceExpressionCompletionC * @author peter */ public class ToArrayConversion { - static void addToArrayConversions(final PsiElement element, final Object object, final String prefix, final PsiType itemType, - final Consumer result, @Nullable final PsiElement qualifier, - final PsiType expectedType) { + static void addConversions(final PsiElement element, final Object object, final String prefix, final PsiType itemType, + final Consumer result, @Nullable final PsiElement qualifier, + final PsiType expectedType) { final String callSpace = getSpace(CodeStyleSettingsManager.getSettings(element.getProject()).SPACE_WITHIN_METHOD_CALL_PARENTHESES); final PsiType componentType = PsiUtil.extractIterableTypeParameter(itemType, true); if (componentType == null || !(expectedType instanceof PsiArrayType)) return;