Merge pull request #78 from xdev-software/develop

AB-xdev · web-flow · commit b15d7c2adda3 · 2026-04-28T10:14:41.000+02:00
Release
diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml
@@ -85,6 +85,7 @@
 			<property name="tokens" value=" CLASS_DEF"/>
 		</module>
 		<module name="IllegalImport"/>
+		<module name="IllegalSymbol"/>
 		<module name="InterfaceIsType"/>
 		<module name="JavadocStyle">
 			<property name="checkFirstSentence" value="false"/>
diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
@@ -3,7 +3,7 @@ name: Broken links
 on:
   workflow_dispatch:
   schedule:
-    - cron: "23 23 * * 0"
+    - cron: "23 5 * * 0"
 
 permissions:
   issues: write
@@ -21,6 +21,7 @@ jobs:
         id: lychee
         uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2
         with:
+          args: "--verbose --no-progress './**/*.md'"
           fail: false # Don't fail on broken links, create an issue instead
 
       - name: Find already existing issue
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.0
+* Update PMD to 7.24.0
+* Dropped support for IntelliJ IDEA < 261 to fix deprecations
+
 # 1.0.8
 * Correctly handle missing/removal of built-in configuration
 * Fix crash on non Java-IDEs #67
diff --git a/build.gradle b/build.gradle
@@ -3,13 +3,13 @@ plugins {
     id 'idea'
     id 'checkstyle'
     id 'pmd'
-    id 'org.jetbrains.intellij.platform' version '2.13.1'
+    id 'org.jetbrains.intellij.platform' version '2.15.0'
 }
 
 ext {
-    checkstyleVersion = '13.4.0'
+    checkstyleVersion = '13.4.1'
 
-    pmdVersion = '7.23.0'
+    pmdVersion = '7.24.0'
 }
 
 def properties(String key) {
@@ -104,14 +104,9 @@ intellijPlatform {
     }
     pluginVerification {
         ides {
-            select {
-                it.types = [IntelliJPlatformType.IntellijIdeaCommunity]
-                it.sinceBuild = properties("platformSinceBuild")
-                it.untilBuild = '252.*'
-            }
             select {
                 it.types = [IntelliJPlatformType.IntellijIdea]
-                it.sinceBuild = '253'
+                it.sinceBuild = properties("platformSinceBuild")
             }
         }
     }
diff --git a/gradle.properties b/gradle.properties
@@ -2,11 +2,11 @@
 pluginGroup=software.xdev.pmd
 pluginName=PMD X
 # SemVer format -> https://semver.org
-pluginVersion=1.0.9-SNAPSHOT
+pluginVersion=1.1.0-SNAPSHOT
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=IU
-platformVersion=2025.3.1.1
-platformSinceBuild=243
+platformVersion=2026.1.1
+platformSinceBuild=261
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformBundledPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformBundledPlugins=com.intellij.java,org.jetbrains.kotlin
diff --git a/renovate.json5 b/renovate.json5
@@ -12,6 +12,14 @@
       ],
       "matchCurrentVersion": "0",
       "enabled": false
+    },
+    {
+      "description": "org.jetbrains.intellij.platform - Changelog",
+      "packagePattern": "^org.jetbrains.intellij.platform",
+      "matchDatasources": [
+        "maven"
+      ],
+      "changelogUrl": "https://github.com/JetBrains/intellij-platform-gradle-plugin/releases"
     }
   ]
 }
diff --git a/src/main/java/software/xdev/pmd/action/ActionFilesAnalyzer.java b/src/main/java/software/xdev/pmd/action/ActionFilesAnalyzer.java
@@ -85,8 +85,13 @@ private void analyzeAsync(
 			project.getService(PluginConfigurationManager.class).getCurrent();
 		final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex();
 		
-		final Map<Optional<com.intellij.openapi.module.Module>, Set<PsiFile>> psiFiles = ReadAction.compute(() ->
-			this.collectFiles(projectFileIndex, psiManager, pluginConfiguration, progressIndicator, selectedFiles));
+		final Map<Optional<com.intellij.openapi.module.Module>, Set<PsiFile>> psiFiles =
+			ReadAction.computeBlocking(() -> this.collectFiles(
+				projectFileIndex,
+				psiManager,
+				pluginConfiguration,
+				progressIndicator,
+				selectedFiles));
 		
 		if(psiFiles.isEmpty())
 		{
diff --git a/src/main/java/software/xdev/pmd/analysis/PMDAnalyzer.java b/src/main/java/software/xdev/pmd/analysis/PMDAnalyzer.java
@@ -268,7 +268,7 @@ private List<PsiFile> determineApplicableFiles(
 		final int totalFiles = filesToScan.size();
 		final AtomicInteger counter = new AtomicInteger(0);
 		
-		final List<PsiFile> files = ReadAction.compute(() -> filesToScan.stream()
+		final List<PsiFile> files = ReadAction.computeBlocking(() -> filesToScan.stream()
 			.filter(file -> {
 				progressIndicator.setFraction((double)counter.incrementAndGet() / totalFiles);
 				progressIndicator.setText2(file != null ? file.getName() : null);
diff --git a/src/main/java/software/xdev/pmd/annotator/PMDExternalLanguageAnnotator.java b/src/main/java/software/xdev/pmd/annotator/PMDExternalLanguageAnnotator.java
@@ -178,8 +178,7 @@ public void apply(
 							+ "<p>"
 							+ ruleDescriptionDocMarkdownToHtmlService.mdToHtml(rule.getDescription())
 							+ "</p>")
-					.range(range)
-					.needsUpdateOnTyping(true);
+					.range(range);
 				
 				if(psiElement != null)
 				{
diff --git a/src/main/java/software/xdev/pmd/currentfile/CurrentFileAnalysisManager.java b/src/main/java/software/xdev/pmd/currentfile/CurrentFileAnalysisManager.java
@@ -77,7 +77,7 @@ private void reportAnalysisResultInternal(
 				return;
 			}
 			
-			final Optional<PsiFile> optPSIFile = ReadAction.compute(() -> Optional.of(editor)
+			final Optional<PsiFile> optPSIFile = ReadAction.computeBlocking(() -> Optional.of(editor)
 				.map(Editor::getDocument)
 				.map(FileDocumentManager.getInstance()::getFile)
 				.flatMap(this::findPSIFile));
diff --git a/src/main/java/software/xdev/pmd/ui/toolwindow/node/FileOverviewNode.java b/src/main/java/software/xdev/pmd/ui/toolwindow/node/FileOverviewNode.java
@@ -29,7 +29,7 @@ public FileOverviewNode(final PsiFile psiFile)
 	{
 		this.psiFile = psiFile;
 		// Icon requires read access so let's get it here
-		this.icon = ReadAction.compute(() -> psiFile.getIcon(0));
+		this.icon = ReadAction.computeBlocking(() -> psiFile.getIcon(0));
 		
 		this.filePositionSupplier = Suppliers.memoize(() -> new FilePosition(psiFile));
 	}

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@ plugins {`
`3`	`3`	`id 'idea'`
`4`	`4`	`id 'checkstyle'`
`5`	`5`	`id 'pmd'`
`6`		`- id 'org.jetbrains.intellij.platform' version '2.13.1'`
	`6`	`+ id 'org.jetbrains.intellij.platform' version '2.15.0'`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`ext {`
`10`		`- checkstyleVersion = '13.4.0'`
	`10`	`+ checkstyleVersion = '13.4.1'`
`11`	`11`
`12`		`- pmdVersion = '7.23.0'`
	`12`	`+ pmdVersion = '7.24.0'`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`def properties(String key) {`
`@@ -104,14 +104,9 @@ intellijPlatform {`
`104`	`104`	`}`
`105`	`105`	`pluginVerification {`
`106`	`106`	`ides {`
`107`		`- select {`
`108`		`- it.types = [IntelliJPlatformType.IntellijIdeaCommunity]`
`109`		`- it.sinceBuild = properties("platformSinceBuild")`
`110`		`- it.untilBuild = '252.*'`
`111`		`- }`
`112`	`107`	`select {`
`113`	`108`	`it.types = [IntelliJPlatformType.IntellijIdea]`
`114`		`- it.sinceBuild = '253'`
	`109`	`+ it.sinceBuild = properties("platformSinceBuild")`
`115`	`110`	`}`
`116`	`111`	`}`
`117`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,14 @@`
`12`	`12`	`],`
`13`	`13`	`"matchCurrentVersion": "0",`
`14`	`14`	`"enabled": false`
	`15`	`+ },`
	`16`	`+ {`
	`17`	`+ "description": "org.jetbrains.intellij.platform - Changelog",`
	`18`	`+ "packagePattern": "^org.jetbrains.intellij.platform",`
	`19`	`+ "matchDatasources": [`
	`20`	`+ "maven"`
	`21`	`+ ],`
	`22`	`+ "changelogUrl": "https://github.com/JetBrains/intellij-platform-gradle-plugin/releases"`
`15`	`23`	`}`
`16`	`24`	`]`
`17`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,7 @@ public void apply(`
`178`	`178`	`+ "<p>"`
`179`	`179`	`+ ruleDescriptionDocMarkdownToHtmlService.mdToHtml(rule.getDescription())`
`180`	`180`	`+ "</p>")`
`181`		`- .range(range)`
`182`		`- .needsUpdateOnTyping(true);`
	`181`	`+ .range(range);`
`183`	`182`
`184`	`183`	`if(psiElement != null)`
`185`	`184`	`{`