88: Configuration of custom include paths for new projects

Fixes #88

Author: kshchepanovskyi

src/main/java/io/protostuff/jetbrains/plugin/GoToClassContributor.java

@@ -82,7 +82,7 @@ private List<ProtoType> getProtoTypes(Project project, boolean includeNonProject
         List<VirtualFile> files = new ArrayList<>();
         addProjectAndLibraryFiles(project, includeNonProjectItems, files);
         if (includeNonProjectItems) {
-            addFilesFromCustomIncludePath(project, files);
+            addFilesFromCustomIncludePath(files);
             addBundledGoogleProtos(project, files);
         }
         for (VirtualFile virtualFile : files) {
@@ -122,8 +122,8 @@ private void addProjectAndLibraryFiles(Project project, boolean includeNonProjec
         files.addAll(FileTypeIndex.getFiles(ProtoFileType.INSTANCE, scope));
     }
 
-    private void addFilesFromCustomIncludePath(Project project, List<VirtualFile> files) {
-        ProtobufSettings settings = project.getComponent(ProtobufSettings.class);
+    private void addFilesFromCustomIncludePath(List<VirtualFile> files) {
+        ProtobufSettings settings = ProtobufSettings.getInstance();
         List<VirtualFile> includePaths = settings.getIncludePathsVf();
         for (VirtualFile includePath : includePaths) {
             FileBasedIndex.iterateRecursively(includePath, file -> {

src/main/java/io/protostuff/jetbrains/plugin/reference/file/CustomIncludePathRootsProvider.java

@@ -1,7 +1,6 @@
 package io.protostuff.jetbrains.plugin.reference.file;
 
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import io.protostuff.jetbrains.plugin.psi.ProtoPsiFileRoot;
@@ -18,8 +17,7 @@ class CustomIncludePathRootsProvider implements FilePathReferenceProvider.Source
     @Override
     public VirtualFile[] getSourceRoots(Module module, ProtoPsiFileRoot psiFileRoot) {
         List<VirtualFile> result = new ArrayList<>();
-        Project project = module.getProject();
-        ProtobufSettings settings = project.getComponent(ProtobufSettings.class);
+        ProtobufSettings settings = ProtobufSettings.getInstance();
         List<String> includePaths = settings.getIncludePaths();
         for (String includePath : includePaths) {
             VirtualFile path = LocalFileSystem.getInstance().findFileByPath(includePath);

src/main/java/io/protostuff/jetbrains/plugin/settings/ProtobufSettings.java

@@ -1,9 +1,9 @@
 package io.protostuff.jetbrains.plugin.settings;
 
 import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.xmlb.XmlSerializerUtil;
@@ -18,8 +18,8 @@ public class ProtobufSettings implements PersistentStateComponent<ProtobufSettin
 
     private List<String> includePaths = new ArrayList<>();
 
-    public static ProtobufSettings getInstance(Project project) {
-        return project.getComponent(ProtobufSettings.class);
+    public static ProtobufSettings getInstance() {
+        return ServiceManager.getService(ProtobufSettings.class);
     }
 
     @NotNull

src/main/java/io/protostuff/jetbrains/plugin/settings/ProtobufSettingsConfigurable.java

@@ -19,7 +19,7 @@ public class ProtobufSettingsConfigurable implements Configurable {
 
     public ProtobufSettingsConfigurable(Project project) {
         this.project = project;
-        this.settings = ProtobufSettings.getInstance(project);
+        this.settings = ProtobufSettings.getInstance();
     }
 
     @Nls

src/main/java/io/protostuff/jetbrains/plugin/settings/SettingsForm.java

@@ -37,7 +37,7 @@ public class SettingsForm {
      * @param settings is null if settings dialog runs without a project.
      */
     @SuppressWarnings("unchecked")
-    public SettingsForm(Project project, @Nullable ProtobufSettings settings) {
+    public SettingsForm(@Nullable Project project, @Nullable ProtobufSettings settings) {
         this.project = project;
         List<String> internalIncludePathList = new ArrayList<>();
         if (settings != null) {

src/main/resources/META-INF/plugin.xml

@@ -102,9 +102,6 @@
         <component>
             <implementation-class>io.protostuff.jetbrains.plugin.ProtostuffPluginController</implementation-class>
         </component>
-        <component>
-            <implementation-class>io.protostuff.jetbrains.plugin.settings.ProtobufSettings</implementation-class>
-        </component>
         <component>
             <interface-class>io.protostuff.jetbrains.plugin.reference.FieldReferenceProvider</interface-class>
             <implementation-class>io.protostuff.jetbrains.plugin.reference.FieldReferenceProviderImpl
@@ -165,6 +162,8 @@
                 language="PROTO"
                 implementationClass="io.protostuff.jetbrains.plugin.ProtoFoldingBuilder"/>
 
+        <applicationService serviceImplementation="io.protostuff.jetbrains.plugin.settings.ProtobufSettings"/>
+
         <projectConfigurable instance="io.protostuff.jetbrains.plugin.settings.ProtobufSettingsConfigurable"/>
 
         <annotator
@@ -215,7 +214,7 @@
 
         <spellchecker.support
                 language="PROTO"
-                implementationClass="io.protostuff.jetbrains.plugin.spellchecker.ProtoSpellcheckingStrategy" />
+                implementationClass="io.protostuff.jetbrains.plugin.spellchecker.ProtoSpellcheckingStrategy"/>
     </extensions>
 
     <actions>

src/test/java/io/protostuff/jetbrains/plugin/navigation/GoToClassTest.java

@@ -122,7 +122,7 @@ public void testMultipleElements() throws Exception {
 
     public void testGoToMessage_inCustomIncludePath() throws Exception {
         File includePathRoot = tempDir;
-        ProtobufSettings settings = getProject().getComponent(ProtobufSettings.class);
+        ProtobufSettings settings = ProtobufSettings.getInstance();
         settings.setIncludePaths(Collections.singletonList(includePathRoot.getAbsolutePath()));
         File proto = new File(tempDir.getPath() + "/test.proto");
         Writer writer = new BufferedWriter(new FileWriter(proto));
@@ -138,12 +138,8 @@ private ProtoPsiFileRoot addProto(String name, String text) {
     }
 
     private ProtoType findType(final ProtoPsiFileRoot file, final String fullName) {
-        return ApplicationManager.getApplication().runReadAction(new Computable<ProtoType>() {
-            @Override
-            public ProtoType compute() {
-                return file.findType(fullName);
-            }
-        });
+        return ApplicationManager.getApplication()
+                .runReadAction((Computable<ProtoType>) () -> file.findType(fullName));
     }
 
     private List<Object> getPopupElements(ChooseByNameModel model, String text, boolean checkboxState) {