Merge pull request #131 from strangelookingnerd/updates

Update with changes from template and baseline

Author: strangelookingnerd

.github/workflows/build.yml

@@ -149,8 +149,8 @@ jobs:
       - name: Fetch Sources
         uses: actions/checkout@v6
         with:
-          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
-          fetch-depth: 0  # a full history is required for pull request analysis
+          ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0 # a full history is required for pull request analysis
 
       # Set up the Java environment for the next steps
       - name: Setup Java
@@ -246,6 +246,7 @@ jobs:
           VERSION=$(./gradlew properties --property version --quiet --console=plain | tail -n 1 | cut -f2- -d ' ')
           RELEASE_NOTE="./build/tmp/release_note.txt"
           ./gradlew getChangelog --unreleased --no-header --quiet --console=plain --output-file=$RELEASE_NOTE
+
           gh release create $VERSION \
             --draft \
             --title $VERSION \

.github/workflows/release.yml

@@ -44,20 +44,6 @@ jobs:
         with:
           cache-read-only: true
 
-      # Set environment variables
-      - name: Export Properties
-        id: properties
-        shell: bash
-        run: |
-          CHANGELOG="$(cat << 'EOM' | sed -e 's/^[[:space:]]*$//g' -e '/./,$!d'
-          ${{ github.event.release.body }}
-          EOM
-          )"
-          
-          echo "changelog<<EOF" >> $GITHUB_OUTPUT
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
       # Update the Unreleased section with the current release note
       - name: Patch Changelog
         if: ${{ github.event.release.body != '' }}
@@ -67,6 +53,7 @@ jobs:
           RELEASE_NOTE="./build/tmp/release_note.txt"
           mkdir -p "$(dirname "$RELEASE_NOTE")"
           echo "$CHANGELOG" > $RELEASE_NOTE
+
           ./gradlew patchChangelog --release-note-file=$RELEASE_NOTE
 
       # Publish the plugin to JetBrains Marketplace
@@ -86,7 +73,7 @@ jobs:
 
       # Create a pull request
       - name: Create Pull Request
-        if: ${{ steps.properties.outputs.changelog != '' }}
+        if: ${{ github.event.release.body != '' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -100,7 +87,7 @@ jobs:
           git checkout -b $BRANCH
           git commit -am "Changelog update - $VERSION"
           git push --set-upstream origin $BRANCH
-          
+
           gh label create "$LABEL" \
             --description "Pull requests with release changelog update" \
             --force \

.run/Run Plugin.run.xml

@@ -16,10 +16,10 @@
       </option>
       <option name="vmOptions" value="" />
     </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
     <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
+</component>

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ## [Unreleased]
 
+### Added
+
+- Require 2025.3
+- Pull changes from `DarculaProgressBarUI`
+- Pull changes from plugin template
+
 ## [0.0.9] - 2025-04-17
 
 ### Added

build.gradle.kts

@@ -29,7 +29,7 @@ repositories {
     }
 }
 
-// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
+// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/version_catalogs.html
 dependencies {
     testImplementation(libs.junit5)
     testImplementation(libs.opentest4j)
@@ -38,15 +38,15 @@ dependencies {
 
     // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
     intellijPlatform {
-        create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
+        intellijIdea(providers.gradleProperty("platformVersion"))
 
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
 
         // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
         plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
 
-        // Plugin Dependencies. Uses `platformBundledModules` property from the gradle.properties file for bundled IntelliJ Platform modules.
+        // Module Dependencies. Uses `platformBundledModules` property from the gradle.properties file for bundled IntelliJ Platform modules.
         bundledModules(providers.gradleProperty("platformBundledModules").map { it.split(',') })
 
         testFramework(TestFrameworkType.JUnit5)
@@ -59,7 +59,7 @@ intellijPlatform {
     buildSearchableOptions = false
 
     pluginConfiguration {
-        // name = providers.gradleProperty("pluginName") // do not patch name
+        name = providers.gradleProperty("pluginName")
         version = providers.gradleProperty("pluginVersion")
 
         // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
@@ -90,7 +90,6 @@ intellijPlatform {
 
         ideaVersion {
             sinceBuild = providers.gradleProperty("pluginSinceBuild")
-            untilBuild = provider { null } // providers.gradleProperty("pluginUntilBuild")
         }
     }
 
@@ -104,7 +103,7 @@ intellijPlatform {
         token = providers.environmentVariable("PUBLISH_TOKEN")
         // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
         // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
-        // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
+        // https://plugins.jetbrains.com/docs/intellij/publishing-plugin.html#specifying-a-release-channel
         channels = providers.gradleProperty("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
     }
 
@@ -121,7 +120,7 @@ changelog {
     repositoryUrl = providers.gradleProperty("pluginRepositoryUrl")
 }
 
-// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
+// Configure Gradle Kover Plugin - read more: https://kotlin.github.io/kotlinx-kover/gradle-plugin/#configuration-details
 kover {
     reports {
         total {

gradle.properties

@@ -1,18 +1,16 @@
 # IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 
 pluginGroup = com.github.strangelookingnerd
-pluginName = pedro-progress-bar
+pluginName = Pedro Progress Bar
 pluginRepositoryUrl = https://github.com/strangelookingnerd/pedro-progress-bar-plugin
 # SemVer format -> https://semver.org
 pluginVersion = 0.0.10
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 251
-pluginUntilBuild =
+pluginSinceBuild = 253
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
-platformType = IC
-platformVersion = 2025.1
+platformVersion = 2025.3
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP

src/main/java/com/github/strangelookingnerd/PedroIcons.java

@@ -64,4 +64,3 @@ public static ImageIcon getScaledIcon() {
         };
     }
 }
-

src/main/java/com/github/strangelookingnerd/PedroProgressBarListener.java

@@ -53,4 +53,3 @@ private void updateProgressBar() {
         UIManager.getDefaults().put(PedroProgressBarUI.class.getName(), PedroProgressBarUI.class);
     }
 }
-

src/main/java/com/github/strangelookingnerd/PedroProgressBarUI.java

@@ -43,13 +43,16 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
+import java.awt.Paint;
+import java.awt.PaintContext;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Shape;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
+import java.awt.image.ColorModel;
 
 /**
  * The actual progress bar implementation. Heavily inspired by {@link com.intellij.ide.ui.laf.darcula.ui.DarculaProgressBarUI}
@@ -95,6 +98,7 @@ protected void paintIndeterminate(Graphics graphics, JComponent component) {
             Color endColor;
             Color foreground = progressBar.getForeground();
             Object statusProperty = progressBar.getClientProperty(ProgressBarUtil.STATUS_KEY);
+
             if (ProgressBarUtil.FAILED_VALUE.equals(statusProperty) || foreground == JBUI.CurrentTheme.ProgressBar.FAILED) {
                 startColor = JBUI.CurrentTheme.ProgressBar.FAILED;
                 endColor = JBUI.CurrentTheme.ProgressBar.FAILED_END;
@@ -169,8 +173,9 @@ protected void paintDeterminate(Graphics graphics, JComponent component) {
 
             Shape fullShape;
             Shape coloredShape;
-            int orientation = progressBar.getOrientation();
-            if (orientation == SwingConstants.HORIZONTAL) {
+            boolean horizontalOrientation = progressBar.getOrientation() == SwingConstants.HORIZONTAL;
+
+            if (horizontalOrientation) {
                 int pHeight = getStripeWidth();
                 int yOffset = r.y + (r.height - pHeight) / 2;
 
@@ -188,19 +193,23 @@ protected void paintDeterminate(Graphics graphics, JComponent component) {
 
             Color foreground = progressBar.getForeground();
             Object statusProperty = progressBar.getClientProperty(ProgressBarUtil.STATUS_KEY);
-            if (ProgressBarUtil.FAILED_VALUE.equals(statusProperty) || foreground == JBUI.CurrentTheme.ProgressBar.FAILED) {
-                graphics.setColor(JBUI.CurrentTheme.ProgressBar.FAILED);
+
+            if (progressBar.getClientProperty(ProgressBarUtil.PROGRESS_PAINT_KEY) instanceof Paint progressPaint) {
+                PaintTransformer paint = new PaintTransformer(progressPaint, horizontalOrientation, horizontalOrientation ? r.x : r.y, amountFull);
+                graphics2D.setPaint(paint);
+            } else if (ProgressBarUtil.FAILED_VALUE.equals(statusProperty) || foreground == JBUI.CurrentTheme.ProgressBar.FAILED) {
+                graphics2D.setColor(JBUI.CurrentTheme.ProgressBar.FAILED);
             } else if (ProgressBarUtil.PASSED_VALUE.equals(statusProperty) || foreground == JBUI.CurrentTheme.ProgressBar.PASSED) {
-                graphics.setColor(JBUI.CurrentTheme.ProgressBar.PASSED);
+                graphics2D.setColor(JBUI.CurrentTheme.ProgressBar.PASSED);
             } else if (ProgressBarUtil.WARNING_VALUE.equals(statusProperty) || foreground == JBUI.CurrentTheme.ProgressBar.WARNING) {
-                graphics.setColor(JBUI.CurrentTheme.ProgressBar.WARNING);
+                graphics2D.setColor(JBUI.CurrentTheme.ProgressBar.WARNING);
             } else {
                 graphics2D.setColor(JBUI.CurrentTheme.ProgressBar.PROGRESS);
             }
             graphics2D.fill(coloredShape);
 
             ImageIcon icon = PedroIcons.getScaledIcon();
-            if (orientation == SwingConstants.HORIZONTAL) {
+            if (horizontalOrientation) {
                 icon.paintIcon(progressBar, graphics2D, amountFull, r.y);
             } else {
                 icon.paintIcon(progressBar, graphics2D, r.x, amountFull);
@@ -280,4 +289,35 @@ private void paintString(Graphics2D graphics2D, int x, int y, int w, int h, int
         }
         graphics2D.setClip(oldClip);
     }
-}
+
+    private record PaintTransformer(Paint originalPaint, boolean isHorizontal, int start, int size) implements Paint {
+
+        @Override
+        public PaintContext createContext(ColorModel cm, Rectangle deviceBounds, Rectangle2D userBounds, AffineTransform xform, RenderingHints hints) {
+            AffineTransform transform = xform == null ? new AffineTransform() : (AffineTransform) xform.clone();
+
+            if (start != 0) {
+                if (isHorizontal) {
+                    transform.translate(start, 0);
+                } else {
+                    transform.translate(0, start);
+                }
+            }
+
+            if (size > 0) {
+                transform.scale(size, size);
+            }
+
+            if (!isHorizontal) {
+                transform.rotate(Math.toRadians(90), 0, 0);
+            }
+
+            return originalPaint.createContext(cm, deviceBounds, userBounds, transform, hints);
+        }
+
+        @Override
+        public int getTransparency() {
+            return originalPaint.getTransparency();
+        }
+    }
+}

src/test/java/com/github/strangelookingnerd/PedroIconsTest.java

@@ -41,15 +41,15 @@ class PedroIconsTest {
 
     private static final Pattern DESCRIPTION_PATTERN = Pattern.compile("^Pedro (\\d\\d)x(\\d\\d)$");
 
-    @ParameterizedTest
-    @ValueSource(floats = {0.75F, 1F, 1.1F, 1.25F, 1.5F, 1.75F, 2F, 3F})
-    void scaling(float scaleFactor) {
-        JBUIScale.setUserScaleFactorForTest(scaleFactor);
+    @ParameterizedTest(name = "{0}%")
+    @ValueSource(ints = {75, 100, 110, 125, 150, 175, 200, 300})
+    void scaling(int scale) {
+        JBUIScale.setUserScaleFactorForTest(scale / 100F);
 
         ImageIcon icon = PedroIcons.getScaledIcon();
         assertNotNull(icon);
 
-        if (scaleFactor < 1F || scaleFactor > 2F) {
+        if (scale < 100 || scale > 200) {
             assertNull(icon.getImage());
             assertNull(icon.getDescription());
         } else {
@@ -61,4 +61,4 @@ void scaling(float scaleFactor) {
             assertEquals(Integer.valueOf(matcher.group(2)), icon.getIconHeight());
         }
     }
-}
+}