[INTERNAL] additional code cleanup

Author: SeeSharpSoft

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

@@ -4,7 +4,6 @@ import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.openapi.project.Project;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
-import static net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings.getCurrentSeparator;
 import com.intellij.psi.TokenType;
 
 %%

src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnIntentionAction.java

@@ -18,9 +18,9 @@ protected CsvShiftColumnIntentionAction(String text) {
         super(text);
     }
 
-    protected static void changeLeftAndRightColumnOrder(@NotNull Project project, CsvFile psiFile, CsvColumnInfo<PsiElement> leftColumnInfo, CsvColumnInfo<PsiElement> rightColumnInfo) {
-        Document document = PsiDocumentManager.getInstance(project).getDocument(psiFile);
-        document.setText(changeLeftAndRightColumnOrder(document.getText(), CsvCodeStyleSettings.getCurrentSeparator(project, psiFile.getLanguage()), leftColumnInfo, rightColumnInfo));
+    protected static void changeLeftAndRightColumnOrder(@NotNull Project project, CsvFile csvFile, CsvColumnInfo<PsiElement> leftColumnInfo, CsvColumnInfo<PsiElement> rightColumnInfo) {
+        Document document = PsiDocumentManager.getInstance(project).getDocument(csvFile);
+        document.setText(changeLeftAndRightColumnOrder(document.getText(), CsvCodeStyleSettings.getCurrentSeparator(project, csvFile.getLanguage()), leftColumnInfo, rightColumnInfo));
     }
 
     @NotNull
@@ -43,10 +43,10 @@ protected static String changeLeftAndRightColumnOrder(String text, String separa
                     TextRange.create(middleSeparator.getEndOffset(), middleSeparator.getEndOffset()) :
                     findNextSeparatorOrCRLF(rightElement);
 
-            newText.append(text.substring(lastIndex, leftSeparator.getEndOffset()))
-                    .append(text.substring(middleSeparator.getEndOffset(), rightSeparator.getStartOffset()))
+            newText.append(text, lastIndex, leftSeparator.getEndOffset())
+                    .append(text, middleSeparator.getEndOffset(), rightSeparator.getStartOffset())
                     .append(separator)
-                    .append(text.substring(leftSeparator.getEndOffset(), middleSeparator.getStartOffset()));
+                    .append(text, leftSeparator.getEndOffset(), middleSeparator.getStartOffset());
 
             lastIndex = rightSeparator.getStartOffset();
         }

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

@@ -3,7 +3,6 @@
 import com.intellij.lang.Language;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectCoreUtil;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
@@ -48,10 +47,6 @@ public static String getCurrentSeparator(@Nullable Project project, @Nullable La
         return getCurrentSeparator(project);
     }
 
-    public static String getCurrentSeparator() {
-        return getCurrentSeparator(ProjectCoreUtil.theOnlyOpenProject());
-    }
-
     public CsvCodeStyleSettings(CodeStyleSettings settings) {
         super("CsvCodeStyleSettings", settings);
     }