Merge pull request #317 from SeeSharpSoft/master

Release 2.18.1

Author: SeeSharpSoft

CHANGELOG

@@ -1,3 +1,9 @@
+2.18.1
+Nov 04, 2021
+
+FIX: set require-restart attribute
+NEW: Ability to open urls from IntelliJ CSV view #312
+
 2.18.0
 Oct 21, 2021
 

build.gradle

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

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

@@ -18,18 +18,18 @@ public static String getRelativeFilePath(Project project, VirtualFile virtualFil
         if (project == null || virtualFile == null) {
             return null;
         }
-        if (virtualFile instanceof VirtualFileWindow) {
-            virtualFile = ((VirtualFileWindow) virtualFile).getDelegate();
-        }
-        String filePath = virtualFile.getUserData(RELATIVE_FILE_URL);
+        VirtualFile targetFile = virtualFile instanceof VirtualFileWindow ?
+                ((VirtualFileWindow) virtualFile).getDelegate() :
+                virtualFile;
+        String filePath = targetFile.getUserData(RELATIVE_FILE_URL);
         if (filePath == null && project.getBasePath() != null) {
-            String localFilePath = PathUtil.getLocalPath(virtualFile);
+            String localFilePath = PathUtil.getLocalPath(targetFile);
             if (localFilePath == null) {
                 return null;
             }
             String projectDir = PathUtil.getLocalPath(project.getBasePath());
             filePath = localFilePath.replaceFirst("^" + Pattern.quote(projectDir), "");
-            virtualFile.putUserData(RELATIVE_FILE_URL, filePath);
+            targetFile.putUserData(RELATIVE_FILE_URL, filePath);
         }
         return filePath;
     }

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/TableRowUtilities.java

@@ -39,6 +39,7 @@
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.util.ArrayList;
+import java.util.Objects;
 
 
 /**
@@ -154,7 +155,7 @@ public static JTable addNumberColumn(final JTable userTable, int startingNumber)
                 // Make certain we are the viewPort's view and not, for  example, the rowHeaderView of the scrollPane - an implementor of fixed columns might do this.
                 JViewport viewport = scrollPane.getViewport();
 
-                if (viewport == null || viewport.getView() != userTable) {
+                if (viewport == null || !Objects.equals(viewport.getView(), userTable)) {
                     return null;
                 }
 
@@ -318,7 +319,7 @@ private TableSynchronizer(JTable rowHeadersTableArg, JTable userTableArg) {
         }
 
         public void valueChanged(ListSelectionEvent e) {
-            if (e.getSource() == userTable.getSelectionModel()) {
+            if (Objects.equals(e.getSource(), userTable.getSelectionModel())) {
                 rowHeadersTable.getSelectionModel().removeListSelectionListener(this);
                 rowHeadersTable.getSelectionModel().clearSelection();
 
@@ -330,7 +331,7 @@ public void valueChanged(ListSelectionEvent e) {
                 }
 
                 rowHeadersTable.getSelectionModel().addListSelectionListener(this);
-            } else if (e.getSource() == rowHeadersTable.getSelectionModel()) {
+            } else if (Objects.equals(e.getSource(), rowHeadersTable.getSelectionModel())) {
                 boolean isColumnSelectionAllowed = userTable.getColumnSelectionAllowed();
                 boolean isRowSelectionAllowed = userTable.getRowSelectionAllowed();
                 boolean isCellSelectionAllowed = userTable.getCellSelectionEnabled();

src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvFile.java

@@ -5,6 +5,8 @@
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfoMap;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import org.jetbrains.annotations.NotNull;
@@ -45,4 +47,9 @@ public String toString() {
     public Icon getIcon(int flags) {
         return super.getIcon(flags);
     }
+
+    @Override
+    public PsiReference @NotNull [] getReferences() {
+        return ReferenceProvidersRegistry.getReferencesFromProviders(this);
+    }
 }

src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvPsiReferenceContributor.java

@@ -0,0 +1,14 @@
+package net.seesharpsoft.intellij.plugins.csv.psi;
+
+import com.intellij.patterns.PlatformPatterns;
+import com.intellij.psi.PsiReferenceContributor;
+import com.intellij.psi.PsiReferenceRegistrar;
+import com.intellij.psi.impl.source.resolve.reference.ArbitraryPlaceUrlReferenceProvider;
+import org.jetbrains.annotations.NotNull;
+
+public class CsvPsiReferenceContributor extends PsiReferenceContributor {
+    @Override
+    public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) {
+        registrar.registerReferenceProvider(PlatformPatterns.psiFile(CsvFile.class), new ArbitraryPlaceUrlReferenceProvider(), PsiReferenceRegistrar.LOWER_PRIORITY);
+    }
+}

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

@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin require-restart="true">
     <id>net.seesharpsoft.intellij.plugins.csv</id>
     <name>CSV</name>
     <vendor url="https://github.com/SeeSharpSoft/intellij-csv-validator">
@@ -50,8 +50,8 @@
 
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
-NOTE: Minimum version requirement changed to v2020.1 and newer
-FIX: Show diff opens an empty window #306
+FIX: set require-restart attribute
+NEW: Ability to open urls from IntelliJ CSV view #312
       </pre>
     ]]>
     </change-notes>
@@ -161,6 +161,8 @@ FIX: Show diff opens an empty window #306
         <postStartupActivity implementation="net.seesharpsoft.intellij.plugins.csv.CsvPlugin" />
 
         <lang.commenter implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvCommenter" language="csv" />
+
+        <psi.referenceContributor language="csv" implementation="net.seesharpsoft.intellij.plugins.csv.psi.CsvPsiReferenceContributor" />
     </extensions>
 
     <actions>