Merge pull request #276 from SeeSharpSoft/master

Hotfix Release 2.16.2

Author: SeeSharpSoft

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,64 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  schedule:
+    - cron: '18 7 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

CHANGELOG

@@ -1,3 +1,8 @@
+2.16.2
+Apr 21, 2021
+
+FIX: Editor complaining about crashes on PyCharm 2021.1 #274
+
 2.16.1
 Apr 20, 2021
 

build.gradle

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

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

@@ -2,6 +2,8 @@
 
 import com.intellij.lang.*;
 import com.intellij.lexer.Lexer;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -20,6 +22,8 @@
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvRecord;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
+import net.seesharpsoft.intellij.plugins.psv.PsvFileType;
+import net.seesharpsoft.intellij.plugins.tsv.TsvFileType;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
@@ -45,6 +49,26 @@ public static PsiElement createEmptyCsvField(PsiFile psiFile) {
         return node.getPsi();
     }
 
+    public static boolean isCsvFile(String extension) {
+        if (extension == null) {
+            return false;
+        }
+        // simple check to always in include the defaults even if association was removed
+        switch(extension.toLowerCase()) {
+            case "csv":
+            case "tsv":
+            case "tab":
+            case "psv":
+                return true;
+            default:
+                // but also consider other extensions that are associated manually
+                FileType fileType = FileTypeRegistry.getInstance().getFileTypeByExtension(extension);
+                return fileType == CsvFileType.INSTANCE ||
+                        fileType == TsvFileType.INSTANCE ||
+                        fileType == PsvFileType.INSTANCE;
+        }
+    }
+
     public static boolean isCsvFile(Project project, VirtualFile file) {
         if (project == null || file == null) {
             return false;

src/main/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributes.java

@@ -63,7 +63,7 @@ public void cleanupAttributeMap(@NotNull Project project) {
             if (virtualFile == null) {
                 LOG.debug(fileName + " not found");
                 faultyFiles.add(fileName);
-            } else if (!CsvHelper.isCsvFile(project, virtualFile)) {
+            } else if (!CsvHelper.isCsvFile(virtualFile.getExtension())) {
                 LOG.debug(fileName + " is not a csv file");
                 faultyFiles.add(fileName);
             }

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

@@ -55,6 +55,7 @@ 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
+HOTFIX: Editor complaining about crashes on PyCharm 2021.1 #274
       </pre>
     ]]>
     </change-notes>