Merge pull request #8 from tommykw/fix/phpstorm-comatibility

PhpStorm compatibility and improve trait detection

Author: tommykw

build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
 
     // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
     intellijPlatform {
-        intellijIdea(providers.gradleProperty("platformVersion"))
+        create("PS", providers.gradleProperty("platformVersion"))
 
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })

src/main/kotlin/com/github/tommykw/phptraitinlineviewer/TraitInlineViewerAction.kt

@@ -2,13 +2,17 @@ package com.github.tommykw.phptraitinlineviewer
 
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.psi.util.PsiTreeUtil
 import com.jetbrains.php.lang.psi.PhpFile
 import com.jetbrains.php.lang.psi.elements.PhpClass
 import com.jetbrains.php.lang.psi.elements.PhpTraitUseRule
 
 class TraitInlineViewerAction : AnAction() {
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
     override fun update(event: AnActionEvent) {
         event.presentation.text = "View PHP Trait Inline"
 
@@ -36,13 +40,8 @@ class TraitInlineViewerAction : AnAction() {
             return
         }
 
-        val hasTraitUses = phpClass.traitUseRules()?.isEmpty == false
-        event.presentation.isEnabled = hasTraitUses
-        event.presentation.description = if (hasTraitUses) {
-            "Open an inline view of ${phpClass.name ?: "this class"} with merged traits."
-        } else {
-            "No trait use statements found in ${phpClass.name ?: "this class"}."
-        }
+        event.presentation.isEnabled = true
+        event.presentation.description = "Open an inline view of ${phpClass.name ?: "this class"} with merged traits."
     }
 
     override fun actionPerformed(event: AnActionEvent) {
@@ -68,7 +67,10 @@ class TraitInlineViewerAction : AnAction() {
             return
         }
 
-        if (phpClass.traitUseRules()?.isEmpty != false) {
+        val traits = phpClass.traits
+        val hasTraits = traits.isNotEmpty()
+
+        if (!hasTraits) {
             TraitInlineNotifier.warn(project, "${phpClass.name ?: "This class"} does not use any traits.")
             return
         }