azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using real annotation owner when creating popup menu action group to make it work for library without sources.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-09-06 13:41:23 +04:00
parent 9e4ebe6982
commit 6b81ba1aef
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/DeleteSignatureAction.java
+2 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiAnnotation;
import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiMethod;
import org.jetbrains.annotations.NotNull;
import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.KOTLIN_SIGNATURE_ANNOTATION; import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.KOTLIN_SIGNATURE_ANNOTATION;
import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.findKotlinSignatureAnnotation; import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.findKotlinSignatureAnnotation;
@@ -36,7 +37,7 @@ import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUt
public class DeleteSignatureAction extends AnAction { public class DeleteSignatureAction extends AnAction {
private final PsiMethod annotationOwner; private final PsiMethod annotationOwner;
public DeleteSignatureAction(PsiMethod annotationOwner) { public DeleteSignatureAction(@NotNull PsiMethod annotationOwner) {
super("Delete"); super("Delete");
this.annotationOwner = annotationOwner; this.annotationOwner = annotationOwner;
} }
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureAction.java
+1 -1
View File
@@ -40,7 +40,7 @@ import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUt
public class EditSignatureAction extends AnAction { public class EditSignatureAction extends AnAction {
private final PsiMethod annotationOwner; private final PsiMethod annotationOwner;
public EditSignatureAction(PsiMethod annotationOwner) { public EditSignatureAction(@NotNull PsiMethod annotationOwner) {
super("Edit"); super("Edit");
this.annotationOwner = annotationOwner; this.annotationOwner = annotationOwner;
} }
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java
+6 -2
View File
@@ -108,8 +108,12 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
public ActionGroup getPopupMenuActions() { public ActionGroup getPopupMenuActions() {
DefaultActionGroup actionGroup = new DefaultActionGroup(); DefaultActionGroup actionGroup = new DefaultActionGroup();
actionGroup.add(new EditSignatureAction(getElement())); PsiMethod element = getElement();
actionGroup.add(new DeleteSignatureAction(getElement())); assert element != null;
PsiMethod annotationOwner = getAnnotationOwner(element);
actionGroup.add(new EditSignatureAction(annotationOwner));
actionGroup.add(new DeleteSignatureAction(annotationOwner));
return actionGroup; return actionGroup;
} }