Release 3.10.4

Rollczi · Rollczi · commit 12008e896597 · 2025-08-28T18:25:43.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,13 +2,13 @@ import org.jetbrains.changelog.markdownToHTML
 
 plugins {
     id("java")
-    id("org.jetbrains.kotlin.jvm") version "2.0.21"
-    id("org.jetbrains.intellij.platform") version "2.5.0"
-    id("org.jetbrains.changelog") version "2.2.1"
+    id("org.jetbrains.kotlin.jvm") version "2.2.10"
+    id("org.jetbrains.intellij.platform") version "2.7.2"
+    id("org.jetbrains.changelog") version "2.4.0"
 }
 
 group = "dev.rollczi"
-version = "3.9.7"
+version = "3.10.4"
 
 repositories {
     mavenCentral()
@@ -23,9 +23,8 @@ repositories {
 dependencies {
     implementation("dev.rollczi:litecommands-framework:${version}")
     intellijPlatform {
-        intellijIdeaCommunity("2025.1")
+        intellijIdeaCommunity("2025.2")
         bundledPlugins("com.intellij.java", "org.jetbrains.kotlin")
-        instrumentationTools()
         pluginVerifier()
         zipSigner()
     }
@@ -41,8 +40,8 @@ intellijPlatform {
         description = readDescriptionFrom("README.md")
 
         ideaVersion {
-            sinceBuild = "242"
-            untilBuild = "251.*"
+            sinceBuild = "252"
+            untilBuild = "252.*"
         }
     }
 
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/annotation/AnnotationFactory.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/annotation/AnnotationFactory.java
@@ -8,6 +8,7 @@
 import com.intellij.lang.jvm.annotation.JvmAnnotationConstantValue;
 import com.intellij.lang.jvm.annotation.JvmAnnotationEnumFieldValue;
 import com.intellij.lang.jvm.annotation.JvmNestedAnnotationValue;
+import com.intellij.openapi.progress.CeProcessCanceledException;
 import com.intellij.psi.PsiAnnotation;
 import com.intellij.psi.PsiModifierListOwner;
 
@@ -96,6 +97,10 @@ private static boolean isNotCorrectlyFilled(InvocationTargetException exception)
                 return true;
             }
 
+            if (throwable instanceof CeProcessCanceledException) {
+                return true;
+            }
+
             return throwable instanceof NoSuchMethodException;
         }
 
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/api/psijava/PsiJavaExecutorNode.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/api/psijava/PsiJavaExecutorNode.java
@@ -20,6 +20,7 @@
 import dev.rollczi.litecommands.intellijplugin.annotation.AnnotationFactory;
 import dev.rollczi.litecommands.intellijplugin.util.LiteTypeChecks;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -78,7 +79,7 @@ public class PsiJavaExecutorNode extends PsiJavaAbstractNode implements Executor
 
         // Flag
         (node, parameter, annotation) -> AnnotationFactory.from(Flag.class, annotation)
-            .map(holder -> new PsiJavaArgument(node, parameter, holder.asAnnotation().value(), PsiJavaArgument.STATIC_VALUE)),
+            .map(holder -> new PsiJavaArgument(node, parameter, Arrays.stream(holder.asAnnotation().value()).findFirst().orElse("?"), PsiJavaArgument.STATIC_VALUE)),
 
         // Literal
         (node, parameter, annotation) -> AnnotationFactory.from(Literal.class, annotation)
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/inlay/ref/ArgumentPsiReferenceProvider.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/inlay/ref/ArgumentPsiReferenceProvider.java
@@ -9,7 +9,6 @@
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.PsiReferenceProvider;
 import com.intellij.util.ProcessingContext;
-import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.intellijplugin.util.LiteTypeChecks;
 import org.jetbrains.annotations.NotNull;
 
@@ -19,7 +18,7 @@ class ArgumentPsiReferenceProvider extends PsiReferenceProvider {
     }
 
     @Override
-    public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
+    public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
         PsiLiteralExpression literal = (PsiLiteralExpression) element;
 
         if (!(literal.getValue() instanceof String)) {
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/inlay/ref/SimpleReference.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/inlay/ref/SimpleReference.java
@@ -29,7 +29,7 @@ final class SimpleReference extends PsiReferenceBase<PsiElement> implements PsiP
     }
 
     @Override
-    public ResolveResult @NotNull [] multiResolve(boolean incompleteCode) {
+    public ResolveResult[] multiResolve(boolean incompleteCode) {
         List<ResolveResult> results = new ArrayList<>();
         for (PsiClass parser : LiteTypeSearcher.findParsersByType(element.getProject(), type)) {
             results.add(new PsiElementResolveResult(parser));
@@ -46,7 +46,7 @@ public PsiElement resolve() {
     }
 
     @Override
-    public Object @NotNull [] getVariants() {
+    public Object[] getVariants() {
         List<LookupElement> variants = new ArrayList<>();
 
         for (PsiClass parser : LiteTypeSearcher.findParsersByType(element.getProject(), type)) {
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/inspection/LiteInspectionProvider.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/inspection/LiteInspectionProvider.java
@@ -21,7 +21,7 @@
 public class LiteInspectionProvider implements InspectionToolProvider {
 
     @Override
-    public Class<? extends LiteInspection> @NotNull [] getInspectionClasses() {
+    public Class<? extends LiteInspection> [] getInspectionClasses() {
         return new Class[]{
             ExecutorNotAnnotatedParameterInspection.class,
             ParameterNullableOptionalPrimitiveInspection.class,
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/inspection/annotation/LiteNullabilityAnnotationPackage.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/inspection/annotation/LiteNullabilityAnnotationPackage.java
@@ -1,23 +1,20 @@
 package dev.rollczi.litecommands.intellijplugin.inspection.annotation;
 
+import com.intellij.codeInsight.ContextNullabilityInfo;
 import com.intellij.codeInsight.Nullability;
 import com.intellij.codeInsight.NullabilityAnnotationInfo;
 import com.intellij.codeInsight.annoPackages.AnnotationPackageSupport;
 import com.intellij.lang.jvm.annotation.JvmAnnotationAttribute;
 import com.intellij.lang.jvm.annotation.JvmAnnotationAttributeValue;
 import com.intellij.lang.jvm.annotation.JvmAnnotationConstantValue;
 import com.intellij.psi.PsiAnnotation;
-import com.intellij.psi.PsiElement;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.flag.Flag;
 import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.literal.Literal;
 import dev.rollczi.litecommands.annotations.optional.OptionalArg;
 import dev.rollczi.litecommands.annotations.varargs.Varargs;
-import dev.rollczi.litecommands.intellijplugin.annotation.AnnotationFactory;
-import dev.rollczi.litecommands.intellijplugin.annotation.AnnotationHolder;
 import java.util.List;
-import java.util.Optional;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -40,26 +37,26 @@ public class LiteNullabilityAnnotationPackage implements AnnotationPackageSuppor
     }
 
     @Override
-    public @Nullable NullabilityAnnotationInfo getNullabilityByContainerAnnotation(@NotNull PsiAnnotation anno, @NotNull PsiElement context, PsiAnnotation.TargetType @NotNull [] types, boolean superPackage) {
+    public @NotNull ContextNullabilityInfo getNullabilityByContainerAnnotation(@NotNull PsiAnnotation anno, PsiAnnotation.TargetType[] types, boolean superPackage) {
         if (!Arg.class.getName().equals(anno.getQualifiedName())) {
-            return null;
+            return ContextNullabilityInfo.EMPTY;
         }
 
         @Nullable JvmAnnotationAttribute attribute = anno.findAttribute("nullable");
         if (attribute == null) {
-            return null;
+            return ContextNullabilityInfo.EMPTY;
         }
 
         @Nullable JvmAnnotationAttributeValue value = attribute.getAttributeValue();
         if (!(value instanceof JvmAnnotationConstantValue constantValue)) {
-            return null;
+            return ContextNullabilityInfo.EMPTY;
         }
 
         if (!(constantValue.getConstantValue() instanceof Boolean nullable)) {
-            return null;
+            return ContextNullabilityInfo.EMPTY;
         }
 
-        return new NullabilityAnnotationInfo(anno, nullable ? Nullability.NULLABLE : Nullability.NOT_NULL, false);
+        return ContextNullabilityInfo.constant(new NullabilityAnnotationInfo(anno, nullable ? Nullability.NULLABLE : Nullability.NOT_NULL, false));
     }
 
 }
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/ClassUnusedInspectSuppressor.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/ClassUnusedInspectSuppressor.java
@@ -30,7 +30,7 @@ public boolean isSuppressedFor(@NotNull PsiElement element, @NotNull String tool
     }
 
     @Override
-    public SuppressQuickFix @NotNull [] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
+    public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
         return SuppressQuickFix.EMPTY_ARRAY;
     }
 
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/ConstructorUnusedInspectSuppressor.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/ConstructorUnusedInspectSuppressor.java
@@ -30,7 +30,7 @@ public boolean isSuppressedFor(@NotNull PsiElement element, @NotNull String tool
     }
 
     @Override
-    public SuppressQuickFix @NotNull [] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
+    public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
         return SuppressQuickFix.EMPTY_ARRAY;
     }
 
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/ExecutorUnusedInspectSuppressor.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/ExecutorUnusedInspectSuppressor.java
@@ -30,7 +30,7 @@ public boolean isSuppressedFor(@NotNull PsiElement element, @NotNull String tool
     }
 
     @Override
-    public SuppressQuickFix @NotNull [] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
+    public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
         return SuppressQuickFix.EMPTY_ARRAY;
     }
 
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/NullableProblemsPrimitiveSuppressor.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/NullableProblemsPrimitiveSuppressor.java
@@ -44,7 +44,7 @@ public boolean isSuppressedFor(@NotNull PsiElement element, @NotNull String tool
     }
 
     @Override
-    public SuppressQuickFix @NotNull [] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
+    public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
         return SuppressQuickFix.EMPTY_ARRAY;
     }
 
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/OptionalArgumentSuppressor.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/suppressor/OptionalArgumentSuppressor.java
@@ -34,7 +34,7 @@ public boolean isSuppressedFor(@NotNull PsiElement element, @NotNull String tool
     }
 
     @Override
-    public SuppressQuickFix @NotNull [] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
+    public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {
         return SuppressQuickFix.EMPTY_ARRAY;
     }
 
diff --git a/src/main/java/dev/rollczi/litecommands/intellijplugin/template/LiteCommandsTemplatesAction.java b/src/main/java/dev/rollczi/litecommands/intellijplugin/template/LiteCommandsTemplatesAction.java
@@ -31,7 +31,7 @@ public class LiteCommandsTemplatesAction extends CreateFileFromTemplateAction {
     public static final String TEMPLATE_KOTLIN_ROOT = "LiteCommands Root Command Kotlin";
 
     @Override
-    protected void buildDialog(@NotNull Project project, @NotNull PsiDirectory directory, CreateFileFromTemplateDialog.@NotNull Builder builder) {
+    protected void buildDialog(@NotNull Project project, @NotNull PsiDirectory directory, CreateFileFromTemplateDialog.Builder builder) {
         builder
             .setTitle("Create LiteCommands Class")
             .addKind("Command", LiteIcons.Template.Java, TEMPLATE_JAVA, new Validator())

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ final class SimpleReference extends PsiReferenceBase<PsiElement> implements PsiP`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
`32`		`- public ResolveResult @NotNull [] multiResolve(boolean incompleteCode) {`
	`32`	`+ public ResolveResult[] multiResolve(boolean incompleteCode) {`
`33`	`33`	`List<ResolveResult> results = new ArrayList<>();`
`34`	`34`	`for (PsiClass parser : LiteTypeSearcher.findParsersByType(element.getProject(), type)) {`
`35`	`35`	`results.add(new PsiElementResolveResult(parser));`
`@@ -46,7 +46,7 @@ public PsiElement resolve() {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Override`
`49`		`- public Object @NotNull [] getVariants() {`
	`49`	`+ public Object[] getVariants() {`
`50`	`50`	`List<LookupElement> variants = new ArrayList<>();`
`51`	`51`
`52`	`52`	`for (PsiClass parser : LiteTypeSearcher.findParsersByType(element.getProject(), type)) {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public boolean isSuppressedFor(@NotNull PsiElement element, @NotNull String tool`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
`33`		`- public SuppressQuickFix @NotNull [] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {`
	`33`	`+ public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) {`
`34`	`34`	`return SuppressQuickFix.EMPTY_ARRAY;`
`35`	`35`	`}`
`36`	`36`