MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

move PSI Viewer from DevKit to com.intellij.dev plugin

Browse Source 
- include `intellij.dev.psiViewer` module into the `com.intellij.dev` plugin content;
- `intellij.dev` module has runtime dependency on `intellij.dev.psiViewer` module to enable all modules, which depend on
 `intellij.dev`, to automatically get `intellij.dev.psiViewer` in the classpath.

GitOrigin-RevId: dea46acead05302351962bcd07401521a00880f0
This commit is contained in:
Daniil Ovchinnikov
2022-04-19 17:46:51 +02:00
committed by intellij-monorepo-bot
parent 02fc17914c
commit 263b7d19ea
34 changed files with 68 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/modules.xml generated
View File

@@ -517,6 +517,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/cucumber-jvm-formatter5/intellij.cucumber.jvmFormatter5.iml" filepath="$PROJECT_DIR$/plugins/cucumber-jvm-formatter5/intellij.cucumber.jvmFormatter5.iml" />
<module fileurl="file://$PROJECT_DIR$/build/cucumber-test-runner/intellij.cucumber.testRunner.iml" filepath="$PROJECT_DIR$/build/cucumber-test-runner/intellij.cucumber.testRunner.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/intellij.dev/intellij.dev.iml" filepath="$PROJECT_DIR$/plugins/intellij.dev/intellij.dev.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/intellij.dev.psiViewer/intellij.dev.psiViewer.iml" filepath="$PROJECT_DIR$/plugins/intellij.dev.psiViewer/intellij.dev.psiViewer.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit/intellij.devkit.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit/intellij.devkit.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit-core/intellij.devkit.core.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit-core/intellij.devkit.core.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.git/intellij.devkit.git.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.git/intellij.devkit.git.iml" />
@@ -528,7 +529,6 @@
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/jps-plugin/intellij.devkit.jps.iml" filepath="$PROJECT_DIR$/plugins/devkit/jps-plugin/intellij.devkit.jps.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.psiviewer/intellij.devkit.psiviewer.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.psiviewer/intellij.devkit.psiviewer.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml" />

2
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
View File

@@ -151,6 +151,7 @@ final class CommunityRepositoryModules {
withProjectLibrary("TestNG")
},
plugin("intellij.dev") {
withModule("intellij.dev.psiViewer")
},
plugin("intellij.devkit") {
withModule("intellij.devkit.core")
@@ -160,7 +161,6 @@ final class CommunityRepositoryModules {
withModule("intellij.devkit.i18n")
withModule("intellij.devkit.images")
withModule("intellij.devkit.intelliLang")
withModule("intellij.devkit.psiviewer")
withModule("intellij.devkit.uiDesigner")
withModule("intellij.java.devkit")
withModule("intellij.groovy.devkit")

1
plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.iml
View File

@@ -11,7 +11,6 @@
<orderEntry type="module" module-name="intellij.devkit.i18n" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.devkit.images" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.devkit.intelliLang" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.devkit.psiviewer" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.devkit.themes" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.devkit.uiDesigner" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.devkit" scope="RUNTIME" />

16
plugins/devkit/intellij.devkit.psiviewer/resources/intellij.devkit.psiviewer.xml
View File

@@ -1,16 +0,0 @@
<idea-plugin package="org.jetbrains.idea.devkit.psiviewer">
<resource-bundle>messages.DevKitPsiViewerBundle</resource-bundle>
<extensionPoints>
<extensionPoint qualifiedName="com.intellij.devkit.psiviewer.extension" dynamic="true"
interface="org.jetbrains.idea.devkit.psiviewer.PsiViewerExtension"/>
</extensionPoints>
<actions>
<group id="Devkit.PsiViewerActions">
<separator/>
<action id="PsiViewer" class="org.jetbrains.idea.devkit.psiviewer.PsiViewerAction"/>
<action id="PsiViewerForContext" class="org.jetbrains.idea.devkit.psiviewer.PsiViewerAction$ForContext"/>
<separator/>
<add-to-group group-id="ToolsMenu" anchor="first"/>
</group>
</actions>
</idea-plugin>

1
plugins/devkit/intellij.devkit/resources/META-INF/plugin.xml
View File

@@ -18,7 +18,6 @@
<module name="intellij.devkit.i18n"/>
<module name="intellij.devkit.images"/>
<module name="intellij.devkit.intelliLang"/>
<module name="intellij.devkit.psiviewer"/>
<module name="intellij.devkit.themes"/>
<module name="intellij.devkit.uiDesigner"/>
<module name="intellij.java.devkit"/>

2
plugins/devkit/intellij.java.devkit/intellij.java.devkit.iml
View File

@@ -12,6 +12,6 @@
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.java.psi" />
<orderEntry type="module" module-name="intellij.java.psi.impl" />
<orderEntry type="module" module-name="intellij.devkit.psiviewer" />
<orderEntry type="module" module-name="intellij.dev.psiViewer" />
</component>
</module>

10
plugins/devkit/intellij.java.devkit/resources/intellij.java.devkit.xml
View File

@@ -1,11 +1,11 @@
<idea-plugin package="com.intellij.java.devkit">
<dependencies>
<module name="intellij.devkit.psiviewer"/>
<module name="intellij.dev.psiViewer"/>
<plugin id="com.intellij.java"/>
</dependencies>
<extensions defaultExtensionNs="com.intellij.devkit">
<psiviewer.extension implementation="com.intellij.java.devkit.psiviewer.PsiViewerExpressionExtension"/>
<psiviewer.extension implementation="com.intellij.java.devkit.psiviewer.PsiViewerCodeFragmentExtension"/>
<psiviewer.extension implementation="com.intellij.java.devkit.psiviewer.PsiViewerMethodExtension"/>
<extensions defaultExtensionNs="com.intellij.dev">
<psiViewer.extension implementation="com.intellij.java.devkit.psiViewer.PsiViewerExpressionExtension"/>
<psiViewer.extension implementation="com.intellij.java.devkit.psiViewer.PsiViewerCodeFragmentExtension"/>
<psiViewer.extension implementation="com.intellij.java.devkit.psiViewer.PsiViewerMethodExtension"/>
</extensions>
</idea-plugin>

4
plugins/devkit/intellij.java.devkit/src/psiviewer/JavaPsiViewerExtension.java → plugins/devkit/intellij.java.devkit/src/psiViewer/JavaPsiViewerExtension.java
View File

@@ -1,13 +1,13 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.java.devkit.psiviewer;
package com.intellij.java.devkit.psiViewer;
import com.intellij.dev.psiViewer.PsiViewerExtension;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiElementFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.devkit.psiviewer.PsiViewerExtension;
/**
* @author Konstantin Bulenkov

2
plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerCodeFragmentExtension.java → plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerCodeFragmentExtension.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.java.devkit.psiviewer;
package com.intellij.java.devkit.psiViewer;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;

2
plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerExpressionExtension.java → plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerExpressionExtension.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.java.devkit.psiviewer;
package com.intellij.java.devkit.psiViewer;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;

2
plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerMethodExtension.java → plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerMethodExtension.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.java.devkit.psiviewer;
package com.intellij.java.devkit.psiViewer;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;

2
plugins/devkit/intellij.devkit.psiviewer/intellij.devkit.psiviewer.iml → plugins/intellij.dev.psiViewer/intellij.dev.psiViewer.iml
View File

@@ -4,7 +4,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="org.jetbrains.idea.devkit.psiviewer" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="com.intellij.dev.psiViewer" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

16
plugins/intellij.dev.psiViewer/resources/intellij.dev.psiViewer.xml Normal file
View File

@@ -0,0 +1,16 @@
<idea-plugin package="com.intellij.dev.psiViewer">
<resource-bundle>messages.DevPsiViewerBundle</resource-bundle>
<extensionPoints>
<extensionPoint qualifiedName="com.intellij.dev.psiViewer.extension" dynamic="true"
interface="com.intellij.dev.psiViewer.PsiViewerExtension"/>
</extensionPoints>
<actions>
<group id="Dev.PsiViewerActions">
<separator/>
<action id="PsiViewer" class="com.intellij.dev.psiViewer.PsiViewerAction"/>
<action id="PsiViewerForContext" class="com.intellij.dev.psiViewer.PsiViewerAction$ForContext"/>
<separator/>
<add-to-group group-id="ToolsMenu" anchor="first"/>
</group>
</actions>
</idea-plugin>

0
plugins/devkit/intellij.devkit.psiviewer/resources/messages/DevKitPsiViewerBundle.properties → plugins/intellij.dev.psiViewer/resources/messages/DevPsiViewerBundle.properties
View File

10
plugins/devkit/intellij.devkit.psiviewer/src/DevKitPsiViewerBundle.java → plugins/intellij.dev.psiViewer/src/DevPsiViewerBundle.java
View File

@@ -1,17 +1,17 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.DynamicBundle;
import org.jetbrains.annotations.*;
import java.util.function.Supplier;
final class DevKitPsiViewerBundle {
final class DevPsiViewerBundle {
private static final @NonNls String BUNDLE_FQN = "messages.DevKitPsiViewerBundle";
private static final DynamicBundle BUNDLE = new DynamicBundle(DevKitPsiViewerBundle.class, BUNDLE_FQN);
private static final @NonNls String BUNDLE_FQN = "messages.DevPsiViewerBundle";
private static final DynamicBundle BUNDLE = new DynamicBundle(DevPsiViewerBundle.class, BUNDLE_FQN);
private DevKitPsiViewerBundle() {
private DevPsiViewerBundle() {
}
public static @Nls @NotNull String message(

2
plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerAction.java → plugins/intellij.dev.psiViewer/src/PsiViewerAction.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;

2
plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerDialog.form → plugins/intellij.dev.psiViewer/src/PsiViewerDialog.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.devkit.psiviewer.PsiViewerDialog">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.dev.psiViewer.PsiViewerDialog">
<grid id="80cff" binding="myPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>

12
plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerDialog.java → plugins/intellij.dev.psiViewer/src/PsiViewerDialog.java
View File

@@ -1,7 +1,9 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.codeInsight.documentation.render.DocRenderManager;
import com.intellij.dev.psiViewer.formatter.BlockViewerPsiBasedTree;
import com.intellij.dev.psiViewer.stubs.StubViewerPsiBasedTree;
import com.intellij.ide.util.treeView.NodeRenderer;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
@@ -65,8 +67,6 @@ import com.intellij.util.ui.tree.TreeUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.devkit.psiviewer.formatter.BlockViewerPsiBasedTree;
import org.jetbrains.idea.devkit.psiviewer.stubs.StubViewerPsiBasedTree;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@@ -771,7 +771,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider {
DefaultListModel<String> model = (DefaultListModel<String>)myRefs.getModel();
model.clear();
String progressTitle = DevKitPsiViewerBundle.message("psi.viewer.progress.dialog.update.refs");
String progressTitle = DevPsiViewerBundle.message("psi.viewer.progress.dialog.update.refs");
Callable<List<PsiReference>> updater =
() -> DumbModeAccessType.RELIABLE_DATA_ONLY.ignoreDumbMode(() -> doUpdateReferences(element));
@@ -974,7 +974,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider {
PsiElement rootElement = getTreeStructure().getRootPsiElement();
int baseOffset = rootPsiElement.getTextRange().getStartOffset();
int offset = myEditor.getCaretModel().getOffset() + baseOffset;
String progressDialogTitle = DevKitPsiViewerBundle.message("psi.viewer.progress.dialog.get.element.at.offset");
String progressDialogTitle = DevPsiViewerBundle.message("psi.viewer.progress.dialog.get.element.at.offset");
Callable<PsiElement> finder = () -> InjectedLanguageUtilBase.findElementAtNoCommit(rootElement.getContainingFile(), offset);
PsiElement element = computeSlowOperationsSafeInBgThread(myProject, progressDialogTitle, finder);
@@ -996,7 +996,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider {
int start = selection.getSelectionStart() + baseOffset;
int end = selection.getSelectionEnd() + baseOffset - 1;
String progressDialogTitle = DevKitPsiViewerBundle.message("psi.viewer.progress.dialog.get.common.parent");
String progressDialogTitle = DevPsiViewerBundle.message("psi.viewer.progress.dialog.get.common.parent");
Callable<PsiElement> finder =
() -> findCommonParent(InjectedLanguageUtilBase.findElementAtNoCommit(rootElement.getContainingFile(), start),
InjectedLanguageUtilBase.findElementAtNoCommit(rootElement.getContainingFile(), end));

5
plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerExtension.java → plugins/intellij.dev.psiViewer/src/PsiViewerExtension.java
View File

@@ -1,6 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.fileTypes.FileType;
@@ -13,7 +12,7 @@ import javax.swing.*;
public interface PsiViewerExtension {
ExtensionPointName<PsiViewerExtension> EP_NAME = ExtensionPointName.create("com.intellij.devkit.psiviewer.extension");
ExtensionPointName<PsiViewerExtension> EP_NAME = ExtensionPointName.create("com.intellij.dev.psiViewer.extension");
@Nls(capitalization = Nls.Capitalization.Title)
@NotNull

2
plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerSettings.java → plugins/intellij.dev.psiViewer/src/PsiViewerSettings.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.*;

2
plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerSourceWrapper.java → plugins/intellij.dev.psiViewer/src/PsiViewerSourceWrapper.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.ide.highlighter.ArchiveFileType;
import com.intellij.ide.highlighter.ModuleFileType;

3
plugins/devkit/intellij.devkit.psiviewer/src/ViewerNodeDescriptor.java → plugins/intellij.dev.psiViewer/src/ViewerNodeDescriptor.java
View File

@@ -1,6 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.ide.util.treeView.NodeDescriptor;
import com.intellij.openapi.project.Project;

2
plugins/devkit/intellij.devkit.psiviewer/src/ViewerPsiBasedTree.java → plugins/intellij.dev.psiViewer/src/ViewerPsiBasedTree.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.TextRange;

3
plugins/devkit/intellij.devkit.psiviewer/src/ViewerTreeBuilder.java → plugins/intellij.dev.psiViewer/src/ViewerTreeBuilder.java
View File

@@ -1,6 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.ide.util.treeView.AbstractTreeBuilder;
import com.intellij.ide.util.treeView.IndexComparator;

3
plugins/devkit/intellij.devkit.psiviewer/src/ViewerTreeStructure.java → plugins/intellij.dev.psiViewer/src/ViewerTreeStructure.java
View File

@@ -1,6 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer;
package com.intellij.dev.psiViewer;
import com.intellij.ide.util.treeView.AbstractTreeStructure;
import com.intellij.ide.util.treeView.NodeDescriptor;

2
plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockTreeNode.java → plugins/intellij.dev.psiViewer/src/formatter/BlockTreeNode.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer.formatter;
package com.intellij.dev.psiViewer.formatter;
import com.intellij.formatting.Block;
import com.intellij.formatting.templateLanguages.DataLanguageBlockWrapper;

2
plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockTreeStructure.java → plugins/intellij.dev.psiViewer/src/formatter/BlockTreeStructure.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer.formatter;
package com.intellij.dev.psiViewer.formatter;
import com.intellij.ui.treeStructure.SimpleTreeStructure;
import org.jetbrains.annotations.NotNull;

8
plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockViewerPsiBasedTree.java → plugins/intellij.dev.psiViewer/src/formatter/BlockViewerPsiBasedTree.java
View File

@@ -1,7 +1,9 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer.formatter;
package com.intellij.dev.psiViewer.formatter;
import com.intellij.application.options.CodeStyle;
import com.intellij.dev.psiViewer.PsiViewerDialog;
import com.intellij.dev.psiViewer.ViewerPsiBasedTree;
import com.intellij.diagnostic.AttachmentFactory;
import com.intellij.formatting.*;
import com.intellij.lang.ASTNode;
@@ -28,8 +30,6 @@ import com.intellij.util.containers.JBTreeTraverser;
import com.intellij.util.ui.tree.TreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.devkit.psiviewer.PsiViewerDialog;
import org.jetbrains.idea.devkit.psiviewer.ViewerPsiBasedTree;
import javax.swing.*;
import javax.swing.event.TreeSelectionEvent;
@@ -42,7 +42,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import static org.jetbrains.idea.devkit.psiviewer.PsiViewerDialog.initTree;
import static com.intellij.dev.psiViewer.PsiViewerDialog.initTree;
public class BlockViewerPsiBasedTree implements ViewerPsiBasedTree {

2
plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubDetailsViewer.java → plugins/intellij.dev.psiViewer/src/stubs/StubDetailsViewer.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer.stubs;
package com.intellij.dev.psiViewer.stubs;
import com.intellij.icons.AllIcons;
import com.intellij.ide.util.PropertiesComponent;

2
plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubTreeNode.java → plugins/intellij.dev.psiViewer/src/stubs/StubTreeNode.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer.stubs;
package com.intellij.dev.psiViewer.stubs;
import com.intellij.psi.stubs.StubElement;
import com.intellij.ui.treeStructure.SimpleNode;

2
plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubTreeStructure.java → plugins/intellij.dev.psiViewer/src/stubs/StubTreeStructure.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer.stubs;
package com.intellij.dev.psiViewer.stubs;
import com.intellij.ui.treeStructure.SimpleTreeStructure;
import org.jetbrains.annotations.NotNull;

8
plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubViewerPsiBasedTree.java → plugins/intellij.dev.psiViewer/src/stubs/StubViewerPsiBasedTree.java
View File

@@ -1,6 +1,8 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.psiviewer.stubs;
package com.intellij.dev.psiViewer.stubs;
import com.intellij.dev.psiViewer.PsiViewerDialog;
import com.intellij.dev.psiViewer.ViewerPsiBasedTree;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.AnAction;
@@ -37,8 +39,6 @@ import com.intellij.util.ui.tree.AbstractTreeModel;
import com.intellij.util.ui.tree.TreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.devkit.psiviewer.PsiViewerDialog;
import org.jetbrains.idea.devkit.psiviewer.ViewerPsiBasedTree;
import javax.swing.*;
import javax.swing.event.TreeSelectionEvent;
@@ -51,7 +51,7 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import static org.jetbrains.idea.devkit.psiviewer.PsiViewerDialog.initTree;
import static com.intellij.dev.psiViewer.PsiViewerDialog.initTree;
public class StubViewerPsiBasedTree implements ViewerPsiBasedTree {

1
plugins/intellij.dev/intellij.dev.iml
View File

@@ -7,5 +7,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.dev.psiViewer" scope="RUNTIME" />
</component>
</module>

3
plugins/intellij.dev/resources/META-INF/plugin.xml
View File

@@ -2,4 +2,7 @@
<id>com.intellij.dev</id>
<vendor>JetBrains</vendor>
<description>This plugin provides actions which make sense in debug IDE instance, such as "View PSI Structure".</description>
<content>
<module name="intellij.dev.psiViewer"/>
</content>
</idea-plugin>