Release 0.2.8.1

Author: hajdam

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "org.exbin.deltahex.intellij"
-version = "0.2.9.snapshot"
+version = "0.2.8.1"
 val ideLocalPath = providers.gradleProperty("ideLocalPath").getOrElse("")
 
 repositories {

changes.txt

@@ -1,4 +1,5 @@
-0.2.9
+0.2.8.1 (2023-05-25)
+- Fixed plugin breaks VCS history log reading (Issue #51)
 
 0.2.8 (2023-05-19)
 - Added edit as binary action for columns in database view

src/main/java/org/exbin/bined/intellij/BinEdPluginStartupActivity.java

@@ -15,6 +15,13 @@
  */
 package org.exbin.bined.intellij;
 
+import com.intellij.diff.impl.DiffSettingsHolder;
+import com.intellij.diff.tools.combined.CombinedDiffComponentFactory;
+import com.intellij.diff.tools.combined.CombinedDiffMainUI;
+import com.intellij.diff.tools.combined.CombinedDiffTool;
+import com.intellij.diff.tools.combined.CombinedDiffViewer;
+import com.intellij.diff.tools.fragmented.UnifiedDiffTool;
+import com.intellij.diff.tools.simple.SimpleDiffTool;
 import com.intellij.openapi.extensions.ExtensionPointAdapter;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.PluginDescriptor;
@@ -36,6 +43,7 @@
 import org.exbin.bined.intellij.api.BinaryViewHandler;
 import org.exbin.bined.intellij.data.ObjectValueConvertor;
 import org.exbin.bined.intellij.debug.gui.DebugViewPanel;
+import org.exbin.bined.intellij.diff.BinEdDiffTool;
 import org.exbin.bined.intellij.gui.BinEdComponentFileApi;
 import org.exbin.bined.intellij.gui.BinEdComponentPanel;
 import org.exbin.bined.intellij.options.IntegrationOptions;
@@ -51,6 +59,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Post startup activity.
@@ -62,6 +72,7 @@ public final class BinEdPluginStartupActivity implements StartupActivity, DumbAw
 
     private static final ExtensionPointName<BinaryViewData> BINED_VIEW_DATA =
             ExtensionPointName.create("org.exbin.deltahex.intellij.viewBinaryData");
+    private static final String BINED_DIFF_TOOL_ID = BinEdDiffTool.class.getCanonicalName();
     private static final List<IntegrationOptionsListener> INTEGRATION_OPTIONS_LISTENERS = new ArrayList<>();
     private static IntegrationOptions initialIntegrationOptions = null;
 
@@ -124,6 +135,33 @@ public void beforeFileClosed(@Nonnull FileEditorManager source, @Nonnull Virtual
                 }
             }
         });
+
+        moveBinEdDiffToolToLastPosition();
+    }
+
+    private static void moveBinEdDiffToolToLastPosition() {
+        try {
+            DiffSettingsHolder.DiffSettings settings = DiffSettingsHolder.DiffSettings.getSettings();
+            List<String> diffToolsOrder = settings.getDiffToolsOrder();
+            if (diffToolsOrder.isEmpty()) {
+                // Prefer basic and unified diff tools before added BinEd diff
+                diffToolsOrder.add(SimpleDiffTool.class.getCanonicalName());
+                diffToolsOrder.add(UnifiedDiffTool.class.getCanonicalName());
+                diffToolsOrder.add(BINED_DIFF_TOOL_ID);
+            } else {
+                for (int i = 0; i < diffToolsOrder.size(); i++) {
+                    if (BINED_DIFF_TOOL_ID.equals(diffToolsOrder.get(i))) {
+                        diffToolsOrder.remove(i);
+                        break;
+                    }
+                }
+                // Add as last option
+                diffToolsOrder.add(BINED_DIFF_TOOL_ID);
+            }
+            settings.setDiffToolsOrder(diffToolsOrder);
+        } catch (Exception ex) {
+            Logger.getLogger(BinEdPluginStartupActivity.class.getName()).log(Level.SEVERE, "Unable to move BinEd diff tool to lowest priority", ex);
+        }
     }
 
     public static void addIntegrationOptionsListener(IntegrationOptionsListener integrationOptionsListener) {

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

@@ -5,7 +5,7 @@
     <!-- Public plugin name should be written in Title Case.
          Guidelines: https://plugins.jetbrains.com/docs/marketplace/plugin-overview-page.html#plugin-name -->
     <name>BinEd - Binary/Hexadecimal Editor</name>
-    <version>0.2.9.snapshot</version>
+    <version>0.2.8.1</version>
     <!-- A displayed Vendor name or Organization ID displayed on the Plugins Page. -->
     <vendor email="exbinproject@gmail.com" url="https://exbin.org">ExBin Project</vendor>
 
@@ -21,7 +21,7 @@
 <li>Use "Edit as Binary" in column context menu in DB view</li></ul>
 
 <h1>Preview</h1>
-<p><img src="https://bined.exbin.org/images/bined-intellij-plugin-preview-0.2.9.png" alt="[bined-intellij-plugin-preview]" width="382" height="65"/></p>
+<p><img src="https://bined.exbin.org/images/bined-intellij-plugin-preview-0.2.8.png" alt="[bined-intellij-plugin-preview]" width="382" height="65"/></p>
 
 <h1>Features</h1>
 <ul><li>Visualize data as numerical (hexadecimal) codes and text representation</li>
@@ -42,7 +42,14 @@ Sources: <a href="https://github.com/exbin/bined-intellij-plugin">https://github
     ]]></description>
 
     <change-notes><![CDATA[
-<ul><li>-</li></ul>
+<ul><li>Added edit as binary action for columns in database view</li>
+<li>Added byte-to-byte compare diff option</li>
+<li>Added integration options page</li>
+<li>Reworked save on close</li>
+<li>Added reload file action (issue #49)</li>
+<li>Fixed illegal argument exception (issue #50)</li>
+<li>Fixed plugin breaks VCS history log reading (issue #51)</li>
+</ul>
     ]]>
     </change-notes>
 
@@ -87,7 +94,7 @@ Sources: <a href="https://github.com/exbin/bined-intellij-plugin">https://github
         <virtualFileSystem implementationClass="org.exbin.bined.intellij.BinEdFileSystem" key="bined" physical="false"/>
         <fileEditorProvider implementation="org.exbin.bined.intellij.BinEdFileEditorProvider"/>
         <fileEditorProvider implementation="org.exbin.bined.intellij.BinEdNativeFileEditorProvider"/>
-        <diff.DiffTool implementation="org.exbin.bined.intellij.diff.BinEdDiffTool"/>
+        <diff.DiffTool implementation="org.exbin.bined.intellij.diff.BinEdDiffTool" order="last"/>
         <applicationConfigurable instance="org.exbin.bined.intellij.BinEdSettingsConfigurable" id="org.exbin.bined.intellij.BinEdSettingsConfigurable" parentId="tools" displayName="BinEd Plugin"/>
     </extensions>
 

src/main/resources/org/exbin/bined/intellij/resources/Bundle.properties

@@ -1,9 +1,9 @@
 Application.name = BinEd
 Application.title = BinEd Binary/Hexadecimal Editor
-Application.release = 0.2.9
-Application.mode = DEV
-Application.version = 0.2.9 DEV
-Application.product= BinEd Binary/Hexadecimal Editor 0.2.9 DEV
+Application.release = 0.2.8.1
+Application.mode =
+Application.version = 0.2.8.1
+Application.product= BinEd Binary/Hexadecimal Editor 0.2.8.1
 Application.vendor = ExBin Project
 Application.homepage = https://bined.exbin.org/intellij-plugin/
 Application.vendorId = ExBin Project