Skip to content

Commit 4ac32a2

Browse files
committed
Fix isSameVariable
1 parent cda1d1d commit 4ac32a2

File tree

1 file changed

+9
-2
lines changed
  • liquidjava-verifier/src/main/java/liquidjava/utils

1 file changed

+9
-2
lines changed

liquidjava-verifier/src/main/java/liquidjava/utils/Utils.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,15 @@ public static SourcePosition getRefinementAnnotationPosition(CtElement element,
4444
}
4545

4646
public static boolean isSameVariable(String var1, String var2) {
47-
String name1 = var1.substring(0, var1.lastIndexOf('_'));
48-
String name2 = var2.substring(0, var2.lastIndexOf('_'));
47+
int index1 = var1.lastIndexOf('_');
48+
int index2 = var2.lastIndexOf('_');
49+
// no format
50+
if (index1 < 0 || index2 < 0) {
51+
return var1.equals(var2);
52+
}
53+
// #(.*)_n format
54+
String name1 = var1.substring(0, index1);
55+
String name2 = var2.substring(0, index2);
4956
return name1.equals(name2);
5057
}
5158
}

0 commit comments

Comments
 (0)