From 45c2a91bcd87e08054b0b4db1a1afac1a1c128ee Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 26 Jun 2012 12:55:31 +0200 Subject: [PATCH] debugging com.intellij.codeInsight.daemon.quickFix.CreateFieldFromUsageTest.testSortByRelevance --- .../daemon/impl/quickfix/CreateFromUsageUtils.java | 12 ++++++++++++ .../codeInsight/intention/impl/TypeExpression.java | 9 +++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java index 456812925a0d..e8abc91559e8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java @@ -622,6 +622,13 @@ public class CreateFromUsageUtils { List expectedFieldNames = new ArrayList(); getExpectedInformation(expression, typesList, expectedMethodNames, expectedFieldNames); + if (CreateFieldFromUsageFix.DEBUG) { + System.out.println("CreateFromUsageUtils.guessExpectedTypes"); + for (ExpectedTypeInfo[] infos : typesList) { + System.out.println("Arrays.toString(infos) = " + Arrays.toString(infos)); + } + } + if (typesList.size() == 1 && (!expectedFieldNames.isEmpty() || !expectedMethodNames.isEmpty())) { ExpectedTypeInfo[] infos = typesList.get(0); @@ -797,6 +804,11 @@ public class CreateFromUsageUtils { ProgressManager.checkCanceled(); PsiClass aClass = member.getContainingClass(); if (aClass instanceof PsiAnonymousClass || aClass == null) continue; + if (CreateFieldFromUsageFix.DEBUG) { + System.out.println("CreateFromUsageUtils.addMemberInfo"); + System.out.println("member = " + member); + System.out.println("aClass = " + aClass); + } if (facade.getResolveHelper().isAccessible(member, expression, null)) { PsiClassType type; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java index 25aed8ce4cc8..804ba2452b45 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java @@ -15,7 +15,6 @@ */ package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInsight.daemon.impl.quickfix.CreateFieldFromUsageFix; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.PsiTypeLookupItem; import com.intellij.codeInsight.template.Expression; @@ -26,7 +25,9 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.psi.*; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; public class TypeExpression extends Expression { private final LinkedHashSet myItems; @@ -34,10 +35,6 @@ public class TypeExpression extends Expression { public TypeExpression(final Project project, PsiType[] types) { final SmartTypePointerManager manager = SmartTypePointerManager.getInstance(project); myItems = new LinkedHashSet(); - if (CreateFieldFromUsageFix.DEBUG) { - System.out.println("TypeExpression.TypeExpression"); - System.out.println("types = " + Arrays.toString(types)); - } for (final PsiType type : types) { myItems.add(manager.createSmartTypePointer(type)); }