Merge pull request #273 from SeeSharpSoft/master

Release 2.16.1

Author: SeeSharpSoft

.github/workflows/PullRequest.yml

@@ -13,6 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         include:
           - ideaVersion: IC-193.5233.102

CHANGELOG

@@ -1,3 +1,8 @@
+2.16.1
+Apr 20, 2021
+
+FIX: keep existing & correct entries in CSV attributes map
+
 2.16.0
 Apr 18, 2021
 

build.gradle

@@ -28,7 +28,7 @@ jacocoTestReport {
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '2.16.0'
+version '2.16.1'
 
 apply plugin: 'java'
 project.sourceCompatibility = JavaVersion.VERSION_11

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

@@ -23,8 +23,8 @@ public static String getRelativeFileUrl(Project project, VirtualFile virtualFile
         String url = virtualFile.getUserData(RELATIVE_FILE_URL);
         if (url == null && project.getBasePath() != null) {
             String projectDir = PathUtil.getLocalPath(project.getBasePath());
-            url = PathUtil.getLocalPath(virtualFile.getPath())
-                    .replaceFirst("^" + Pattern.quote(projectDir), "");
+            url = Paths.get(PathUtil.getLocalPath(virtualFile.getPath())
+                    .replaceFirst("^" + Pattern.quote(projectDir), "")).toString();
             virtualFile.putUserData(RELATIVE_FILE_URL, url);
         }
         return url;
@@ -34,12 +34,13 @@ public static Path getFilePath(Project project, String fileName) {
         if (project == null || fileName == null) {
             return null;
         }
-        return Paths.get(project.getBasePath()).resolve(fileName.startsWith(File.separator) ? fileName.substring(1) : fileName);
+        String formattedFileName = Paths.get(fileName).toString();
+        return Paths.get(project.getBasePath()).resolve(formattedFileName.startsWith(File.separator) ? formattedFileName.substring(1) : formattedFileName);
     }
 
     public static VirtualFile getFileInProject(Project project, String fileName) {
         Path filePath = getFilePath(project, fileName);
-        return VirtualFileManager.getInstance().findFileByUrl(filePath.toAbsolutePath().toString());
+        return VirtualFileManager.getInstance().findFileByUrl(filePath.toUri().toString());
     }
 
     private CsvStorageHelper() {

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

@@ -54,6 +54,7 @@ NEW: Ability to split on ASCII separator character \x1e #267
 NEW: "General" settings group
 FIX: Lower annotator severity to not appear as problem
 FIX: Prevent non CSV entries in CSV attributes map #268
+FIX: keep existing & correct entries in CSV attributes map
       </pre>
     ]]>
     </change-notes>

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

@@ -0,0 +1,46 @@
+package net.seesharpsoft.intellij.plugins.csv;
+
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import java.nio.file.Paths;
+
+public class CsvStorageHelperTest extends BasePlatformTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        Paths.get(this.getProject().getBasePath()).toFile().mkdirs();
+        Paths.get(this.getProject().getBasePath(), "csv_file_test.csv").toFile().createNewFile();
+        Paths.get(this.getProject().getBasePath(), "test").toFile().mkdir();
+        Paths.get(this.getProject().getBasePath(), "test", "py_file_test.py").toFile().createNewFile();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        Paths.get(this.getProject().getBasePath(), "csv_file_test.csv").toFile().delete();
+        Paths.get(this.getProject().getBasePath(), "test", "py_file_test.py").toFile().delete();
+        Paths.get(this.getProject().getBasePath(), "test").toFile().delete();
+        super.tearDown();
+    }
+
+    public void testGetFileInProjectExists() {
+        VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), Paths.get("/csv_file_test.csv").toString());
+        assertNotNull(vf);
+    }
+
+    public void testGetFileInProjectDirectory() {
+        VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), Paths.get("/test/py_file_test.py").toString());
+        assertNotNull(vf);
+    }
+
+    public void testGetFileInProjectDoesNotExist() {
+        VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), Paths.get("/not_existing_csv_file_test.csv").toString());
+        assertNull(vf);
+    }
+
+    public void testGetFileInProjectDirectoryDoesNotExist() {
+        VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), Paths.get("/test2/py_file_test.py").toString());
+        assertNull(vf);
+    }
+}

src/test/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributesTest.java

@@ -5,14 +5,29 @@
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 
+import java.nio.file.Paths;
+
 public class CsvFileAttributesTest extends BasePlatformTestCase {
     @Override
     protected String getTestDataPath() {
         return "./src/test/resources/components";
     }
 
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        Paths.get(this.getProject().getBasePath()).toFile().mkdirs();
+        Paths.get(this.getProject().getBasePath(), "csv_file_test.csv").toFile().createNewFile();
+        Paths.get(this.getProject().getBasePath(), "test").toFile().mkdir();
+        Paths.get(this.getProject().getBasePath(), "test", "py_file_test.py").toFile().createNewFile();
+    }
+
     @Override
     protected void tearDown() throws Exception {
+        Paths.get(this.getProject().getBasePath(), "test", "py_file_test.py").toFile().delete();
+        Paths.get(this.getProject().getBasePath(), "test").toFile().delete();
+        Paths.get(this.getProject().getBasePath(), "csv_file_test.csv").toFile().delete();
+
         CsvFileAttributes.getInstance(this.getProject()).reset();
         super.tearDown();
     }
@@ -39,4 +54,18 @@ public void testSaveFileEscapeCharacter() {
         assertEquals(CsvEscapeCharacter.BACKSLASH, csvFileAttributes.getEscapeCharacter(this.getProject(), myFixture.getFile().getOriginalFile().getVirtualFile()));
     }
 
+    public void testCleanupAttributeMap() {
+        CsvFileAttributes fileAttributes = CsvFileAttributes.getInstance(this.getProject());
+        fileAttributes.attributeMap.put(Paths.get("/csv_file_test.csv").toString(), new CsvFileAttributes.Attribute());
+        fileAttributes.attributeMap.put(Paths.get("/test/py_file_test.py").toString(), new CsvFileAttributes.Attribute());
+        fileAttributes.attributeMap.put(Paths.get("/not_existing_csv_file_test.csv").toString(), new CsvFileAttributes.Attribute());
+
+        assertEquals(3, fileAttributes.attributeMap.size());
+
+        fileAttributes.cleanupAttributeMap(this.getProject());
+
+        assertEquals(1, fileAttributes.attributeMap.size());
+        assertNotNull(fileAttributes.attributeMap.get(Paths.get("/csv_file_test.csv").toString()));
+    }
+
 }