From 2aafc0a3462382a158274eb61af1a2afd05e1a5d Mon Sep 17 00:00:00 2001
From: Roberto Leinardi <leinardi@gmail.com>
Date: Sat, 26 Feb 2022 14:12:15 +0100
Subject: [PATCH] Make plugin hot-reloadable

---
 build.gradle                                  | 10 ++++++-
 .../pycharm/pylint/PylintAnnotator.java       |  2 +-
 .../leinardi/pycharm/pylint/PylintPlugin.java | 26 +++----------------
 .../pycharm/pylint/actions/BaseAction.java    |  2 +-
 .../pycharm/pylint/actions/ClearAll.java      |  2 +-
 .../pycharm/pylint/actions/Close.java         |  2 +-
 .../pycharm/pylint/actions/CollapseAll.java   |  2 +-
 .../pylint/actions/DisplayConvention.java     |  4 +--
 .../pycharm/pylint/actions/DisplayErrors.java |  4 +--
 .../pycharm/pylint/actions/DisplayInfo.java   |  4 +--
 .../pylint/actions/DisplayRefactor.java       |  4 +--
 .../pylint/actions/DisplayWarnings.java       |  4 +--
 .../pycharm/pylint/actions/ExpandAll.java     |  2 +-
 .../pylint/actions/ScanCurrentChangeList.java |  4 +--
 .../pylint/actions/ScanCurrentFile.java       |  6 ++---
 .../pylint/actions/ScanEverythingAction.java  |  2 +-
 .../pylint/actions/ScanModifiedFiles.java     |  4 +--
 .../pycharm/pylint/actions/ScanModule.java    |  4 +--
 .../pycharm/pylint/actions/ScanProject.java   |  4 +--
 .../pylint/actions/ScanSourceRootsAction.java |  2 +-
 .../pylint/actions/ScrollToSource.java        |  4 +--
 .../pycharm/pylint/actions/Settings.java      |  2 +-
 .../pycharm/pylint/actions/StopCheck.java     |  4 +--
 .../ScanFilesBeforeCheckinHandler.java        |  2 +-
 .../toolwindow/PylintToolWindowPanel.java     |  2 +-
 src/main/resources/META-INF/plugin.xml        | 10 +------
 26 files changed, 49 insertions(+), 69 deletions(-)

diff --git a/build.gradle b/build.gradle
index d837a43..f302a57 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,12 +79,20 @@ intellij {
 
 runIde {
     systemProperties.put("idea.log.debug.categories", "#com.leinardi.pycharm.mypy")
+    // Log verbose information when dynamic plugin unloading fails
+    systemProperties.put("ide.plugins.snapshot.on.unload.fail", "true")
 }
 
+// Causes error popup when building while sandbox IDE is open. Disable in development
+if (System.getenv('DEVELOP')) {
+    buildSearchableOptions.enabled = false
+}
+
+
 patchPluginXml {
     version = project.property('version')
     sinceBuild = project.property('sinceBuild')
-    untilBuild  = project.property('untilBuild')
+    untilBuild = project.property('untilBuild')
     pluginDescription = props.getProperty('plugin.Pylint-PyCharm.description')
     changeNotes = getChangelogHtml()
 }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/PylintAnnotator.java b/src/main/java/com/leinardi/pycharm/pylint/PylintAnnotator.java
index 9f47560..40f6663 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/PylintAnnotator.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/PylintAnnotator.java
@@ -66,7 +66,7 @@ public class PylintAnnotator extends ExternalAnnotator<PylintAnnotator.State, Py
     private static final String ERROR_MESSAGE_ID_SYNTAX_ERROR = "E0001";
 
     private PylintPlugin plugin(final Project project) {
-        final PylintPlugin pylintPlugin = project.getComponent(PylintPlugin.class);
+        final PylintPlugin pylintPlugin = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/PylintPlugin.java b/src/main/java/com/leinardi/pycharm/pylint/PylintPlugin.java
index 0abbaa1..a3dea40 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/PylintPlugin.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/PylintPlugin.java
@@ -16,7 +16,7 @@
 
 package com.leinardi.pycharm.pylint;
 
-import com.intellij.openapi.components.ProjectComponent;
+import com.intellij.openapi.components.Service;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -43,12 +43,8 @@
 /**
  * Main class for the Pylint scanning plug-in.
  */
-public final class PylintPlugin implements ProjectComponent {
-
-    /**
-     * The plugin ID. Caution: It must be identical to the String set in build.gradle at intellij.pluginName
-     */
-    public static final String ID_PLUGIN = "Pylint-PyCharm";
+@Service
+public final class PylintPlugin {
 
     private static final Logger LOG = com.intellij.openapi.diagnostic.Logger.getInstance(PylintPlugin.class);
 
@@ -94,22 +90,6 @@ public boolean isScanInProgress() {
         }
     }
 
-    @Override
-    public void projectOpened() {
-        LOG.debug("Project opened.");
-    }
-
-    @Override
-    public void projectClosed() {
-        LOG.debug("Project closed.");
-    }
-
-    @Override
-    @NotNull
-    public String getComponentName() {
-        return ID_PLUGIN;
-    }
-
     public static void processErrorAndLog(@NotNull final String action, @NotNull final Throwable e) {
         LOG.warn(action + " failed", e);
     }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/BaseAction.java b/src/main/java/com/leinardi/pycharm/pylint/actions/BaseAction.java
index 39b85d6..fbe4e1d 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/BaseAction.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/BaseAction.java
@@ -59,7 +59,7 @@ public void update(final AnActionEvent event) {
                 return;
             }
 
-            final PylintPlugin pylintPlugin = project.getComponent(PylintPlugin.class);
+            final PylintPlugin pylintPlugin = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ClearAll.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ClearAll.java
index 6326713..dcc77b9 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ClearAll.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ClearAll.java
@@ -38,7 +38,7 @@ public void actionPerformed(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/Close.java b/src/main/java/com/leinardi/pycharm/pylint/actions/Close.java
index 8acb002..da97039 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/Close.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/Close.java
@@ -37,7 +37,7 @@ public void actionPerformed(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/CollapseAll.java b/src/main/java/com/leinardi/pycharm/pylint/actions/CollapseAll.java
index a8e422c..ac56e74 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/CollapseAll.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/CollapseAll.java
@@ -38,7 +38,7 @@ public void actionPerformed(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayConvention.java b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayConvention.java
index 6c8e761..a955097 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayConvention.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayConvention.java
@@ -39,7 +39,7 @@ public boolean isSelected(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
@@ -63,7 +63,7 @@ public void setSelected(final AnActionEvent event, final boolean selected) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayErrors.java b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayErrors.java
index 900e4a4..4de0c74 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayErrors.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayErrors.java
@@ -39,7 +39,7 @@ public boolean isSelected(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
@@ -63,7 +63,7 @@ public void setSelected(final AnActionEvent event, final boolean selected) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayInfo.java b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayInfo.java
index 4de42e8..00de2b0 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayInfo.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayInfo.java
@@ -39,7 +39,7 @@ public boolean isSelected(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
@@ -63,7 +63,7 @@ public void setSelected(final AnActionEvent event, final boolean selected) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayRefactor.java b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayRefactor.java
index a0ddeb0..e8f65e5 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayRefactor.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayRefactor.java
@@ -39,7 +39,7 @@ public boolean isSelected(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
@@ -63,7 +63,7 @@ public void setSelected(final AnActionEvent event, final boolean selected) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayWarnings.java b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayWarnings.java
index 498edeb..7f124ee 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayWarnings.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/DisplayWarnings.java
@@ -39,7 +39,7 @@ public boolean isSelected(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
@@ -63,7 +63,7 @@ public void setSelected(final AnActionEvent event, final boolean selected) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ExpandAll.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ExpandAll.java
index 28d041a..c633b63 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ExpandAll.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ExpandAll.java
@@ -38,7 +38,7 @@ public void actionPerformed(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanCurrentChangeList.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanCurrentChangeList.java
index 4daa7d0..243774c 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanCurrentChangeList.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanCurrentChangeList.java
@@ -51,7 +51,7 @@ public final void actionPerformed(final AnActionEvent event) {
             }
 
             final ChangeListManager changeListManager = ChangeListManager.getInstance(project);
-            project.getComponent(PylintPlugin.class)
+            project.getService(PylintPlugin.class)
                     .asyncScanFiles(VfUtil.filterOnlyPythonProjectFiles(project,
                             filesFor(changeListManager.getDefaultChangeList())));
         } catch (Throwable e) {
@@ -85,7 +85,7 @@ public void update(final AnActionEvent event) {
                 return;
             }
 
-            final PylintPlugin pylintPlugin = project.getComponent(PylintPlugin.class);
+            final PylintPlugin pylintPlugin = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanCurrentFile.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanCurrentFile.java
index 8737edc..caad3d9 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanCurrentFile.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanCurrentFile.java
@@ -46,7 +46,7 @@ public void actionPerformed(final AnActionEvent event) {
 
         try {
             final PylintPlugin pylintPlugin
-                    = project.getComponent(PylintPlugin.class);
+                    = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
@@ -59,7 +59,7 @@ public void actionPerformed(final AnActionEvent event) {
 
                     final VirtualFile selectedFile = getSelectedFile(project);
                     if (selectedFile != null) {
-                        project.getComponent(PylintPlugin.class).asyncScanFiles(
+                        project.getService(PylintPlugin.class).asyncScanFiles(
                                 Collections.singletonList(selectedFile));
                     }
 
@@ -111,7 +111,7 @@ public void update(final AnActionEvent event) {
             }
 
             final PylintPlugin pylintPlugin
-                    = project.getComponent(PylintPlugin.class);
+                    = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanEverythingAction.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanEverythingAction.java
index 8b7d4a8..e61944d 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanEverythingAction.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanEverythingAction.java
@@ -39,6 +39,6 @@ public void run() {
         filesToScan = VfUtil.flattenFiles(new VirtualFile[]{project.getBaseDir()});
         filesToScan = VfUtil.filterOnlyPythonProjectFiles(project, filesToScan);
 
-        project.getComponent(PylintPlugin.class).asyncScanFiles(filesToScan);
+        project.getService(PylintPlugin.class).asyncScanFiles(filesToScan);
     }
 }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanModifiedFiles.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanModifiedFiles.java
index 4ead0f7..594a034 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanModifiedFiles.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanModifiedFiles.java
@@ -47,7 +47,7 @@ public final void actionPerformed(final AnActionEvent event) {
             }
 
             final ChangeListManager changeListManager = ChangeListManager.getInstance(project);
-            project.getComponent(PylintPlugin.class).asyncScanFiles(
+            project.getService(PylintPlugin.class).asyncScanFiles(
                     VfUtil.filterOnlyPythonProjectFiles(project, changeListManager.getAffectedFiles())
             );
         } catch (Throwable e) {
@@ -66,7 +66,7 @@ public void update(final AnActionEvent event) {
                 return;
             }
 
-            final PylintPlugin pylintPlugin = project.getComponent(PylintPlugin.class);
+            final PylintPlugin pylintPlugin = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanModule.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanModule.java
index 83475ca..0e48f14 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanModule.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanModule.java
@@ -58,7 +58,7 @@ public final void actionPerformed(final AnActionEvent event) {
             }
 
             final PylintPlugin pylintPlugin
-                    = project.getComponent(PylintPlugin.class);
+                    = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
@@ -107,7 +107,7 @@ public final void update(final AnActionEvent event) {
             }
 
             final PylintPlugin pylintPlugin
-                    = project.getComponent(PylintPlugin.class);
+                    = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanProject.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanProject.java
index 852f2ef..0cfb1e2 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanProject.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanProject.java
@@ -40,7 +40,7 @@ public void actionPerformed(final AnActionEvent event) {
                 return;
             }
 
-            final PylintPlugin pylintPlugin = project.getComponent(PylintPlugin.class);
+            final PylintPlugin pylintPlugin = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
@@ -89,7 +89,7 @@ public void update(final AnActionEvent event) {
                 return;
             }
 
-            final PylintPlugin pylintPlugin = project.getComponent(PylintPlugin.class);
+            final PylintPlugin pylintPlugin = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanSourceRootsAction.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanSourceRootsAction.java
index ef97411..f916d7c 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ScanSourceRootsAction.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ScanSourceRootsAction.java
@@ -34,7 +34,7 @@ class ScanSourceRootsAction implements Runnable {
 
     @Override
     public void run() {
-        project.getComponent(PylintPlugin.class)
+        project.getService(PylintPlugin.class)
                 .asyncScanFiles(VfUtil.filterOnlyPythonProjectFiles(project,
                         VfUtil.flattenFiles(sourceRoots)));
     }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/ScrollToSource.java b/src/main/java/com/leinardi/pycharm/pylint/actions/ScrollToSource.java
index f36d5a2..a1f8519 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/ScrollToSource.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/ScrollToSource.java
@@ -39,7 +39,7 @@ public boolean isSelected(final AnActionEvent event) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
@@ -63,7 +63,7 @@ public void setSelected(final AnActionEvent event, final boolean selected) {
         }
 
         final PylintPlugin pylintPlugin
-                = project.getComponent(PylintPlugin.class);
+                = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/Settings.java b/src/main/java/com/leinardi/pycharm/pylint/actions/Settings.java
index cc3c3a4..febb387 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/Settings.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/Settings.java
@@ -35,7 +35,7 @@ public void actionPerformed(final AnActionEvent event) {
             return;
         }
 
-        final PylintPlugin pylintPlugin = project.getComponent(PylintPlugin.class);
+        final PylintPlugin pylintPlugin = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/actions/StopCheck.java b/src/main/java/com/leinardi/pycharm/pylint/actions/StopCheck.java
index 26aca89..ae4ef80 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/actions/StopCheck.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/actions/StopCheck.java
@@ -39,7 +39,7 @@ public void actionPerformed(final AnActionEvent event) {
 
         try {
             final PylintPlugin pylintPlugin
-                    = project.getComponent(PylintPlugin.class);
+                    = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
@@ -70,7 +70,7 @@ public void update(final AnActionEvent event) {
             }
 
             final PylintPlugin pylintPlugin
-                    = project.getComponent(PylintPlugin.class);
+                    = project.getService(PylintPlugin.class);
             if (pylintPlugin == null) {
                 throw new IllegalStateException("Couldn't get pylint plugin");
             }
diff --git a/src/main/java/com/leinardi/pycharm/pylint/handlers/ScanFilesBeforeCheckinHandler.java b/src/main/java/com/leinardi/pycharm/pylint/handlers/ScanFilesBeforeCheckinHandler.java
index afa9955..91d8deb 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/handlers/ScanFilesBeforeCheckinHandler.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/handlers/ScanFilesBeforeCheckinHandler.java
@@ -101,7 +101,7 @@ public ReturnResult beforeCheckin(@Nullable final CommitExecutor executor,
             return COMMIT;
         }
 
-        final PylintPlugin plugin = project.getComponent(PylintPlugin.class);
+        final PylintPlugin plugin = project.getService(PylintPlugin.class);
         if (plugin == null) {
             LOG.warn("Could not get Pylint Plug-in, skipping");
             return COMMIT;
diff --git a/src/main/java/com/leinardi/pycharm/pylint/toolwindow/PylintToolWindowPanel.java b/src/main/java/com/leinardi/pycharm/pylint/toolwindow/PylintToolWindowPanel.java
index 102da51..f70d961 100644
--- a/src/main/java/com/leinardi/pycharm/pylint/toolwindow/PylintToolWindowPanel.java
+++ b/src/main/java/com/leinardi/pycharm/pylint/toolwindow/PylintToolWindowPanel.java
@@ -132,7 +132,7 @@ public PylintToolWindowPanel(final ToolWindow toolWindow, final Project project)
         this.toolWindow = toolWindow;
         this.project = project;
 
-        pylintPlugin = project.getComponent(PylintPlugin.class);
+        pylintPlugin = project.getService(PylintPlugin.class);
         if (pylintPlugin == null) {
             throw new IllegalStateException("Couldn't get pylint plugin");
         }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 94c638b..8a1f339 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -28,13 +28,6 @@
 
     <resource-bundle>com.leinardi.pycharm.pylint.PylintBundle</resource-bundle>
 
-    <project-components>
-        <component>
-            <implementation-class>com.leinardi.pycharm.pylint.PylintPlugin</implementation-class>
-            <interface-class>com.leinardi.pycharm.pylint.PylintPlugin</interface-class>
-        </component>
-    </project-components>
-
     <extensions defaultExtensionNs="com.intellij">
         <toolWindow id="Pylint"
                     anchor="bottom"
@@ -42,8 +35,7 @@
                     factoryClass="com.leinardi.pycharm.pylint.toolwindow.PylintToolWindowFactory"
                     icon="/com/leinardi/pycharm/pylint/images/pylint.png"/>
 
-        <projectService serviceInterface="com.leinardi.pycharm.pylint.PylintConfigService"
-                        serviceImplementation="com.leinardi.pycharm.pylint.PylintConfigService"/>
+        <projectService serviceImplementation="com.leinardi.pycharm.pylint.PylintConfigService"/>
 
         <projectConfigurable instance="com.leinardi.pycharm.pylint.PylintConfigurable"/>