From d1e43d6482564e92956173f0edc38a07b73a2e06 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 22 Sep 2014 20:23:12 +0400 Subject: [PATCH] Create Function From Usage: Move "Create function from usage"-related classes to separate package --- .../plugin/quickfix/QuickFixRegistrar.java | 2 +- .../jet/plugin/quickfix/QuickFixUtil.java | 30 ---------------- .../ClassCandidateListCellRenderer.java | 35 +++++++++++++++++++ .../CreateComponentFunctionActionFactory.kt | 2 +- .../CreateFunctionFromUsageFix.kt | 5 +-- .../CreateGetFunctionActionFactory.kt | 2 +- .../CreateHasNextFunctionActionFactory.kt | 2 +- .../CreateIteratorFunctionActionFactory.kt | 2 +- .../CreateNextFunctionActionFactory.kt | 2 +- .../CreateSetFunctionActionFactory.kt | 2 +- 10 files changed, 45 insertions(+), 39 deletions(-) create mode 100644 idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/ClassCandidateListCellRenderer.java rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{ => createFunction}/CreateComponentFunctionActionFactory.kt (96%) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{ => createFunction}/CreateFunctionFromUsageFix.kt (99%) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{ => createFunction}/CreateGetFunctionActionFactory.kt (93%) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{ => createFunction}/CreateHasNextFunctionActionFactory.kt (94%) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{ => createFunction}/CreateIteratorFunctionActionFactory.kt (96%) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{ => createFunction}/CreateNextFunctionActionFactory.kt (94%) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{ => createFunction}/CreateSetFunctionActionFactory.kt (95%) diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java index 3198faf5c66..6c5c8b0e4d4 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.quickfix; import org.jetbrains.jet.lang.psi.JetClass; import org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler; -import org.jetbrains.jet.plugin.quickfix.createFromUsage.*; +import org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction.*; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lexer.JetTokens.*; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java index 981dce36286..c9a38dc9022 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.plugin.quickfix; import com.google.common.collect.Sets; import com.intellij.extapi.psi.ASTDelegatePsiElement; -import com.intellij.ide.util.PsiElementListCellRenderer; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiWhiteSpace; @@ -39,12 +38,8 @@ import org.jetbrains.jet.lang.types.DeferredType; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.plugin.presentation.JetClassPresenter; -import org.jetbrains.jet.plugin.quickfix.createFromUsage.ClassCandidate; import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; -import javax.swing.*; -import java.awt.*; import java.util.Set; public class QuickFixUtil { @@ -200,29 +195,4 @@ public class QuickFixUtil { return usedParameters; } - - public static class ClassCandidateListCellRenderer extends PsiElementListCellRenderer { - private final JetClassPresenter presenter = new JetClassPresenter(); - - @Override - public String getElementText(JetClass element) { - return presenter.getPresentation(element).getPresentableText(); - } - - @Nullable - @Override - protected String getContainerText(JetClass element, String name) { - return presenter.getPresentation(element).getLocationString(); - } - - @Override - protected int getIconFlags() { - return 0; - } - - @Override - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - return super.getListCellRendererComponent(list, ((ClassCandidate) value).getJetClass(), index, isSelected, cellHasFocus); - } - } } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/ClassCandidateListCellRenderer.java b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/ClassCandidateListCellRenderer.java new file mode 100644 index 00000000000..c52a2cf9485 --- /dev/null +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/ClassCandidateListCellRenderer.java @@ -0,0 +1,35 @@ +package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction; + +import com.intellij.ide.util.PsiElementListCellRenderer; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.psi.JetClass; +import org.jetbrains.jet.plugin.presentation.JetClassPresenter; + +import javax.swing.*; +import java.awt.*; + +class ClassCandidateListCellRenderer extends PsiElementListCellRenderer { + private final JetClassPresenter presenter = new JetClassPresenter(); + + @Override + public String getElementText(@NotNull JetClass element) { + return presenter.getPresentation(element).getPresentableText(); + } + + @Nullable + @Override + protected String getContainerText(JetClass element, String name) { + return presenter.getPresentation(element).getLocationString(); + } + + @Override + protected int getIconFlags() { + return 0; + } + + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + return super.getListCellRendererComponent(list, ((ClassCandidate) value).getJetClass(), index, isSelected, cellHasFocus); + } +} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateComponentFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateComponentFunctionActionFactory.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt index 42df188900c..1e1e42e0221 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateComponentFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage +package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFunctionFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFunctionFromUsageFix.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt index cbf1b64e1bc..6b80ee6a17c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFunctionFromUsageFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix.createFromUsage +package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementBuilder @@ -65,6 +65,7 @@ import java.util.Properties import org.jetbrains.jet.plugin.caches.resolve.getAnalysisResults import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList" private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt" @@ -539,7 +540,7 @@ public class CreateFunctionFromUsageFix internal ( else { // class selection val list = JBList(ownerTypeCandidates.map { ClassCandidate(it, currentFile) }) - val renderer = QuickFixUtil.ClassCandidateListCellRenderer() + val renderer = ClassCandidateListCellRenderer() list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION) list.setCellRenderer(renderer) val builder = PopupChooserBuilder(list) diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateGetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateGetFunctionActionFactory.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt index 6ea7ab186d4..b93dc7f37b9 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateGetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage +package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateHasNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateHasNextFunctionActionFactory.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt index 078558c3a7a..412284597bd 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateHasNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage +package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateIteratorFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateIteratorFunctionActionFactory.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt index d61d60ddadf..fc3ec6b07ed 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateIteratorFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage +package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateNextFunctionActionFactory.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt index 862ebdbcc55..c73dd197bd2 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage +package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateSetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateSetFunctionActionFactory.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt index f15611048cb..a23d2c23ae5 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateSetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage +package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic