[java] .class file structure view by decompiled code (IDEA-140784, IDEA-140786)

java/java-structure-view/src/com/intellij/ide/highlighter/JavaClsStructureViewBuilderProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 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.
@@ -17,18 +17,12 @@ package com.intellij.ide.highlighter;
 
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.ide.structureView.StructureViewBuilderProvider;
-import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.ide.structureView.TreeBasedStructureViewBuilder;
-import com.intellij.ide.structureView.impl.java.JavaFileTreeModel;
-import com.intellij.lang.Language;
 import com.intellij.lang.LanguageStructureViewBuilder;
 import com.intellij.lang.PsiStructureViewFactory;
-import com.intellij.lang.java.JavaLanguage;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiClassOwner;
+import com.intellij.psi.PsiCompiledFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import org.jetbrains.annotations.NotNull;
@@ -41,28 +35,21 @@ public class JavaClsStructureViewBuilderProvider implements StructureViewBuilder
   @Override
   @Nullable
   public StructureViewBuilder getStructureViewBuilder(@NotNull FileType fileType, @NotNull VirtualFile file, @NotNull Project project) {
-    final PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
+    if (fileType == JavaClassFileType.INSTANCE) {
+      PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
 
-    if (fileType == JavaClassFileType.INSTANCE && psiFile != null) {
-      Language language = psiFile.getLanguage();
-      if (language != JavaLanguage.INSTANCE) {
-        PsiStructureViewFactory factory = LanguageStructureViewBuilder.INSTANCE.forLanguage(language);
+      if (psiFile instanceof PsiCompiledFile) {
+        psiFile = ((PsiCompiledFile)psiFile).getDecompiledPsiFile();
+      }
+
+      if (psiFile != null) {
+        PsiStructureViewFactory factory = LanguageStructureViewBuilder.INSTANCE.forLanguage(psiFile.getLanguage());
         if (factory != null) {
           return factory.getStructureViewBuilder(psiFile);
         }
       }
     }
 
-    if (psiFile instanceof PsiClassOwner) {
-      return new TreeBasedStructureViewBuilder() {
-        @Override
-        @NotNull
-        public StructureViewModel createStructureViewModel(@Nullable Editor editor) {
-          return new JavaFileTreeModel((PsiClassOwner)psiFile, editor);
-        }
-      };
-    }
-
     return null;
   }
 }

plugins/java-decompiler/plugin/test/org/jetbrains/java/decompiler/IdeaDecompilerTest.kt

@@ -19,11 +19,17 @@ import com.intellij.codeInsight.daemon.impl.IdentifierHighlighterPassFactory
 import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction
 import com.intellij.execution.filters.LineNumbersMapping
 import com.intellij.ide.highlighter.ArchiveFileType
+import com.intellij.ide.structureView.StructureViewBuilder
+import com.intellij.ide.structureView.impl.java.JavaAnonymousClassesNodeProvider
+import com.intellij.ide.structureView.newStructureView.StructureViewComponent
+import com.intellij.ide.util.treeView.AbstractTreeNode
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.PluginPathManager
 import com.intellij.openapi.fileEditor.FileDocumentManager
+import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.fileTypes.StdFileTypes
 import com.intellij.openapi.progress.ProcessCanceledException
+import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.util.registry.RegistryValue
@@ -157,6 +163,32 @@ class IdeaDecompilerTest : LightCodeInsightFixtureTestCase() {
     catch (ignored: ProcessCanceledException) { }
   }
 
+  fun testStructureView() {
+    val file = getTestFile("StructureView.class")
+    file.parent.children ; file.parent.refresh(false, true)  // inner classes
+
+    val editor = FileEditorManager.getInstance(project).openFile(file, false)[0]
+    val builder = StructureViewBuilder.PROVIDER.getStructureViewBuilder(StdFileTypes.CLASS, file, project)!!
+    val viewComponent = builder.createStructureView(editor, project) as StructureViewComponent
+    Disposer.register(testRootDisposable, viewComponent)
+    viewComponent.setActionActive(JavaAnonymousClassesNodeProvider.ID, true)
+
+    val treeStructure = viewComponent.treeStructure
+    PlatformTestUtil.updateRecursively(treeStructure.rootElement as AbstractTreeNode<*>)
+    PlatformTestUtil.assertTreeStructureEquals(treeStructure, """
+      StructureView.java
+       StructureView
+        B
+         B()
+         build(int): StructureView
+          $1
+           class initializer
+        StructureView()
+        getData(): int
+        setData(int): void
+        data: int""".trimIndent())
+  }
+
 
   private fun getTestFile(name: String): VirtualFile {
     val path = if (FileUtil.isAbsolute(name)) name else "${myFixture.testDataPath}/${name}"

plugins/java-decompiler/plugin/testData/StructureView.java

@@ -0,0 +1,19 @@
+class StructureView {
+  private int data;
+
+  public final int getData() {
+    return data;
+  }
+
+  protected void setData(int data) {
+    this.data = data;
+  }
+
+  public static class B {
+    public static StructureView build(int data) {
+      return new StructureView() {
+        { setData(data); }
+      };
+    }
+  }
+}