feat: add window icon

Author: linyimin0812

src/main/java/io/github/linyimin/plugin/compile/MybatisPojoCompile.java

@@ -5,8 +5,10 @@
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.OrderEnumerator;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.lang.UrlClassLoader;
 import io.github.linyimin.plugin.dom.Constant;
 import io.github.linyimin.plugin.utils.JavaUtils;
@@ -18,6 +20,7 @@
 import java.net.URL;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -58,8 +61,8 @@ public static void setClassLoader(Project project) {
             changeLoaderUrls(preDependencies, dependencies);
         } else {
             createProjectLoader(urls);
-            preDependencies = dependencies;
         }
+        preDependencies = dependencies;
     }
 
     private static List<String> getProjectDependencies(Project project) {
@@ -76,15 +79,25 @@ private static List<String> getProjectDependencies(Project project) {
                 .stream()
                 .filter(path -> path.contains(Constant.MYBATIS_LOGGING_LOG4J)
                         || path.contains(Constant.MYBATIS_LOGGING_SLF4J)
-                        || path.contains(project.getName())
-                ).collect(Collectors.toList());
+                        || isProjectModule(project, path))
+                .collect(Collectors.toList());
 
 
         list.addAll(mapperDependencies);
 
         return list;
     }
 
+    private static boolean isProjectModule(Project project, String path) {
+        VirtualFile[] vFiles = ProjectRootManager.getInstance(project).getContentRootsFromAllModules();
+        Set<String> moduleNames = Stream.of(vFiles).map(VirtualFile::getName).collect(Collectors.toSet());
+
+        moduleNames.add(project.getName());
+        moduleNames.add(project.getBasePath());
+
+        return moduleNames.stream().anyMatch(path::contains);
+    }
+
     private static void createProjectLoader(List<URL> urls) {
         classLoader = UrlClassLoader.build().urls(urls).parent(ClassLoader.getSystemClassLoader()).get();
         attachPluginParentLoader(classLoader);
@@ -99,14 +112,12 @@ private static void attachPluginParentLoader(UrlClassLoader classLoader) {
 
         try {
             field = pluginClassLoaderClass.getDeclaredField(Constant.PLUGIN_CLASS_LOADER_PARENTS);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
+        } catch (NoSuchFieldException ignored) {
         }
 
         try {
             field = pluginClassLoaderClass.getDeclaredField(Constant.PLUGIN_CLASS_LOADER_MY_PARENTS);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
+        } catch (NoSuchFieldException ignored) {
         }
 
         if (Objects.isNull(field)) {

src/main/java/io/github/linyimin/plugin/view/MyTextField.java

@@ -43,7 +43,7 @@ public MyTextField(Project myProject, Language language, LanguageFileType fileTy
     @Override
     public void setText(@Nullable String text) {
         super.setFileType(fileType);
-        ReadAction.nonBlocking(() -> {
+        ReadAction.run(() -> {
             Document document = createDocument(text, language, myProject, new SimpleDocumentCreator());
             setDocument(document);
             PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(document);
@@ -55,7 +55,7 @@ public void setText(@Nullable String text) {
                         }
                 );
             }
-        }).executeSynchronously();
+        });
     }
 
     private void setUpEditor(EditorEx editor) {

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

@@ -29,7 +29,7 @@
         <projectService serviceImplementation="io.github.linyimin.plugin.service.MybatisSqlStateComponent" order="first" />
         <projectService serviceImplementation="io.github.linyimin.plugin.service.SqlParamGenerateService" order="first" />
 
-        <toolWindow id="mybatis-sql-viewer" doNotActivateOnStart="true" factoryClass="io.github.linyimin.plugin.window.MybatisSqlViewerToolWindowFactory" anchor="right" secondary="false" />
+        <toolWindow id="mybatis-sql-viewer" icon="/mybatis-sql-viewer.svg" doNotActivateOnStart="true" factoryClass="io.github.linyimin.plugin.window.MybatisSqlViewerToolWindowFactory" anchor="right" secondary="false" />
     </extensions>
 
     <actions>