Adding support from BumbleBee

getyourguide · Nov 10, 2022 · 615d605 · 615d605
1 parent 3211a1c
commit 615d605
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,7 +25,7 @@ intellij {
 
 tasks {
     runIde {
-        // Absolute path to installed target 3.5 Android Studio to use as
+        // Absolute path to installed target Android Studio to use as
         // IDE Development Instance (the "Contents" directory is macOS specific):
         ideDir.set(file("/Applications/Android Studio.app/Contents"))
     }
@@ -39,7 +39,7 @@ tasks {
     }
 
     patchPluginXml {
-        sinceBuild.set("210")
+        sinceBuild.set("210") // Support from Android Studio BumbleBee
 //        untilBuild.set("223.*")
     }
 

diff --git a/src/main/kotlin/com/getyourguide/paparazzi/PaparazziWindow.kt b/src/main/kotlin/com/getyourguide/paparazzi/PaparazziWindow.kt
@@ -56,11 +56,11 @@ class MyPanel(toolWindow: ToolWindow, project: Project) : PaparazziWindowPanel()
         toolWindow.contentManager.addContent(content)
         list.cellRenderer = Renderer(project)
 
-        setContent(getContentPanel(project))
+        setContent(getContentPanel())
         project.service.panel = this
     }
 
-    private fun getContentPanel(project: Project): JPanel {
+    private fun getContentPanel(): JPanel {
 
         val panel = JBPanel<SimpleToolWindowPanel>(
             GridLayoutManager(

diff --git a/src/main/kotlin/com/getyourguide/paparazzi/Utils.kt b/src/main/kotlin/com/getyourguide/paparazzi/Utils.kt
@@ -84,8 +84,11 @@ private fun VirtualFile.snapshotName(qualifiedTestName: String): String {
 }
 
 private fun Project.recordedSnapshots(file: VirtualFile): List<VirtualFile> {
-    return file.getModule(this)?.rootManager?.contentRoots?.find {
-        it.name == "test"
+    val modulePath = modulePath(file)
+    return if (modulePath != null) {
+        LocalFileSystem.getInstance().findFileByPath(modulePath)?.findChild("src")?.findChild("test")
+    } else {
+        file.getModule(this)?.rootManager?.contentRoots?.find { it.name == "test" }
     }?.findChild("snapshots")?.findChild("images")?.children?.toList() ?: emptyList()
 }
 

diff --git a/src/main/kotlin/com/getyourguide/paparazzi/actions/VerifyPaparazziAction.kt b/src/main/kotlin/com/getyourguide/paparazzi/actions/VerifyPaparazziAction.kt
@@ -50,6 +50,7 @@ class VerifyTaskCallback(
     private val psiClass: PsiClass,
     private val psiMethod: PsiMethod?
 ) : TaskCallback {
+
     override fun onSuccess() {
         project.service.loadAfterSnapshotsRecorded(psiClass, psiMethod)
         deleteFailureSnapshots(psiClass, psiMethod)