diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/SourceMarkerPlugin.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/SourceMarkerPlugin.kt index 94156e9b1..b5103d995 100644 --- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/SourceMarkerPlugin.kt +++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/SourceMarkerPlugin.kt @@ -59,6 +59,7 @@ import io.vertx.serviceproxy.ServiceProxyBuilder import kotlinx.coroutines.* import liveplugin.implementation.LivePluginProjectLoader import org.apache.commons.text.CaseUtils +import spp.jetbrains.PluginBundle.message import spp.jetbrains.UserData import spp.jetbrains.marker.SourceMarker import spp.jetbrains.marker.jvm.ArtifactSearch @@ -69,7 +70,6 @@ import spp.jetbrains.marker.source.mark.api.filter.CreateSourceMarkFilter import spp.jetbrains.monitor.skywalking.SkywalkingMonitor import spp.jetbrains.plugin.LivePluginService import spp.jetbrains.plugin.LiveStatusManager -import spp.jetbrains.PluginBundle.message import spp.jetbrains.sourcemarker.activities.PluginSourceMarkerStartupActivity.Companion.INTELLIJ_PRODUCT_CODES import spp.jetbrains.sourcemarker.command.ControlBarController import spp.jetbrains.sourcemarker.mark.PluginSourceMarkEventListener @@ -203,7 +203,8 @@ class SourceMarkerPlugin(val project: Project) { message("plugin_name"), "Connection established", "You have successfully connected. $pluginName is now fully activated.", NotificationType.INFORMATION - ) + ), + project ) config.notifiedConnection = true @@ -519,7 +520,8 @@ class SourceMarkerPlugin(val project: Project) { message("plugin_name"), "Connection auto-established", "You have successfully auto-connected to Live Platform. ${message("plugin_name")} is now fully activated.", NotificationType.INFORMATION - ) + ), + project ) } else if (resp.statusCode() == 405) { //found skywalking OAP server @@ -538,7 +540,8 @@ class SourceMarkerPlugin(val project: Project) { message("plugin_name"), "Connection auto-established", "You have successfully auto-connected to Apache SkyWalking. ${message("plugin_name")} is now fully activated.", NotificationType.INFORMATION - ) + ), + project ) } } diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/activities/PluginSourceMarkerStartupActivity.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/activities/PluginSourceMarkerStartupActivity.kt index fe1dead70..d6248cb0f 100644 --- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/activities/PluginSourceMarkerStartupActivity.kt +++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/activities/PluginSourceMarkerStartupActivity.kt @@ -23,8 +23,8 @@ import com.intellij.openapi.application.ApplicationInfo import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.project.Project import kotlinx.coroutines.runBlocking -import spp.jetbrains.marker.plugin.SourceMarkerStartupActivity import spp.jetbrains.PluginBundle +import spp.jetbrains.marker.plugin.SourceMarkerStartupActivity import spp.jetbrains.sourcemarker.SourceMarkerPlugin /** @@ -55,7 +55,8 @@ class PluginSourceMarkerStartupActivity : SourceMarkerStartupActivity() { "Unsupported product code", "Unsupported product code: ${ApplicationInfo.getInstance().build.productCode}", NotificationType.ERROR - ) + ), + project ) return }