fix: potential plugin crash when the project is closed. closes #26 (#27)

* fix: potential plugin crash when the project is closed * fix: formatting * fix: plugin compatibility
drinchev · Sep 27, 2023 · 7d3d430 · 7d3d430
1 parent 0bf19f9
commit 7d3d430
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 22 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 # Project Label Changelog
 
 ## [Unreleased]
+- Fix a potential issue of plugin crash, when switching projects
 
 ## [1.3.0] - 2023-08-08
 - Option to choose colors from good-looking presets (or manually pick colors like before)

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ pluginGroup=com.drinchev.projectlabel
 pluginName=Project Label
 pluginRepositoryUrl=https://github.com/drinchev/project-label
 # SemVer format -> https://semver.org
-pluginVersion=1.3.0
+pluginVersion=1.3.1
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild=223
 pluginUntilBuild=

diff --git a/src/main/java/com/drinchev/projectlabel/ProjectLabel.java b/src/main/java/com/drinchev/projectlabel/ProjectLabel.java
@@ -12,7 +12,7 @@
 import org.jetbrains.annotations.NotNull;
 
 @Service(Level.PROJECT)
-public class ProjectLabel {
+public final class ProjectLabel {
 
     private final Project project;
 

diff --git a/src/main/java/com/drinchev/projectlabel/ProjectLabelStartupActivity.java b/src/main/java/com/drinchev/projectlabel/ProjectLabelStartupActivity.java
@@ -2,20 +2,14 @@
 
 import com.drinchev.projectlabel.resources.ui.ProjectLabelBackgroundImage;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.startup.ProjectPostStartupActivity;
-import kotlin.Unit;
-import kotlin.coroutines.Continuation;
+import com.intellij.openapi.startup.StartupActivity;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-public class ProjectLabelStartupActivity implements ProjectPostStartupActivity {
-
-    @Nullable
+public class ProjectLabelStartupActivity implements StartupActivity {
     @Override
-    public Object execute(@NotNull Project project, @NotNull Continuation<? super Unit> continuation) {
+    public void runActivity(@NotNull Project project) {
         try {
             project.getService(ProjectLabelBackgroundImage.class).showImage();
-            return null;
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

diff --git a/src/main/java/com/drinchev/projectlabel/resources/ui/ProjectLabelBackgroundImage.java b/src/main/java/com/drinchev/projectlabel/resources/ui/ProjectLabelBackgroundImage.java
@@ -27,7 +27,7 @@
 import org.jetbrains.annotations.NotNull;
 
 @Service(Level.PROJECT)
-public class ProjectLabelBackgroundImage {
+public final class ProjectLabelBackgroundImage {
 
     public static final int MIN_HEIGHT = 30;
 
@@ -92,7 +92,10 @@ private boolean shouldShowBackgroundImage() {
     }
 
     private void setImageToIDE() {
-        PropertiesComponent prop = projectLevelPropertiesComponent();
+        if (project.isDisposed()) {
+            return;
+        }
+        PropertiesComponent prop = project.getService(PropertiesComponent.class);
         String opacity = String.valueOf(preferences.backgroundImageOpacity());
         String imageProp = String.format(
                 "%s,%s,plain,%s",
@@ -109,11 +112,6 @@ private void setImageToIDE() {
         }
     }
 
-    private PropertiesComponent projectLevelPropertiesComponent() {
-        PropertiesComponent prop = project.getService(PropertiesComponent.class);
-        return prop;
-    }
-
     public void updateImage() {
         LOG.info("Updating project label background image.");
         bufferedImage = null;
@@ -122,7 +120,10 @@ public void updateImage() {
     }
 
     public void hideImage() {
-        PropertiesComponent prop = projectLevelPropertiesComponent();
+        if (project.isDisposed()) {
+            return;
+        }
+        PropertiesComponent prop = project.getService(PropertiesComponent.class);
         String editorProp = prop.getValue(IdeBackgroundUtil.EDITOR_PROP, "");
         String frameProp = prop.getValue(IdeBackgroundUtil.FRAME_PROP, "");
         if (!isProjectLabelImage(editorProp, frameProp)) {

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -8,8 +8,6 @@
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceImplementation="com.drinchev.projectlabel.preferences.ApplicationPreferences"/>
         <projectService serviceImplementation="com.drinchev.projectlabel.preferences.ProjectPreferences"/>
-        <projectService serviceImplementation="com.drinchev.projectlabel.ProjectLabel" />
-        <projectService serviceImplementation="com.drinchev.projectlabel.resources.ui.ProjectLabelBackgroundImage" />
         <projectConfigurable id="ProjectLabel" displayName="Project Label"
                              instance="com.drinchev.projectlabel.ProjectLabelConfigurable"/>
         <statusBarWidgetFactory implementation="com.drinchev.projectlabel.ProjectLabelWidgetFactory" order="last"/>