Chore: Project structure refactoring to avoid circular dependencies

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvHelper.java

@@ -16,7 +16,9 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import net.seesharpsoft.intellij.lang.FileParserDefinition;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvValueSeparator;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvField;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvFile;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvRecord;
@@ -25,10 +27,7 @@
 import net.seesharpsoft.intellij.psi.PsiHelper;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvLexer.flex

@@ -1,10 +1,11 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
 import com.intellij.psi.tree.IElementType;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvEscapeCharacter;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvValueSeparator;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
-import com.intellij.psi.TokenType;
 import com.intellij.lexer.FlexLexer;
-import net.seesharpsoft.intellij.plugins.csv.CsvSeparatorHolder;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvSeparatorHolder;
 
 %%
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvLexerAdapter.java

@@ -1,6 +1,9 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
 import com.intellij.lexer.FlexAdapter;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvEscapeCharacter;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvSeparatorHolder;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvValueSeparator;
 
 public class CsvLexerAdapter extends FlexAdapter implements CsvSeparatorHolder {
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvLexerFactory.java

@@ -4,11 +4,11 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvEscapeCharacter;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvValueSeparator;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jetbrains.annotations.NotNull;
 
-import static net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings.COMMENT_INDICATOR_DEFAULT;
-
 public class CsvLexerFactory {
     protected static CsvLexerFactory INSTANCE = new CsvLexerFactory();
 
@@ -20,7 +20,7 @@ protected Lexer createLexer(@NotNull CsvValueSeparator separator, @NotNull CsvEs
         final String commentIndicator = CsvEditorSettings.getInstance().getCommentIndicator();
         if (separator.requiresCustomLexer() ||
                 escapeCharacter.isCustom() ||
-                (!commentIndicator.isEmpty() && !commentIndicator.equals(COMMENT_INDICATOR_DEFAULT))) {
+                (!commentIndicator.isEmpty() && !commentIndicator.equals(CsvEditorSettings.COMMENT_INDICATOR_DEFAULT))) {
             return new CsvSharpLexer(new CsvSharpLexer.Configuration(
                     separator.getCharacter(),
                     "\n",

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPlugin.java

@@ -1,12 +1,8 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
-import com.intellij.DynamicBundle;
 import com.intellij.ide.BrowserUtil;
 import com.intellij.ide.actions.ShowSettingsUtilImpl;
-import com.intellij.ide.plugins.IdeaPluginDescriptor;
-import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.notification.*;
-import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
@@ -21,24 +17,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ResourceBundle;
-
 public class CsvPlugin implements ProjectActivity, DumbAware {
 
-    private static ResourceBundle _resourceBundle;
-    
-    protected static IdeaPluginDescriptor getPluginDescriptor() {
-        return PluginManagerCore.getPlugin(PluginId.getId("net.seesharpsoft.intellij.plugins.csv"));
-    }
-
-    protected static String getVersion() {
-        return getPluginDescriptor().getVersion();
-    }
-
-    protected static String getChangeNotes() {
-        return getPluginDescriptor().getChangeNotes();
-    }
-
     private static void openLink(Project project, String link) {
         if (project.isDisposed()) return;
 
@@ -79,13 +59,13 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
         doAsyncProjectMaintenance(project);
 
         NotificationGroup notificationGroup = NotificationGroupManager.getInstance().getNotificationGroup("net.seesharpsoft.intellij.plugins.csv");
-        if (notificationGroup == null || CsvEditorSettings.getInstance().checkCurrentPluginVersion(getVersion())) {
+        if (notificationGroup == null || CsvEditorSettings.getInstance().checkCurrentPluginVersion(CsvPluginManager.getVersion())) {
             return continuation;
         }
 
         Notification notification = notificationGroup.createNotification(
-                "CSV Editor " + getVersion() + " - Change Notes",
-                getChangeNotes() +
+                "CSV Editor " + CsvPluginManager.getVersion() + " - Change Notes",
+                CsvPluginManager.getChangeNotes() +
                         "<p>You can always <b>customize plugin settings</b> to your likings (shortcuts below)!</p>" +
                         "<br>" +
                         "<p>Visit the <b>CSV Editor homepage</b> to read more about the available features & settings, " +
@@ -112,17 +92,4 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
 
         return continuation;
     }
-    
-    public static ResourceBundle getResourceBundle() {
-        if (_resourceBundle == null) {
-            _resourceBundle = DynamicBundle.getPluginBundle(getPluginDescriptor());
-        }
-        return _resourceBundle;
-    }
-
-    public static String getLocalizedText(String token) {
-        return getResourceBundle().getString(token);
-    }
-
-
 }

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPluginManager.java

@@ -0,0 +1,39 @@
+package net.seesharpsoft.intellij.plugins.csv;
+
+import com.intellij.DynamicBundle;
+import com.intellij.ide.plugins.IdeaPluginDescriptor;
+import com.intellij.ide.plugins.PluginManagerCore;
+import com.intellij.openapi.extensions.PluginId;
+
+import java.util.ResourceBundle;
+
+public final class CsvPluginManager {
+    private static ResourceBundle _resourceBundle;
+
+    public static ResourceBundle getResourceBundle() {
+        if (_resourceBundle == null) {
+            _resourceBundle = DynamicBundle.getPluginBundle(getPluginDescriptor());
+        }
+        return _resourceBundle;
+    }
+
+    public static String getLocalizedText(String token) {
+        return getResourceBundle().getString(token);
+    }
+
+    public static IdeaPluginDescriptor getPluginDescriptor() {
+        return PluginManagerCore.getPlugin(PluginId.getId("net.seesharpsoft.intellij.plugins.csv"));
+    }
+
+    public static String getVersion() {
+        return getPluginDescriptor().getVersion();
+    }
+
+    public static String getChangeNotes() {
+        return getPluginDescriptor().getChangeNotes();
+    }
+
+    private CsvPluginManager() {
+        // static
+    }
+}

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvSharpLexer.java

@@ -4,6 +4,8 @@
 import com.intellij.psi.tree.IElementType;
 import net.seesharpsoft.UnhandledSwitchCaseException;
 import net.seesharpsoft.commons.util.Tokenizer;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvSeparatorHolder;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvValueSeparator;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterAction.java

@@ -4,7 +4,7 @@
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.FileContentUtilCore;
-import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 import org.jetbrains.annotations.NotNull;

src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterActionGroup.java

@@ -2,7 +2,7 @@
 
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.psi.PsiFile;
-import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
 import org.jetbrains.annotations.NotNull;

src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorAction.java

@@ -6,8 +6,8 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.util.FileContentUtilCore;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
-import net.seesharpsoft.intellij.plugins.csv.CsvSeparatorHolder;
-import net.seesharpsoft.intellij.plugins.csv.CsvValueSeparator;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvSeparatorHolder;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvValueSeparator;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 import org.jetbrains.annotations.NotNull;