From 22c80d2694e8b89af8c69ea8f0c9e368b59d13b8 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 14 Oct 2014 12:41:30 +0400 Subject: [PATCH] moved structure view to to idea-analysis to make available in upsource --- .../org/jetbrains/jet/plugin/JetDescriptorIconProvider.java | 0 .../jet/plugin/structureView/JetStructureViewElement.java | 0 .../jet/plugin/structureView/JetStructureViewFactory.java | 0 .../jet/plugin/structureView/JetStructureViewModel.java | 0 .../structureView/KotlinInheritedMembersNodeProvider.kt | 4 ++++ .../structureView/KotlinStructureElementPresentation.java | 0 6 files changed, 4 insertions(+) rename idea/{ => idea-analysis}/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java (100%) rename idea/{ => idea-analysis}/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java (100%) rename idea/{ => idea-analysis}/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java (100%) rename idea/{ => idea-analysis}/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java (100%) rename idea/{ => idea-analysis}/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt (92%) rename idea/{ => idea-analysis}/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java (100%) diff --git a/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java similarity index 100% rename from idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java similarity index 100% rename from idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java similarity index 100% rename from idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java similarity index 100% rename from idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt index f83ea7f9342..1bc6aee46f2 100644 --- a/idea/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt @@ -18,11 +18,15 @@ package org.jetbrains.jet.plugin.structureView import com.intellij.ide.util.treeView.smartTree.TreeElement import com.intellij.ide.util.InheritedMembersNodeProvider +import com.intellij.ide.util.treeView.smartTree.TreeElement +import org.jetbrains.jet.lang.psi.JetClassOrObject +import com.intellij.psi.NavigatablePsiElement import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.lang.psi.JetDeclaration import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache +import org.jetbrains.jet.lang.resolve.BindingContext import java.util.ArrayList import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import com.intellij.psi.NavigatablePsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java similarity index 100% rename from idea/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java