[FIX] additional NULL checks & API corrections

Sommer · Sommer · commit 76c9e329d58b · 2019-05-14T08:11:43.000+02:00
Fixes #128
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvStorageHelper.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvStorageHelper.java
@@ -4,7 +4,6 @@
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.PathUtil;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.regex.Pattern;
 
@@ -13,7 +12,10 @@ public final class CsvStorageHelper {
 
     public static final Key<String> RELATIVE_FILE_URL = Key.create("CSV_PLUGIN_RELATIVE_URL");
 
-    public static String getRelativeFileUrl(@NotNull Project project, @NotNull VirtualFile virtualFile) {
+    public static String getRelativeFileUrl(Project project, VirtualFile virtualFile) {
+        if (project == null || virtualFile == null) {
+            return null;
+        }
         String url = virtualFile.getUserData(RELATIVE_FILE_URL);
         if (url == null) {
             String projectDir = PathUtil.getLocalPath(project.getBasePath());
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorAction.java
@@ -28,7 +28,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
                 return false;
             }
             CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
-            return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(psiFile).equals(mySeparator);
+            return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile).equals(mySeparator);
         }
 
         @Override
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionGroup.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionGroup.java
@@ -34,7 +34,7 @@ public void update(AnActionEvent anActionEvent) {
 
         if (psiFile != null) {
             anActionEvent.getPresentation()
-                    .setText(String.format("CSV Value Separator: %s", CsvCodeStyleSettings.getSeparatorDisplayText(CsvCodeStyleSettings.getCurrentSeparator(psiFile))));
+                    .setText(String.format("CSV Value Separator: %s", CsvCodeStyleSettings.getSeparatorDisplayText(CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile))));
         }
     }
 
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributes.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributes.java
@@ -47,22 +47,32 @@ protected String generateMapKey(@NotNull Project project, @NotNull VirtualFile v
     }
 
     public void setFileSeparator(@NotNull PsiFile psiFile, @NotNull String separator) {
-        Attribute state = attributeMap.get(generateMapKey(psiFile));
+        String key = generateMapKey(psiFile);
+        if (key == null) {
+            return;
+        }
+        Attribute state = attributeMap.get(key);
         if (state == null) {
             state = new Attribute();
-            attributeMap.put(generateMapKey(psiFile), state);
+            attributeMap.put(key, state);
         }
         state.separator = separator;
     }
 
     public void removeFileSeparator(@NotNull PsiFile psiFile) {
-        attributeMap.remove(generateMapKey(psiFile));
+        String key = generateMapKey(psiFile);
+        if (key != null) {
+            attributeMap.remove(key);
+        }
     }
 
     public String getFileSeparator(@NotNull Project project, @NotNull VirtualFile virtualFile) {
-        Attribute state = attributeMap.get(generateMapKey(project, virtualFile));
-        if (state != null) {
-            return state.separator;
+        String key = generateMapKey(project, virtualFile);
+        if (key != null) {
+            Attribute state = attributeMap.get(key);
+            if (state != null) {
+                return state.separator;
+            }
         }
         return null;
     }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java
@@ -39,7 +39,7 @@ public void annotate(@NotNull final PsiElement element, @NotNull final Annotatio
             return;
         }
 
-        CsvColumnInfo<PsiElement> columnInfo = csvFile.getMyColumnInfoMap().getColumnInfo(element);
+        CsvColumnInfo<PsiElement> columnInfo = csvFile.getColumnInfoMap().getColumnInfo(element);
 
         if (columnInfo != null) {
             PsiElement headerElement = columnInfo.getHeaderElement();
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java
@@ -101,7 +101,7 @@ public boolean isEditable() {
 
     public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {
         CsvFile csvFile = getCsvFile();
-        return csvFile == null ? null : csvFile.getMyColumnInfoMap();
+        return csvFile == null ? null : csvFile.getColumnInfoMap();
     }
 
     public boolean hasErrors() {
@@ -289,7 +289,7 @@ public CsvFile getCsvFile() {
             this.document = FileDocumentManager.getInstance().getDocument(this.file);
             PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project);
             this.psiFile = documentManager.getPsiFile(this.document);
-            this.currentSeparator = CsvCodeStyleSettings.getCurrentSeparator(this.psiFile);
+            this.currentSeparator = CsvCodeStyleSettings.getCurrentSeparator(this.getProject(), this.getFile());
         }
         return this.psiFile instanceof CsvFile ? (CsvFile) psiFile : null;
     }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.java
@@ -338,7 +338,7 @@ protected void updateUIComponents() {
             return;
         }
 
-        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getMyColumnInfoMap();
+        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getColumnInfoMap();
         if (Objects.equals(lastColumnInfoMap, columnInfoMap)) {
             return;
         }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandler.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandler.java
@@ -52,9 +52,9 @@ protected void selectTargets(List<PsiElement> list, Consumer<List<PsiElement>> c
 
     @Override
     public void computeUsages(List<PsiElement> list) {
-        CsvColumnInfoMap<PsiElement> columnInfoMap = getCsvFile().getMyColumnInfoMap();
+        CsvColumnInfoMap<PsiElement> columnInfoMap = getCsvFile().getColumnInfoMap();
         for (PsiElement listElement : list) {
-            CsvColumnInfo<PsiElement> csvColumnInfo = getCsvFile().getMyColumnInfoMap().getColumnInfo(listElement);
+            CsvColumnInfo<PsiElement> csvColumnInfo = getCsvFile().getColumnInfoMap().getColumnInfo(listElement);
             if (csvColumnInfo == null) {
                 continue;
             }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/inspection/CsvValidationInspection.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/inspection/CsvValidationInspection.java
@@ -148,7 +148,7 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
             try {
                 PsiElement element = descriptor.getPsiElement();
                 Document document = PsiDocumentManager.getInstance(project).getDocument(element.getContainingFile());
-                String separator = CsvCodeStyleSettings.getCurrentSeparator(element.getContainingFile());
+                String separator = CsvCodeStyleSettings.getCurrentSeparator(project, element.getContainingFile());
                 String text = document.getText();
                 document.setText(text.substring(0, element.getTextOffset()) + separator + text.substring(element.getTextOffset()));
             } catch (IncorrectOperationException e) {
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnIntentionAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnIntentionAction.java
@@ -25,7 +25,7 @@ protected static void changeLeftAndRightColumnOrder(@NotNull Project project,
                                                         CsvColumnInfo<PsiElement> rightColumnInfo) {
         Document document = PsiDocumentManager.getInstance(project).getDocument(csvFile);
         document.setText(
-                changeLeftAndRightColumnOrder(document.getText(), CsvCodeStyleSettings.getCurrentSeparator(csvFile), leftColumnInfo, rightColumnInfo)
+                changeLeftAndRightColumnOrder(document.getText(), CsvCodeStyleSettings.getCurrentSeparator(project, csvFile), leftColumnInfo, rightColumnInfo)
         );
     }
 
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnLeftIntentionAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnLeftIntentionAction.java
@@ -22,7 +22,7 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull final PsiEl
 
         PsiElement element = CsvHelper.getParentFieldElement(psiElement);
 
-        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getMyColumnInfoMap();
+        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getColumnInfoMap();
         CsvColumnInfo<PsiElement> rightColumnInfo = columnInfoMap.getColumnInfo(element);
 
         // column must be at least index 1 to be shifted left
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnRightIntentionAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnRightIntentionAction.java
@@ -23,7 +23,7 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
 
         PsiElement element = CsvHelper.getParentFieldElement(psiElement);
 
-        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getMyColumnInfoMap();
+        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getColumnInfoMap();
         CsvColumnInfo<PsiElement> leftColumnInfo = columnInfoMap.getColumnInfo(element);
 
         // column must be at least index 1 to be shifted left
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvFile.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvFile.java
@@ -21,7 +21,7 @@ public CsvFile(@NotNull FileViewProvider viewProvider, LanguageFileType fileType
         myFileType = fileType;
     }
 
-    public CsvColumnInfoMap<PsiElement> getMyColumnInfoMap() {
+    public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {
         if (myColumnInfoMap == null || this.getModificationStamp() != myColumnInfoMapModifiedStamp) {
             myColumnInfoMap = CsvHelper.createColumnInfoMap(this);
             myColumnInfoMapModifiedStamp = getModificationStamp();
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvCodeStyleSettings.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvCodeStyleSettings.java
@@ -48,14 +48,14 @@ public static String getCurrentSeparator(CodeStyleSettings codeStyleSettings) {
         return DEFAULT_SEPARATOR;
     }
 
-    private static String getCurrentSeparator(@Nullable Project project) {
+    protected static String getCurrentSeparator(@Nullable Project project) {
         if (!ApplicationManager.getApplication().isUnitTestMode() && project != null) {
             return getCurrentSeparator(CodeStyleSettingsManager.getInstance(project).getCurrentSettings());
         }
         return DEFAULT_SEPARATOR;
     }
 
-    private static String getCurrentSeparator(@Nullable Project project, @Nullable Language language) {
+    protected static String getCurrentSeparator(@Nullable Project project, @Nullable Language language) {
         if (language != null && language instanceof CsvSeparatorHolder) {
             return ((CsvSeparatorHolder) language).getSeparator();
         }
@@ -64,7 +64,7 @@ private static String getCurrentSeparator(@Nullable Project project, @Nullable L
 
     public static String getCurrentSeparator(@Nullable Project project, @Nullable VirtualFile virtualFile) {
         if (virtualFile == null) {
-            return getCurrentSeparator((Project) null);
+            return getCurrentSeparator(project);
         }
         CsvFileAttributes csvFileAttributes = project != null ? ServiceManager.getService(project, CsvFileAttributes.class) : null;
         String separator = csvFileAttributes != null ? csvFileAttributes.getFileSeparator(project, virtualFile) : null;
@@ -74,8 +74,15 @@ public static String getCurrentSeparator(@Nullable Project project, @Nullable Vi
                         getCurrentSeparator(project);
     }
 
+    public static String getCurrentSeparator(@Nullable Project project, @Nullable PsiFile psiFile) {
+        return getCurrentSeparator(project, psiFile == null ? null : psiFile.getOriginalFile().getVirtualFile());
+    }
+
     public static String getCurrentSeparator(@Nullable PsiFile psiFile) {
-        return getCurrentSeparator(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile());
+        if (psiFile == null) {
+            return getCurrentSeparator((Project) null);
+        }
+        return getCurrentSeparator(psiFile.getProject(), psiFile);
     }
 
     public static String getSeparatorDisplayText(String separator) {
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/structureview/CsvStructureViewElement.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/structureview/CsvStructureViewElement.java
@@ -98,7 +98,7 @@ protected List<PsiElement> getElements(CsvColumnInfo<PsiElement> columnInfo, int
         public TreeElement[] getChildren() {
             if (myElement instanceof CsvFile) {
                 CsvFile csvFile = (CsvFile) myElement;
-                CsvColumnInfoMap csvColumnInfoMap = csvFile.getMyColumnInfoMap();
+                CsvColumnInfoMap csvColumnInfoMap = csvFile.getColumnInfoMap();
                 int maxRowNumbers = csvColumnInfoMap.getColumnInfo(0).getSize();
                 if (csvColumnInfoMap.hasEmptyLastLine() && CsvEditorSettingsExternalizable.getInstance().isFileEndLineBreak()) {
                     --maxRowNumbers;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {`
`28`	`28`	`return false;`
`29`	`29`	`}`
`30`	`30`	`CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);`
`31`		`- return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(psiFile).equals(mySeparator);`
	`31`	`+ return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile).equals(mySeparator);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void update(AnActionEvent anActionEvent) {`
`34`	`34`
`35`	`35`	`if (psiFile != null) {`
`36`	`36`	`anActionEvent.getPresentation()`
`37`		`- .setText(String.format("CSV Value Separator: %s", CsvCodeStyleSettings.getSeparatorDisplayText(CsvCodeStyleSettings.getCurrentSeparator(psiFile))));`
	`37`	`+ .setText(String.format("CSV Value Separator: %s", CsvCodeStyleSettings.getSeparatorDisplayText(CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile))));`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public void annotate(@NotNull final PsiElement element, @NotNull final Annotatio`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`	`41`
`42`		`- CsvColumnInfo<PsiElement> columnInfo = csvFile.getMyColumnInfoMap().getColumnInfo(element);`
	`42`	`+ CsvColumnInfo<PsiElement> columnInfo = csvFile.getColumnInfoMap().getColumnInfo(element);`
`43`	`43`
`44`	`44`	`if (columnInfo != null) {`
`45`	`45`	`PsiElement headerElement = columnInfo.getHeaderElement();`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public boolean isEditable() {`
`101`	`101`
`102`	`102`	`public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {`
`103`	`103`	`CsvFile csvFile = getCsvFile();`
`104`		`- return csvFile == null ? null : csvFile.getMyColumnInfoMap();`
	`104`	`+ return csvFile == null ? null : csvFile.getColumnInfoMap();`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`public boolean hasErrors() {`
`@@ -289,7 +289,7 @@ public CsvFile getCsvFile() {`
`289`	`289`	`this.document = FileDocumentManager.getInstance().getDocument(this.file);`
`290`	`290`	`PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project);`
`291`	`291`	`this.psiFile = documentManager.getPsiFile(this.document);`
`292`		`- this.currentSeparator = CsvCodeStyleSettings.getCurrentSeparator(this.psiFile);`
	`292`	`+ this.currentSeparator = CsvCodeStyleSettings.getCurrentSeparator(this.getProject(), this.getFile());`
`293`	`293`	`}`
`294`	`294`	`return this.psiFile instanceof CsvFile ? (CsvFile) psiFile : null;`
`295`	`295`	`}`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ protected void updateUIComponents() {`
`338`	`338`	`return;`
`339`	`339`	`}`
`340`	`340`
`341`		`- CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getMyColumnInfoMap();`
	`341`	`+ CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getColumnInfoMap();`
`342`	`342`	`if (Objects.equals(lastColumnInfoMap, columnInfoMap)) {`
`343`	`343`	`return;`
`344`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected static void changeLeftAndRightColumnOrder(@NotNull Project project,`
`25`	`25`	`CsvColumnInfo<PsiElement> rightColumnInfo) {`
`26`	`26`	`Document document = PsiDocumentManager.getInstance(project).getDocument(csvFile);`
`27`	`27`	`document.setText(`
`28`		`- changeLeftAndRightColumnOrder(document.getText(), CsvCodeStyleSettings.getCurrentSeparator(csvFile), leftColumnInfo, rightColumnInfo)`
	`28`	`+ changeLeftAndRightColumnOrder(document.getText(), CsvCodeStyleSettings.getCurrentSeparator(project, csvFile), leftColumnInfo, rightColumnInfo)`
`29`	`29`	`);`
`30`	`30`	`}`
`31`	`31`