Merge pull request #240 from Shopify/224-bumblebee

Intellij plugin now supports Android Studio Bumblebee | 2021.1.1 Canary 9 | Build 211.*

Author: DanielJette

Plugins/IntelliJ/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [0.1.2]
+
+### Updated
+
+- Intellij plugin now supports Android Studio Bumblebee | 2021.1.1 Canary 9
+  Build 211.*
+
 ## [0.1.1]
 
 ### Updated

Plugins/IntelliJ/gradle.properties

@@ -3,9 +3,9 @@
 
 pluginGroup = com.shopify.testify
 pluginName = Android Testify - Screenshot Instrumentation Tests
-pluginVersion = 0.1.1
+pluginVersion = 0.1.2
 pluginSinceBuild = 193
-pluginUntilBuild = 203.*
+pluginUntilBuild = 211.*
 
 platformType = IC
 platformVersion = 2020.1

Plugins/IntelliJ/src/main/kotlin/com/shopify/testify/extensions/ScreenshotClassNavHandler.kt

@@ -24,11 +24,10 @@
 package com.shopify.testify.extensions
 
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
+import com.intellij.ide.DataManager
 import com.intellij.openapi.actionSystem.DefaultActionGroup
-import com.intellij.openapi.actionSystem.impl.SimpleDataContext
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.popup.JBPopup
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.vfs.VirtualFile
@@ -41,11 +40,14 @@ import com.shopify.testify.actions.screenshot.ScreenshotClearAction
 import com.shopify.testify.actions.screenshot.ScreenshotPullAction
 import com.shopify.testify.actions.screenshot.ScreenshotRecordAction
 import com.shopify.testify.actions.screenshot.ScreenshotTestAction
+import java.awt.event.ComponentEvent
 import java.awt.event.MouseEvent
 
 class ScreenshotClassNavHandler(private val anchorElement: PsiElement) : GutterIconNavigationHandler<PsiElement> {
 
     override fun navigate(e: MouseEvent?, nameIdentifier: PsiElement) {
+        if (e == null) return
+
         val listOwner = nameIdentifier.parent
         val containingFile = listOwner.containingFile
         val virtualFile: VirtualFile? = PsiUtilCore.getVirtualFile(listOwner)
@@ -56,26 +58,26 @@ class ScreenshotClassNavHandler(private val anchorElement: PsiElement) : GutterI
                 editor.caretModel.moveToOffset(nameIdentifier.textOffset)
                 val file: PsiFile? = PsiDocumentManager.getInstance(project).getPsiFile(editor.document)
                 if (file != null && virtualFile == file.virtualFile) {
-                    val popup: JBPopup? = createActionGroupPopup(anchorElement, project)
-                    popup?.show(RelativePoint(e!!))
+                    val popup: JBPopup = createActionGroupPopup(e, anchorElement)
+                    popup.show(RelativePoint(e))
                 }
             }
         }
     }
 
-    private fun createActionGroupPopup(anchorElement: PsiElement, project: Project): JBPopup? {
+    private fun createActionGroupPopup(event: ComponentEvent, anchorElement: PsiElement): JBPopup {
 
         val group = DefaultActionGroup(
             ScreenshotTestAction(anchorElement),
             ScreenshotRecordAction(anchorElement),
             ScreenshotPullAction(anchorElement),
             ScreenshotClearAction(anchorElement)
         )
-
+        val dataContext = DataManager.getInstance().getDataContext(event.component)
         return JBPopupFactory.getInstance().createActionGroupPopup(
             "",
             group,
-            SimpleDataContext.getProjectContext(project),
+            dataContext,
             true,
             null,
             group.childrenCount

Plugins/IntelliJ/src/main/kotlin/com/shopify/testify/extensions/ScreenshotInstrumentationAnnotationNavHandler.kt

@@ -24,11 +24,10 @@
 package com.shopify.testify.extensions
 
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
+import com.intellij.ide.DataManager
 import com.intellij.openapi.actionSystem.DefaultActionGroup
-import com.intellij.openapi.actionSystem.impl.SimpleDataContext
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.popup.JBPopup
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.vfs.VirtualFile
@@ -43,12 +42,15 @@ import com.shopify.testify.actions.screenshot.ScreenshotRecordAction
 import com.shopify.testify.actions.screenshot.ScreenshotTestAction
 import com.shopify.testify.actions.utility.DeleteBaselineAction
 import com.shopify.testify.actions.utility.RevealBaselineAction
+import java.awt.event.ComponentEvent
 import java.awt.event.MouseEvent
 
 class ScreenshotInstrumentationAnnotationNavHandler(private val anchorElement: PsiElement) :
     GutterIconNavigationHandler<PsiElement> {
 
     override fun navigate(e: MouseEvent?, nameIdentifier: PsiElement) {
+        if (e == null) return
+
         val listOwner = nameIdentifier.parent
         val containingFile = listOwner.containingFile
         val virtualFile: VirtualFile? = PsiUtilCore.getVirtualFile(listOwner)
@@ -59,14 +61,14 @@ class ScreenshotInstrumentationAnnotationNavHandler(private val anchorElement: P
                 editor.caretModel.moveToOffset(nameIdentifier.textOffset)
                 val file: PsiFile? = PsiDocumentManager.getInstance(project).getPsiFile(editor.document)
                 if (file != null && virtualFile == file.virtualFile) {
-                    val popup: JBPopup? = createActionGroupPopup(anchorElement, project)
-                    popup?.show(RelativePoint(e!!))
+                    val popup: JBPopup = createActionGroupPopup(e, anchorElement)
+                    popup.show(RelativePoint(e))
                 }
             }
         }
     }
 
-    private fun createActionGroupPopup(anchorElement: PsiElement, project: Project): JBPopup? {
+    private fun createActionGroupPopup(event: ComponentEvent, anchorElement: PsiElement): JBPopup {
 
         val group = DefaultActionGroup(
             ScreenshotTestAction(anchorElement),
@@ -76,11 +78,11 @@ class ScreenshotInstrumentationAnnotationNavHandler(private val anchorElement: P
             RevealBaselineAction(anchorElement),
             DeleteBaselineAction(anchorElement)
         )
-
+        val dataContext = DataManager.getInstance().getDataContext(event.component)
         return JBPopupFactory.getInstance().createActionGroupPopup(
             "",
             group,
-            SimpleDataContext.getProjectContext(project),
+            dataContext,
             true,
             null,
             group.childrenCount