Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e34364e
Update pmdVersion to v7.23.0
xdev-renovate Mar 28, 2026
488f6de
Update checkstyleVersion to v13.4.0
xdev-renovate Mar 30, 2026
c5d04a0
Merge pull request #64 from xdev-software/master
AB-xdev Mar 30, 2026
225c79b
Prepare for new templating system
AB-xdev Mar 30, 2026
fdda8ee
Merge branch 'master' into update-from-template-xdev-software/base-te…
xdev-gh-bot Mar 30, 2026
fcf8b93
Update upstream.yml
AB-xdev Mar 30, 2026
e60abb7
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Mar 30, 2026
3e30eeb
Create upstream.yml
AB-xdev Mar 30, 2026
c48f108
Update upstream.yml
AB-xdev Mar 30, 2026
1d3adaf
Merge pull request #233 from xdev-software/renovate/checkstyleversion
AB-xdev Mar 30, 2026
609a9b4
Merge pull request #232 from xdev-software/renovate/pmdversion
AB-xdev Mar 30, 2026
6e3a25f
Merge remote-tracking branch 'origin/update-from-template-github_com_…
AB-xdev Mar 31, 2026
c77767c
Merge branch 'master' into update-from-template-github_com_xdev-softw…
xdev-gh-bot Mar 31, 2026
c0e52bd
Delete update-from-template.yml
AB-xdev Mar 31, 2026
324bd20
Merge remote-tracking branch 'origin/update-from-template-github_com_…
AB-xdev Mar 31, 2026
bdc83f7
Merge remote-tracking branch 'origin/update-from-template-github_com_…
AB-xdev Mar 31, 2026
0c1a8b4
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Mar 31, 2026
4d5444a
Merge pull request #65 from xdev-software/update-from-template-merged
AB-xdev Mar 31, 2026
068313a
Correctly handle when built-in configuration is missing / was removed
AB-xdev Mar 31, 2026
badb80a
Update CHANGELOG.md
AB-xdev Mar 31, 2026
a76bc79
Only run on Java plugins
AB-xdev Apr 1, 2026
49dbb6c
Update CHANGELOG.md
AB-xdev Apr 1, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .config/topo/upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- url: https://github.com/xdev-software/intellij-plugin-template.git
branch: master
320 changes: 0 additions & 320 deletions .github/workflows/update-from-template.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 1.0.8
* Correctly handle missing/removal of built-in configuration
* Fix crash on non Java-IDEs #67

# 1.0.7
* Update PMD to 7.23.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.Collections;
import java.util.Map;
import java.util.Optional;
import java.util.WeakHashMap;

import org.jetbrains.annotations.NotNull;
Expand All @@ -11,6 +12,7 @@
import software.xdev.pmd.external.org.apache.shiro.lang.util.SoftHashMap;
import software.xdev.pmd.model.config.bundled.BundledConfig;
import software.xdev.pmd.model.config.bundled.BundledConfigurationLocation;
import software.xdev.pmd.model.config.bundled.UnknownBundledConfigurationLocation;
import software.xdev.pmd.model.config.file.FileConfigurationLocation;
import software.xdev.pmd.model.config.file.RelativeFileConfigurationLocation;

Expand Down Expand Up @@ -65,7 +67,9 @@ record CreateCacheKey(
{
case LOCAL_FILE -> new FileConfigurationLocation(project, id);
case PROJECT_RELATIVE -> new RelativeFileConfigurationLocation(project, id);
case BUNDLED -> new BundledConfigurationLocation(BundledConfig.fromId(id), project);
case BUNDLED -> Optional.ofNullable(BundledConfig.fromId(id))
.map(c -> new BundledConfigurationLocation(c, project))
.orElseGet(() -> new UnknownBundledConfigurationLocation(id, project));
};

configurationLocation.setLocation(location);
Expand Down
Loading