M68kNumberExpression: catch NumberFormatException (out of range)

Author: YannCebron

plugin-resources/messages/M68kBundle.properties

@@ -126,6 +126,8 @@ documentation.destination=Destination:
 documentation.section.cpu=CPU:
 documentation.section.privileged=Privileged:
 
+documentation.number.expression.invalid=Invalid number value
+
 cpu.group.GROUP_68000_UP=MC68000 Family
 cpu.group.GROUP_68010_UP=MC68010+
 cpu.group.GROUP_68020_UP=MC68020+

src/com/yanncebron/m68kplugin/documentation/M68kNumberExpressionDocumentationProvider.java

@@ -22,6 +22,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ObjectUtils;
+import com.yanncebron.m68kplugin.M68kBundle;
 import com.yanncebron.m68kplugin.lang.psi.M68kTokenGroups;
 import com.yanncebron.m68kplugin.lang.psi.expression.M68kNumberExpression;
 import org.jetbrains.annotations.NotNull;
@@ -34,7 +35,9 @@ final class M68kNumberExpressionDocumentationProvider extends AbstractDocumentat
     if (!(element instanceof M68kNumberExpression numberExpression)) return null;
 
     Integer originalValue = ObjectUtils.tryCast(numberExpression.getValue(), Integer.class);
-    assert originalValue != null : numberExpression.getText();
+    if (originalValue == null) {
+      return M68kBundle.message("documentation.number.expression.invalid");
+    }
 
     return "<code>" +
       doGetValueText(element, Integer.toString(originalValue)) + "<br>" +

src/com/yanncebron/m68kplugin/lang/psi/expression/impl/M68kNumberExpressionMixIn.java

@@ -23,13 +23,17 @@
 import com.yanncebron.m68kplugin.lang.psi.expression.M68kNumberExpression;
 import com.yanncebron.m68kplugin.lang.psi.expression.M68kUnaryMinusExpression;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 abstract class M68kNumberExpressionMixIn extends ASTWrapperPsiElement implements M68kNumberExpression {
 
   protected M68kNumberExpressionMixIn(@NotNull ASTNode node) {
     super(node);
   }
 
+  /**
+   * @return {@code null} for invalid number (out of range)
+   */
   @Override
   public Object getValue() {
     String text = getText();
@@ -54,7 +58,12 @@ public Object getValue() {
     throw new IllegalArgumentException("could not determine getValue() for " + elementType + ", '" + text + "'");
   }
 
+  @Nullable
   private static Integer parseNumber(String text, boolean isNegative, int radix) {
-    return Integer.parseInt(isNegative ? "-" + text : text, radix);
+    try {
+      return Integer.parseInt(isNegative ? "-" + text : text, radix);
+    } catch (NumberFormatException e) {
+      return null;
+    }
   }
 }

tests/com/yanncebron/m68kplugin/documentation/M68kNumberExpressionDocumentationProviderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Authors
+ * Copyright 2026 The Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,10 @@ public void testGenerateHoverDoc() {
       "<code><span style=\"color:#0000ff;\">42</span><br><span style=\"color:#0000ff;\">$2a</span><br><span style=\"color:#0000ff;\">@52</span><br><span style=\"color:#0000ff;\">%101010</span><br></code>");
   }
 
+  public void testGenerateHoverDocInvalidValue() {
+    doTestGenerateDoc(" dc.b -214748<caret>3649","Invalid number value");
+  }
+
   private void doTestGenerateDoc(String source, String docText) {
     myFixture.configureByText("a.s", source);
 

tests/com/yanncebron/m68kplugin/lang/psi/expression/NumberExpressionPsiTest.java

@@ -20,6 +20,7 @@
 import com.intellij.util.containers.ContainerUtil;
 import com.yanncebron.m68kplugin.lang.psi.M68kPsiTestCase;
 import com.yanncebron.m68kplugin.lang.psi.directive.M68kDcDirective;
+import org.jetbrains.annotations.Nullable;
 
 public class NumberExpressionPsiTest extends M68kPsiTestCase<M68kDcDirective> {
 
@@ -47,7 +48,15 @@ public void testGetValueBinary() {
     doTestGetValue("-%01011", -11);
   }
 
-  private void doTestGetValue(String numberValue, Integer expectedValue) {
+  public void testGetValueFailsForOverflow() {
+    doTestGetValue("" + Integer.MAX_VALUE , Integer.MAX_VALUE);
+    doTestGetValue("" + Integer.MAX_VALUE + 1, null);
+
+    doTestGetValue("-2147483648", Integer.MIN_VALUE);
+    doTestGetValue("-2147483649", null);
+  }
+
+  private void doTestGetValue(String numberValue, @Nullable Integer expectedValue) {
     final M68kExpression expression = parseNumber(numberValue);
     final M68kNumberExpression numberExpression = PsiTreeUtil.findChildOfType(expression, M68kNumberExpression.class, false);
     assertNotNull(numberExpression);