diff --git a/.idea/modules.xml b/.idea/modules.xml index e784db0a168d..d956cd8cba25 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -517,6 +517,7 @@ + @@ -528,7 +529,6 @@ - diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index 429b92ec35bd..3b7c31242f68 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -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") diff --git a/plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.iml b/plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.iml index bac1b65b6503..28356350f7bc 100644 --- a/plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.iml +++ b/plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.iml @@ -11,7 +11,6 @@ - diff --git a/plugins/devkit/intellij.devkit.psiviewer/resources/intellij.devkit.psiviewer.xml b/plugins/devkit/intellij.devkit.psiviewer/resources/intellij.devkit.psiviewer.xml deleted file mode 100644 index 2ce1f7414660..000000000000 --- a/plugins/devkit/intellij.devkit.psiviewer/resources/intellij.devkit.psiviewer.xml +++ /dev/null @@ -1,16 +0,0 @@ - - messages.DevKitPsiViewerBundle - - - - - - - - - - - - - diff --git a/plugins/devkit/intellij.devkit/resources/META-INF/plugin.xml b/plugins/devkit/intellij.devkit/resources/META-INF/plugin.xml index 14f52c9a4a87..1ca6848bf048 100644 --- a/plugins/devkit/intellij.devkit/resources/META-INF/plugin.xml +++ b/plugins/devkit/intellij.devkit/resources/META-INF/plugin.xml @@ -18,7 +18,6 @@ - diff --git a/plugins/devkit/intellij.java.devkit/intellij.java.devkit.iml b/plugins/devkit/intellij.java.devkit/intellij.java.devkit.iml index bf4fce21d192..28bd50cfc48d 100644 --- a/plugins/devkit/intellij.java.devkit/intellij.java.devkit.iml +++ b/plugins/devkit/intellij.java.devkit/intellij.java.devkit.iml @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/plugins/devkit/intellij.java.devkit/resources/intellij.java.devkit.xml b/plugins/devkit/intellij.java.devkit/resources/intellij.java.devkit.xml index 74f45199441c..67015b570ff1 100644 --- a/plugins/devkit/intellij.java.devkit/resources/intellij.java.devkit.xml +++ b/plugins/devkit/intellij.java.devkit/resources/intellij.java.devkit.xml @@ -1,11 +1,11 @@ - + - - - - + + + + diff --git a/plugins/devkit/intellij.java.devkit/src/psiviewer/JavaPsiViewerExtension.java b/plugins/devkit/intellij.java.devkit/src/psiViewer/JavaPsiViewerExtension.java similarity index 87% rename from plugins/devkit/intellij.java.devkit/src/psiviewer/JavaPsiViewerExtension.java rename to plugins/devkit/intellij.java.devkit/src/psiViewer/JavaPsiViewerExtension.java index 7a251cf0cc9f..d7ee85ac7617 100644 --- a/plugins/devkit/intellij.java.devkit/src/psiviewer/JavaPsiViewerExtension.java +++ b/plugins/devkit/intellij.java.devkit/src/psiViewer/JavaPsiViewerExtension.java @@ -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 diff --git a/plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerCodeFragmentExtension.java b/plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerCodeFragmentExtension.java similarity index 94% rename from plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerCodeFragmentExtension.java rename to plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerCodeFragmentExtension.java index f7019cacbc56..af350ef39f3a 100644 --- a/plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerCodeFragmentExtension.java +++ b/plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerCodeFragmentExtension.java @@ -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; diff --git a/plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerExpressionExtension.java b/plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerExpressionExtension.java similarity index 94% rename from plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerExpressionExtension.java rename to plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerExpressionExtension.java index 13186d8ae1ab..a4178cbc7807 100644 --- a/plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerExpressionExtension.java +++ b/plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerExpressionExtension.java @@ -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; diff --git a/plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerMethodExtension.java b/plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerMethodExtension.java similarity index 94% rename from plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerMethodExtension.java rename to plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerMethodExtension.java index 5d608555bbdc..ff3ffc102c4f 100644 --- a/plugins/devkit/intellij.java.devkit/src/psiviewer/PsiViewerMethodExtension.java +++ b/plugins/devkit/intellij.java.devkit/src/psiViewer/PsiViewerMethodExtension.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/intellij.devkit.psiviewer.iml b/plugins/intellij.dev.psiViewer/intellij.dev.psiViewer.iml similarity index 95% rename from plugins/devkit/intellij.devkit.psiviewer/intellij.devkit.psiviewer.iml rename to plugins/intellij.dev.psiViewer/intellij.dev.psiViewer.iml index a9832e67b7b4..5c44d1de258d 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/intellij.devkit.psiviewer.iml +++ b/plugins/intellij.dev.psiViewer/intellij.dev.psiViewer.iml @@ -4,7 +4,7 @@ - + diff --git a/plugins/intellij.dev.psiViewer/resources/intellij.dev.psiViewer.xml b/plugins/intellij.dev.psiViewer/resources/intellij.dev.psiViewer.xml new file mode 100644 index 000000000000..b8714bfb23ea --- /dev/null +++ b/plugins/intellij.dev.psiViewer/resources/intellij.dev.psiViewer.xml @@ -0,0 +1,16 @@ + + messages.DevPsiViewerBundle + + + + + + + + + + + + + diff --git a/plugins/devkit/intellij.devkit.psiviewer/resources/messages/DevKitPsiViewerBundle.properties b/plugins/intellij.dev.psiViewer/resources/messages/DevPsiViewerBundle.properties similarity index 100% rename from plugins/devkit/intellij.devkit.psiviewer/resources/messages/DevKitPsiViewerBundle.properties rename to plugins/intellij.dev.psiViewer/resources/messages/DevPsiViewerBundle.properties diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/DevKitPsiViewerBundle.java b/plugins/intellij.dev.psiViewer/src/DevPsiViewerBundle.java similarity index 81% rename from plugins/devkit/intellij.devkit.psiviewer/src/DevKitPsiViewerBundle.java rename to plugins/intellij.dev.psiViewer/src/DevPsiViewerBundle.java index 63e41d7c77e9..dda5659e8251 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/DevKitPsiViewerBundle.java +++ b/plugins/intellij.dev.psiViewer/src/DevPsiViewerBundle.java @@ -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( diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerAction.java b/plugins/intellij.dev.psiViewer/src/PsiViewerAction.java similarity index 97% rename from plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerAction.java rename to plugins/intellij.dev.psiViewer/src/PsiViewerAction.java index 5acc878937ae..590e5417d7b4 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerAction.java +++ b/plugins/intellij.dev.psiViewer/src/PsiViewerAction.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerDialog.form b/plugins/intellij.dev.psiViewer/src/PsiViewerDialog.form similarity index 99% rename from plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerDialog.form rename to plugins/intellij.dev.psiViewer/src/PsiViewerDialog.form index f0b7d4873267..5b14630d2281 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerDialog.form +++ b/plugins/intellij.dev.psiViewer/src/PsiViewerDialog.form @@ -1,5 +1,5 @@ -
+ diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerDialog.java b/plugins/intellij.dev.psiViewer/src/PsiViewerDialog.java similarity index 98% rename from plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerDialog.java rename to plugins/intellij.dev.psiViewer/src/PsiViewerDialog.java index 8d89c41ca9ca..24f0d13aeec1 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerDialog.java +++ b/plugins/intellij.dev.psiViewer/src/PsiViewerDialog.java @@ -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 model = (DefaultListModel)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> 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 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 finder = () -> findCommonParent(InjectedLanguageUtilBase.findElementAtNoCommit(rootElement.getContainingFile(), start), InjectedLanguageUtilBase.findElementAtNoCommit(rootElement.getContainingFile(), end)); diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerExtension.java b/plugins/intellij.dev.psiViewer/src/PsiViewerExtension.java similarity index 88% rename from plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerExtension.java rename to plugins/intellij.dev.psiViewer/src/PsiViewerExtension.java index 83a03268e004..ad538783a644 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerExtension.java +++ b/plugins/intellij.dev.psiViewer/src/PsiViewerExtension.java @@ -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 EP_NAME = ExtensionPointName.create("com.intellij.devkit.psiviewer.extension"); + ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.dev.psiViewer.extension"); @Nls(capitalization = Nls.Capitalization.Title) @NotNull diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerSettings.java b/plugins/intellij.dev.psiViewer/src/PsiViewerSettings.java similarity index 96% rename from plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerSettings.java rename to plugins/intellij.dev.psiViewer/src/PsiViewerSettings.java index a0cfeabaf6a8..9b4555512833 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerSettings.java +++ b/plugins/intellij.dev.psiViewer/src/PsiViewerSettings.java @@ -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.*; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerSourceWrapper.java b/plugins/intellij.dev.psiViewer/src/PsiViewerSourceWrapper.java similarity index 98% rename from plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerSourceWrapper.java rename to plugins/intellij.dev.psiViewer/src/PsiViewerSourceWrapper.java index 14b429afb800..e00a4ede9317 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/PsiViewerSourceWrapper.java +++ b/plugins/intellij.dev.psiViewer/src/PsiViewerSourceWrapper.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/ViewerNodeDescriptor.java b/plugins/intellij.dev.psiViewer/src/ViewerNodeDescriptor.java similarity index 94% rename from plugins/devkit/intellij.devkit.psiviewer/src/ViewerNodeDescriptor.java rename to plugins/intellij.dev.psiViewer/src/ViewerNodeDescriptor.java index 8ccbd69de97c..48610c55ac28 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/ViewerNodeDescriptor.java +++ b/plugins/intellij.dev.psiViewer/src/ViewerNodeDescriptor.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/ViewerPsiBasedTree.java b/plugins/intellij.dev.psiViewer/src/ViewerPsiBasedTree.java similarity index 96% rename from plugins/devkit/intellij.devkit.psiviewer/src/ViewerPsiBasedTree.java rename to plugins/intellij.dev.psiViewer/src/ViewerPsiBasedTree.java index 823a95a6cbc0..022c12c0770a 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/ViewerPsiBasedTree.java +++ b/plugins/intellij.dev.psiViewer/src/ViewerPsiBasedTree.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/ViewerTreeBuilder.java b/plugins/intellij.dev.psiViewer/src/ViewerTreeBuilder.java similarity index 95% rename from plugins/devkit/intellij.devkit.psiviewer/src/ViewerTreeBuilder.java rename to plugins/intellij.dev.psiViewer/src/ViewerTreeBuilder.java index 22a4cc113d4b..76fe2afb9604 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/ViewerTreeBuilder.java +++ b/plugins/intellij.dev.psiViewer/src/ViewerTreeBuilder.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/ViewerTreeStructure.java b/plugins/intellij.dev.psiViewer/src/ViewerTreeStructure.java similarity index 99% rename from plugins/devkit/intellij.devkit.psiviewer/src/ViewerTreeStructure.java rename to plugins/intellij.dev.psiViewer/src/ViewerTreeStructure.java index adf5ce507b02..b53424184251 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/ViewerTreeStructure.java +++ b/plugins/intellij.dev.psiViewer/src/ViewerTreeStructure.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockTreeNode.java b/plugins/intellij.dev.psiViewer/src/formatter/BlockTreeNode.java similarity index 97% rename from plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockTreeNode.java rename to plugins/intellij.dev.psiViewer/src/formatter/BlockTreeNode.java index 63fdf1e381cf..82496c775e34 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockTreeNode.java +++ b/plugins/intellij.dev.psiViewer/src/formatter/BlockTreeNode.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockTreeStructure.java b/plugins/intellij.dev.psiViewer/src/formatter/BlockTreeStructure.java similarity index 89% rename from plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockTreeStructure.java rename to plugins/intellij.dev.psiViewer/src/formatter/BlockTreeStructure.java index 9fb74615028e..f4aeecf8b9ae 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockTreeStructure.java +++ b/plugins/intellij.dev.psiViewer/src/formatter/BlockTreeStructure.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockViewerPsiBasedTree.java b/plugins/intellij.dev.psiViewer/src/formatter/BlockViewerPsiBasedTree.java similarity index 97% rename from plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockViewerPsiBasedTree.java rename to plugins/intellij.dev.psiViewer/src/formatter/BlockViewerPsiBasedTree.java index 816337dfe0aa..2c1d23d1ac79 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/formatter/BlockViewerPsiBasedTree.java +++ b/plugins/intellij.dev.psiViewer/src/formatter/BlockViewerPsiBasedTree.java @@ -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 { diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubDetailsViewer.java b/plugins/intellij.dev.psiViewer/src/stubs/StubDetailsViewer.java similarity index 98% rename from plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubDetailsViewer.java rename to plugins/intellij.dev.psiViewer/src/stubs/StubDetailsViewer.java index 1c5543357b2a..540b2473c16a 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubDetailsViewer.java +++ b/plugins/intellij.dev.psiViewer/src/stubs/StubDetailsViewer.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubTreeNode.java b/plugins/intellij.dev.psiViewer/src/stubs/StubTreeNode.java similarity index 95% rename from plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubTreeNode.java rename to plugins/intellij.dev.psiViewer/src/stubs/StubTreeNode.java index a7b44637e677..7b315398483a 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubTreeNode.java +++ b/plugins/intellij.dev.psiViewer/src/stubs/StubTreeNode.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubTreeStructure.java b/plugins/intellij.dev.psiViewer/src/stubs/StubTreeStructure.java similarity index 91% rename from plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubTreeStructure.java rename to plugins/intellij.dev.psiViewer/src/stubs/StubTreeStructure.java index 4b099a44136d..b72b8a326998 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubTreeStructure.java +++ b/plugins/intellij.dev.psiViewer/src/stubs/StubTreeStructure.java @@ -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; diff --git a/plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubViewerPsiBasedTree.java b/plugins/intellij.dev.psiViewer/src/stubs/StubViewerPsiBasedTree.java similarity index 97% rename from plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubViewerPsiBasedTree.java rename to plugins/intellij.dev.psiViewer/src/stubs/StubViewerPsiBasedTree.java index 9646073d2af8..6dfb9db546f4 100644 --- a/plugins/devkit/intellij.devkit.psiviewer/src/stubs/StubViewerPsiBasedTree.java +++ b/plugins/intellij.dev.psiViewer/src/stubs/StubViewerPsiBasedTree.java @@ -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 { diff --git a/plugins/intellij.dev/intellij.dev.iml b/plugins/intellij.dev/intellij.dev.iml index 510e3ffb6679..d338714fab2e 100644 --- a/plugins/intellij.dev/intellij.dev.iml +++ b/plugins/intellij.dev/intellij.dev.iml @@ -7,5 +7,6 @@ + \ No newline at end of file diff --git a/plugins/intellij.dev/resources/META-INF/plugin.xml b/plugins/intellij.dev/resources/META-INF/plugin.xml index 0f189e4c9e7e..55dfd979979b 100644 --- a/plugins/intellij.dev/resources/META-INF/plugin.xml +++ b/plugins/intellij.dev/resources/META-INF/plugin.xml @@ -2,4 +2,7 @@ com.intellij.dev JetBrains This plugin provides actions which make sense in debug IDE instance, such as "View PSI Structure". + + +