Version 1.8.8

asciidocfx · Feb 6, 2024 · 382d5dc · 382d5dc
1 parent 19deb38
commit 382d5dc
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 34 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  INSTALL4J_URL: https://download.ej-technologies.com/install4j/install4j_linux-x64_10_0_6.tar.gz
+  INSTALL4J_URL: https://download.ej-technologies.com/install4j/install4j_linux-x64_10_0_7.tar.gz
   LICENSE_KEY_10: ${{ secrets.LICENSE_KEY_10 }}
   MAC_CODE_SIGN_P12: ${{ secrets.MAC_CODE_SIGN_P12 }}
   WIN_CODE_SIGN_PFX: ${{ secrets.WIN_CODE_SIGN_PFX }}
@@ -34,7 +34,7 @@ jobs:
     - name: Download install4j
       run: |
          wget --tries=3 ${{ env.INSTALL4J_URL }}
-         tar zxvf install4j_linux-x64_10_0_6.tar.gz
+         tar zxvf install4j_linux-x64_10_0_7.tar.gz
     - name: Add signing key for MAC
       run: 'echo "$MAC_CODE_SIGN_P12" | base64 -d  >mac_code_sign.p12'
     - name: Add signing key for WIN

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes are documented in this file.
 
+## [Version ~1.8.8](https://github.com/asciidocfx/AsciidocFX/releases/tag/v1.8.8) (02.2024)
+
+* Resize ace editor on window resize or tab change
+* Fix duplicate key event on key handler
+* Bux fixes
+
 ## [Version ~1.8.7](https://github.com/asciidocfx/AsciidocFX/releases/tag/v1.8.7) (01.2024)
 
 * Version updates

diff --git a/CMD_NOTES.adoc b/CMD_NOTES.adoc
@@ -1,6 +1,6 @@
 base64 -i code_sign.p12 | pbcopy
 base64 -i asciidocfx.pfx | pbcopy
-git tag -a v1.8.7 -m "Version 1.8.7"
-git tag -d v1.8.7
-git push --delete origin v1.8.7
+git tag -a v1.8.8 -m "Version 1.8.8"
+git tag -d v1.8.8
+git push --delete origin v1.8.8
 git push --atomic --tags
diff --git a/README.adoc b/README.adoc
@@ -9,7 +9,7 @@ ifndef::env-github[]
 :toc-placement: left
 endif::[]
 :imagesdir: images
-:asciidocfx-version: 1.8.7
+:asciidocfx-version: 1.8.8
 :download-root: https://github.com/asciidocfx/AsciidocFX/releases/download/v{asciidocfx-version}/
 
 image:https://opencollective.com/AsciidocFX/backers/badge.svg["Backers on Open Collective", link="#backers"]

diff --git a/asciidocfx.install4j b/asciidocfx.install4j
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="10.0.6" transformSequenceNumber="10">
+<install4j version="10.0.7" transformSequenceNumber="10">
   <directoryPresets config="/Users/usta/Library/CloudStorage/[email protected]/My Drive/projects/AsciidocFX/cert/asciidocfx.pfx" />
-  <application name="AsciidocFX" applicationId="7853-9376-5862-1224" mediaDir="target" compression="4" lzmaCompression="true" excludeSignedFromPacking="false" shortName="AsciidocFX" publisher="AsciidocFX" publisherWeb="http://asciidocfx.com" version="1.8.7" macVolumeId="b98c377570068f5e" javaMinVersion="21" javaMaxVersion="21" allowBetaVM="true">
+  <application name="AsciidocFX" applicationId="7853-9376-5862-1224" mediaDir="target" compression="4" lzmaCompression="true" excludeSignedFromPacking="false" shortName="AsciidocFX" publisher="AsciidocFX" publisherWeb="http://asciidocfx.com" version="1.8.8" macVolumeId="b98c377570068f5e" javaMinVersion="21" javaMaxVersion="21" allowBetaVM="true">
     <searchSequence>
       <envVar name="JAVA_HOME" />
       <envVar name="JDK_HOME" />
       <registry />
     </searchSequence>
     <codeSigning macEnabled="true" macPkcs12File="${compiler:env.GITHUB_WORKSPACE}/mac_code_sign.p12" windowsEnabled="true" windowsPkcs12File="${compiler:env.GITHUB_WORKSPACE}/win_code_sign.pfx" macNotarize="true" appleId="${compiler:env.MAC_APPLE_ID}" />
-    <jreBundles jdkProviderId="AdoptOpenJDK" release="21/jdk-21.0.1+12" />
+    <jreBundles jdkProviderId="AdoptOpenJDK" release="21/jdk-21.0.2+13" />
   </application>
   <files globalExcludeSuffixes="bin" defaultOverwriteMode="1" launcherOverwriteMode="1" defaultFileMode="755">
     <mountPoints>

diff --git a/index.html b/index.html
@@ -641,31 +641,31 @@ <h2 id="how-to-install-asciidocfx"><a class="anchor" href="#how-to-install-ascii
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Mac</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.7/AsciidocFX_Mac.dmg">AsciidocFX_Mac.dmg</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.8/AsciidocFX_Mac.dmg">AsciidocFX_Mac.dmg</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Mac M1</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.7/AsciidocFX_Mac_M1.dmg">AsciidocFX_Mac_M1.dmg</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.8/AsciidocFX_Mac_M1.dmg">AsciidocFX_Mac_M1.dmg</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Windows</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.7/AsciidocFX_Windows.exe">AsciidocFX_Windows.exe</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.8/AsciidocFX_Windows.exe">AsciidocFX_Windows.exe</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Windows</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.7/AsciidocFX_Windows.zip">AsciidocFX_Windows.zip</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.8/AsciidocFX_Windows.zip">AsciidocFX_Windows.zip</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Linux</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.7/AsciidocFX_Linux.tar.gz">AsciidocFX_Linux.tar.gz</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.8/AsciidocFX_Linux.tar.gz">AsciidocFX_Linux.tar.gz</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Linux DEB</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.7/AsciidocFX_Linux_Deb.deb">AsciidocFX_Linux.deb</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.8/AsciidocFX_Linux_Deb.deb">AsciidocFX_Linux.deb</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Linux RPM</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.7/AsciidocFX_Linux_Rpm.rpm">AsciidocFX_Linux.rpm</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.8/AsciidocFX_Linux_Rpm.rpm">AsciidocFX_Linux.rpm</a></p></td>
 </tr>
 </tbody>
 </table>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.kodedu</groupId>
     <artifactId>AsciidocFX</artifactId>
-    <version>1.8.7</version>
+    <version>1.8.8</version>
     <packaging>jar</packaging>
 
     <name>AsciidocFX</name>
@@ -16,7 +16,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <mainClass>com.kodedu.boot.AppStarter</mainClass>
-        <install4j.version>10.0.6</install4j.version>
+        <install4j.version>10.0.7</install4j.version>
         <install4j.home>${env.GITHUB_WORKSPACE}/install4j${install4j.version}</install4j.home>
         <install4j.licenseKey>${env.LICENSE_KEY_10}</install4j.licenseKey>
         <install4j.macKeyStorePassword>${env.MAC_KEYSTORE_PASSWORD}</install4j.macKeyStorePassword>

diff --git a/src/main/java/com/kodedu/component/EditorPane.java b/src/main/java/com/kodedu/component/EditorPane.java
@@ -59,11 +59,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
-import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
-import static javafx.scene.input.KeyEvent.KEY_RELEASED;
-import static javafx.scene.input.KeyEvent.KEY_TYPED;
+import static javafx.scene.input.KeyEvent.*;
 
 /**
  * Created by usta on 09.04.2015.
@@ -779,27 +779,32 @@ public ShortCutConfigBean getShortCutConfigBean() {
         return shortCutConfigBean;
     }
 
-    KeyCombination keyCombination = null;
+    final AtomicReference<KeyCombination> keyCombination = new AtomicReference<>();
 
     EventHandler<Event> editorEventFilter = event -> {
         if (event instanceof KeyEvent e) {
 
-            if (nonNull(keyCombination)) {
+            if (e.getCode() == KeyCode.ESCAPE) {
+                keyCombination.set(null);
+                return;
+            }
+
+            if (nonNull(keyCombination.get())) {
                 if (e.getEventType() == KEY_RELEASED) {
-                    if (keyCombination.match(e)) {
+                    if (keyCombination.get().match(e)) {
                         // Event already consumed on key_press
-                        e.consume();
                         if (getShortCutConfigBean().isDebugMode()) {
-                            logger.warn("Releasing: {} {}", keyCombination, e.getEventType());
+                            logger.warn("Releasing: {} {}", keyCombination.get(), e.getEventType());
                         }
-                        keyCombination = null;
+                        keyCombination.set(null);
+                        e.consume();
                         return;
                     }
                 } else if (e.getEventType() == KEY_TYPED) {
                     // Skip key_type ?
                     e.consume();
                     if (getShortCutConfigBean().isDebugMode()) {
-                        logger.warn("Skipping: {} {}", keyCombination, e.getEventType());
+                        logger.warn("Skipping: {} {}", keyCombination.get(), e.getEventType());
                     }
                     return;
                 }
@@ -809,6 +814,10 @@ public ShortCutConfigBean getShortCutConfigBean() {
                 return;
             }
 
+            if(e.getEventType() != KEY_PRESSED){
+                return;
+            }
+
             KeyCombination matchedCombination = null;
             EditorCommand matchedCommand = null;
             for (EditorCommand editorCommand : getShortCutConfigBean().getShortcuts()) {
@@ -827,11 +836,11 @@ public ShortCutConfigBean getShortCutConfigBean() {
 
             if (nonNull(matchedCombination)) {
                 execCommand(matchedCommand.getName());
-                e.consume();
-                keyCombination = matchedCombination;
+                keyCombination.set(matchedCombination);
                 if (getShortCutConfigBean().isDebugMode()) {
-                    logger.warn("Matched: Key={} Event={} Command={} ", keyCombination, e.getEventType(), matchedCommand.getName());
+                    logger.warn("Matched: Key={} Event={} Command={} ", keyCombination.get(), e.getEventType(), matchedCommand.getName());
                 }
+                e.consume();
             }
         }
     };

diff --git a/src/main/java/com/kodedu/config/ConfigurationBase.java b/src/main/java/com/kodedu/config/ConfigurationBase.java
@@ -49,7 +49,7 @@ public abstract class ConfigurationBase {
     @Value("${application.version}")
     private String afxVersion;
 
-    private static final List<String> ignoreVersionList = List.of("1.7.5", "1.7.6", "1.7.7", "1.7.8", "1.7.9", "1.8.0", "1.8.1", "1.8.2", "1.8.3","1.8.4","1.8.5","1.8.6", "1.8.7");
+    private static final List<String> ignoreVersionList = List.of("1.7.5", "1.7.6", "1.7.7", "1.7.8", "1.7.9", "1.8.0", "1.8.1", "1.8.2", "1.8.3","1.8.4","1.8.5","1.8.6", "1.8.7","1.8.8");
 
     public static ObjectProperty<Path> configRootLocation = new SimpleObjectProperty<>();
 

diff --git a/src/main/java/com/kodedu/service/extension/processor/XrefIncludeProcessor.java b/src/main/java/com/kodedu/service/extension/processor/XrefIncludeProcessor.java
@@ -40,7 +40,7 @@ record FilterContent(String content, Integer lineNo){}
 
     @Override
     public boolean handles(String target) {
-        return true;
+        return Objects.nonNull(target) && !target.isEmpty() && !target.contains("*");
     }
 
     @Override

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -2,7 +2,7 @@ server.port=0
 server.undertow.direct-buffers=true
 server.undertow.worker-threads=4
 #server.undertow.accesslog.enabled=true
-application.version=1.8.7
+application.version=1.8.8
 application.name=Asciidoc FX
 application.website=http://asciidocfx.com
 application.config.folder=.AsciidocFX-${application.version}