Fix: Apply code review

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettings.java

@@ -75,8 +75,8 @@ public String getDisplay() {
     public static final class OptionSet {
         public String CURRENT_PLUGIN_VERSION;
 
-        public boolean CARET_ROW_SHOWN;
-        public boolean USE_SOFT_WRAP;
+        public boolean CARET_ROW_SHOWN = true;
+        public boolean USE_SOFT_WRAP = false;
         public boolean HIGHTLIGHT_TAB_SEPARATOR = true;
         public boolean SHOW_INFO_BALLOON = true;
         public String TAB_HIGHLIGHT_COLOR = "-7984";
@@ -100,18 +100,6 @@ public static final class OptionSet {
         private boolean isInitialized = false;
 
         public OptionSet() {}
-
-        public void init() {
-            if (this.isInitialized) {
-                return;
-            }
-
-            EditorSettingsExternalizable editorSettingsExternalizable = EditorSettingsExternalizable.getInstance();
-            CARET_ROW_SHOWN = editorSettingsExternalizable == null ? true : editorSettingsExternalizable.isCaretRowShown();
-            USE_SOFT_WRAP = editorSettingsExternalizable == null ? false : editorSettingsExternalizable.isUseSoftWraps();
-
-            this.isInitialized = true;
-        }
     }
 
     private OptionSet myOptions = new OptionSet();
@@ -138,7 +126,6 @@ public void removePropertyChangeListener(PropertyChangeListener listener) {
 
     @Override
     public OptionSet getState() {
-        this.myOptions.init();
         return this.myOptions;
     }
 
@@ -150,39 +137,39 @@ public void loadState(@NotNull OptionSet state) {
     /*********** Settings section **********/
 
     public boolean isCaretRowShown() {
-        return this.myOptions.CARET_ROW_SHOWN;
+        return getState().CARET_ROW_SHOWN;
     }
 
     public void setCaretRowShown(boolean caretRowShown) {
         getState().CARET_ROW_SHOWN = caretRowShown;
     }
 
     public boolean isUseSoftWraps() {
-        return this.myOptions.USE_SOFT_WRAP;
+        return getState().USE_SOFT_WRAP;
     }
 
     public void setUseSoftWraps(boolean useSoftWraps) {
         getState().USE_SOFT_WRAP = useSoftWraps;
     }
 
     public boolean isHighlightTabSeparator() {
-        return this.myOptions.HIGHTLIGHT_TAB_SEPARATOR;
+        return getState().HIGHTLIGHT_TAB_SEPARATOR;
     }
 
     public void setHighlightTabSeparator(boolean highlightTabSeparator) {
         getState().HIGHTLIGHT_TAB_SEPARATOR = highlightTabSeparator;
     }
 
     public boolean isShowInfoBalloon() {
-        return this.myOptions.SHOW_INFO_BALLOON;
+        return getState().SHOW_INFO_BALLOON;
     }
 
     public void setShowInfoBalloon(boolean showInfoBalloon) {
         getState().SHOW_INFO_BALLOON = showInfoBalloon;
     }
 
     public Color getTabHighlightColor() {
-        String color = this.myOptions.TAB_HIGHLIGHT_COLOR;
+        String color = getState().TAB_HIGHLIGHT_COLOR;
         try {
             return color == null || color.isEmpty() ? null : Color.decode(color);
         } catch (NumberFormatException exc) {
@@ -195,61 +182,56 @@ public void setTabHighlightColor(Color color) {
     }
 
     public EditorPrio getEditorPrio() {
-        // Important: avoid triggering OptionSet.init() here because it consults
-        // EditorSettingsExternalizable on first access which may require UI/EDT
-        // initialization. The file editor providers call this method from background
-        // threads during provider discovery, and any slow or blocking initialization
-        // can lead to timeouts when the IDE checks providers.
-        // Access the current option directly to keep provider checks fast and non-blocking.
-        return this.myOptions.EDITOR_PRIO;
+        return getState().EDITOR_PRIO;
     }
 
     public void setEditorPrio(EditorPrio editorPrio) {
         getState().EDITOR_PRIO = editorPrio;
     }
 
     public boolean showTableEditorInfoPanel() {
-        return this.myOptions.SHOW_TABLE_EDITOR_INFO_PANEL;
+        return getState().SHOW_TABLE_EDITOR_INFO_PANEL;
     }
 
     public void showTableEditorInfoPanel(boolean showInfoPanel) {
         getState().SHOW_TABLE_EDITOR_INFO_PANEL = showInfoPanel;
     }
 
     public int getTableEditorRowHeight() {
-        return this.myOptions.TABLE_EDITOR_ROW_HEIGHT;
+        int rowHeight = getState().TABLE_EDITOR_ROW_HEIGHT;
+        return rowHeight > TABLE_EDITOR_ROW_HEIGHT_MAX || rowHeight < TABLE_EDITOR_ROW_HEIGHT_MIN ? TABLE_EDITOR_ROW_HEIGHT_DEFAULT : rowHeight;
     }
 
     public void setTableEditorRowHeight(int rowHeight) {
         getState().TABLE_EDITOR_ROW_HEIGHT = rowHeight > TABLE_EDITOR_ROW_HEIGHT_MAX || rowHeight < TABLE_EDITOR_ROW_HEIGHT_MIN ? TABLE_EDITOR_ROW_HEIGHT_DEFAULT : rowHeight;
     }
 
     public boolean isQuotingEnforced() {
-        return this.myOptions.QUOTING_ENFORCED;
+        return getState().QUOTING_ENFORCED;
     }
 
     public void setQuotingEnforced(boolean quotingEnforced) {
         getState().QUOTING_ENFORCED = quotingEnforced;
     }
 
     public boolean isZeroBasedColumnNumbering() {
-        return this.myOptions.ZERO_BASED_COLUMN_NUMBERING;
+        return getState().ZERO_BASED_COLUMN_NUMBERING;
     }
 
     public void setZeroBasedColumnNumbering(boolean zeroBasedColumnNumbering) {
         getState().ZERO_BASED_COLUMN_NUMBERING = zeroBasedColumnNumbering;
     }
 
     public int getTableAutoMaxColumnWidth() {
-        return this.myOptions.TABLE_AUTO_MAX_COLUMN_WIDTH;
+        return getState().TABLE_AUTO_MAX_COLUMN_WIDTH;
     }
 
     public void setTableAutoMaxColumnWidth(int tableAutoMaxColumnWidth) {
         getState().TABLE_AUTO_MAX_COLUMN_WIDTH = tableAutoMaxColumnWidth;
     }
 
     public int getTableDefaultColumnWidth() {
-        return this.myOptions.TABLE_DEFAULT_COLUMN_WIDTH;
+        return getState().TABLE_DEFAULT_COLUMN_WIDTH;
     }
 
     public void setTableDefaultColumnWidth(int tableDefaultColumnWidth) {
@@ -265,7 +247,7 @@ public void setDefaultEscapeCharacter(CsvEscapeCharacter defaultEscapeCharacter)
     }
 
     public CsvEscapeCharacter getDefaultEscapeCharacter() {
-        CsvEscapeCharacter csvValueSeparator = this.myOptions.DEFAULT_ESCAPE_CHARACTER;
+        CsvEscapeCharacter csvValueSeparator = getState().DEFAULT_ESCAPE_CHARACTER;
         return csvValueSeparator == null ? ESCAPE_CHARACTER_DEFAULT : csvValueSeparator;
     }
 
@@ -278,7 +260,7 @@ public void setDefaultValueSeparator(CsvValueSeparator defaultValueSeparator) {
     }
 
     public CsvValueSeparator getDefaultValueSeparator() {
-        CsvValueSeparator csvValueSeparator = this.myOptions.DEFAULT_VALUE_SEPARATOR;
+        CsvValueSeparator csvValueSeparator = getState().DEFAULT_VALUE_SEPARATOR;
         return csvValueSeparator == null ? VALUE_SEPARATOR_DEFAULT : csvValueSeparator;
     }
 
@@ -287,7 +269,7 @@ public void setKeepTrailingSpaces(boolean keepTrailingSpaces) {
     }
 
     public boolean getKeepTrailingSpaces() {
-        return this.myOptions.KEEP_TRAILING_SPACES;
+        return getState().KEEP_TRAILING_SPACES;
     }
 
     public void setCommentIndicator(String commentIndicator) {
@@ -299,11 +281,11 @@ public void setCommentIndicator(String commentIndicator) {
     }
 
     public String getCommentIndicator() {
-        return this.myOptions.COMMENT_INDICATOR;
+        return getState().COMMENT_INDICATOR;
     }
 
     public ValueColoring getValueColoring() {
-        return this.myOptions.VALUE_COLORING;
+        return getState().VALUE_COLORING;
     }
 
     public void setValueColoring(ValueColoring valueColoring) {
@@ -315,7 +297,7 @@ public void setValueColoring(ValueColoring valueColoring) {
     }
 
     public boolean isAutoDetectValueSeparator() {
-        return this.myOptions.AUTO_DETECT_VALUE_SEPARATOR;
+        return getState().AUTO_DETECT_VALUE_SEPARATOR;
     }
 
     public void setAutoDetectValueSeparator(boolean autoDetectValueSeparator) {

src/test/java/net/seesharpsoft/intellij/plugins/csv/CsvGithubIssueSubmitterTest.java

@@ -28,10 +28,6 @@ public void printStackTrace(PrintWriter writer) {
 
     private CsvGithubIssueSubmitterSubClass classUnderTest = new CsvGithubIssueSubmitterSubClass();
 
-    public String callSearchExistingIssues(String title) throws Exception {
-        return classUnderTest.searchExistingIssues(null, title, null);
-    }
-
     public void testSearchExistingIssuesNeedle() throws Exception {
         assertEquals("crash", classUnderTest.searchExistingIssuesNeedle(null));
         assertEquals("crash", classUnderTest.searchExistingIssuesNeedle(""));