From f32aecb8ffa00264bbbe7466ba697724285a218d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 30 Jul 2014 23:05:33 +0400 Subject: [PATCH] Moved "Copy as Diagnostic Test" to Tools -> Kotlin. Renamed class and done some cleanup. --- idea/src/META-INF/plugin.xml | 11 ++++++----- .../CopyAsDiagnosticTestAction.java | 15 ++++++--------- 2 files changed, 12 insertions(+), 14 deletions(-) rename idea/src/org/jetbrains/jet/plugin/actions/{ => internal}/CopyAsDiagnosticTestAction.java (81%) diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 79e33973571..f23a6d3b2d0 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -66,11 +66,6 @@ - - - - @@ -102,6 +97,12 @@ + + + + + diff --git a/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java similarity index 81% rename from idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java rename to idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java index 88d92c95f32..194415725a3 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java @@ -14,12 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.actions; +package org.jetbrains.jet.plugin.actions.internal; -import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.LangDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; @@ -39,8 +36,8 @@ import java.util.List; public class CopyAsDiagnosticTestAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - Editor editor = e.getData(PlatformDataKeys.EDITOR); - PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); + Editor editor = e.getData(CommonDataKeys.EDITOR); + PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); assert editor != null && psiFile != null; BindingContext bindingContext = ResolvePackage.getBindingContext((JetFile) psiFile); @@ -58,8 +55,8 @@ public class CopyAsDiagnosticTestAction extends AnAction { @Override public void update(AnActionEvent e) { - Editor editor = e.getData(PlatformDataKeys.EDITOR); - PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); + Editor editor = e.getData(CommonDataKeys.EDITOR); + PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); e.getPresentation().setEnabled(editor != null && psiFile instanceof JetFile && ApplicationManager.getApplication().isInternal()); }