Check that token is actually present in exceptions

simonpoole · Jan 1, 2024 · 1ec70df · 1ec70df
1 parent 6ba5530
commit 1ec70df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
diff --git a/lib/src/main/java/ch/poole/openinghoursfragment/OpeningHoursFragment.java b/lib/src/main/java/ch/poole/openinghoursfragment/OpeningHoursFragment.java
@@ -90,6 +90,7 @@
 import ch.poole.openinghoursparser.RuleModifier;
 import ch.poole.openinghoursparser.RuleModifier.Modifier;
 import ch.poole.openinghoursparser.TimeSpan;
+import ch.poole.openinghoursparser.Token;
 import ch.poole.openinghoursparser.TokenMgrError;
 import ch.poole.openinghoursparser.VarDate;
 import ch.poole.openinghoursparser.VariableTime;
@@ -841,7 +842,11 @@ private void highlightParseError(@NonNull EditText text, @NonNull OpeningHoursPa
  boolean first = true;
  int pos = 0;
  for (OpeningHoursParseException pex : ohpex.getExceptions()) {
- int c = pex.currentToken.next.beginColumn - 1; // starts at 1
+ Token current = pex.currentToken;
+ if (current == null || current.next == null ) {
+ continue;
+ }
+ int c = current.next.beginColumn - 1; // starts at 1
  spannable.setSpan(new ForegroundColorSpan(Color.RED), c, Math.max(c, Math.min(c + 1, spannable.length())), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
  if (first) {
  pos = c;