From d91fe7810122f4044c0b3d8242c4dbbd847df9be Mon Sep 17 00:00:00 2001 From: Michail Plushnikov Date: Sun, 30 Aug 2020 12:37:21 +0200 Subject: [PATCH] backported some changes --- .../intellij/plugin/lombokconfig/ConfigDiscovery.java | 3 ++- .../intellij/plugin/settings/ProjectSettingsPage.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/plushnikov/intellij/plugin/lombokconfig/ConfigDiscovery.java b/src/main/java/de/plushnikov/intellij/plugin/lombokconfig/ConfigDiscovery.java index 314927a1a..e90fc7c4e 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/lombokconfig/ConfigDiscovery.java +++ b/src/main/java/de/plushnikov/intellij/plugin/lombokconfig/ConfigDiscovery.java @@ -1,6 +1,7 @@ package de.plushnikov.intellij.plugin.lombokconfig; import com.google.common.annotations.VisibleForTesting; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; @@ -127,7 +128,7 @@ private String discoverProperty(@NotNull ConfigKey configKey, @NotNull String ca @VisibleForTesting protected FileBasedIndex getFileBasedIndex() { - return ServiceManager.getService(FileBasedIndex.class); + return ApplicationManager.getApplication().getComponent(FileBasedIndex.class); } @Nullable diff --git a/src/main/java/de/plushnikov/intellij/plugin/settings/ProjectSettingsPage.java b/src/main/java/de/plushnikov/intellij/plugin/settings/ProjectSettingsPage.java index 1f21e14c1..3dd80c221 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/settings/ProjectSettingsPage.java +++ b/src/main/java/de/plushnikov/intellij/plugin/settings/ProjectSettingsPage.java @@ -102,7 +102,7 @@ public void apply() { ProjectSettings.setEnabled(myProject, ProjectSettings.IS_MISSING_LOMBOK_CHECK_ENABLED, myMissingLombokWarning.isSelected()); ProjectSettings.setEnabled(myProject, ProjectSettings.IS_ANNOTATION_PROCESSING_CHECK_ENABLED, myAnnotationProcessingWarning.isSelected()); - LombokProcessorProvider lombokProcessorProvider = myProject.getService(LombokProcessorProvider.class); + LombokProcessorProvider lombokProcessorProvider = LombokProcessorProvider.getInstance(myProject); lombokProcessorProvider.initProcessors(); }