Fixed token lengths

jplag · Oct 29, 2024 · 389cb84 · 389cb84
1 parent dfd455a
commit 389cb84
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/languages/java/src/main/java/de/jplag/java/TokenGeneratingTreeScanner.java b/languages/java/src/main/java/de/jplag/java/TokenGeneratingTreeScanner.java
@@ -406,13 +406,13 @@ public Void visitNewArray(NewArrayTree node, Void unused) {
         scan(node.getDimensions(), null);
         boolean hasInit = node.getInitializers() != null && !node.getInitializers().isEmpty();
         if (hasInit) {
-            start = positions.getStartPosition(ast, node.getInitializers().get(0));
+            start = positions.getStartPosition(ast, node.getInitializers().get(0)) - 1;
             addToken(JavaTokenType.J_ARRAY_INIT_BEGIN, start, 1, new CodeSemantics());
         }
         scan(node.getInitializers(), null);
         // super method has annotation processing but we have it disabled anyways
         if (hasInit) {
-            end = positions.getEndPosition(ast, node.getInitializers().getLast()) - 1;
+            end = positions.getEndPosition(ast, node) - 1;
             addToken(JavaTokenType.J_ARRAY_INIT_END, end, 1, new CodeSemantics());
         }
         return null;
@@ -490,6 +490,13 @@ public Void visitConditionalExpression(ConditionalExpressionTree node, Void unus
     public Void visitMethodInvocation(MethodInvocationTree node, Void unused) {
         long start = positions.getStartPosition(ast, node);
         long end = positions.getEndPosition(ast, node.getMethodSelect());
+
+        String text = node.getMethodSelect().toString();
+        if (text.contains(".") && !text.contains("\n")) {
+            int offset = text.length() - text.lastIndexOf('.');
+            start = end - offset;
+        }
+
         CodeSemantics codeSemantics = CRITICAL_METHODS.contains(node.getMethodSelect().toString()) ? CodeSemantics.createCritical()
                 : CodeSemantics.createControl();
         addToken(JavaTokenType.J_APPLY, start, end, codeSemantics);

diff --git a/languages/java/src/test/resources/de/jplag/java/tokenPositions/Apply_1.java b/languages/java/src/test/resources/de/jplag/java/tokenPositions/Apply_1.java
@@ -1,6 +1,6 @@
 >class Apply {
 >    public static void main(String[] args) {
 >        System.out.println("Test");
-$        | J_APPLY 18
+$                  | J_APPLY 8
 >    }
 >}
diff --git a/languages/java/src/test/resources/de/jplag/java/tokenPositions/Apply_2.java b/languages/java/src/test/resources/de/jplag/java/tokenPositions/Apply_2.java
@@ -1,6 +1,6 @@
 >class Apply {
 >    public static void main(String[] args) {
 >        new String("test").length();
-$                           | J_APPLY 6
+$                          | J_APPLY 7
 >    }
 >}
diff --git a/languages/java/src/test/resources/de/jplag/java/tokenPositions/Apply_3.java b/languages/java/src/test/resources/de/jplag/java/tokenPositions/Apply_3.java
@@ -4,7 +4,7 @@
 >    public static void main(String[] args) {
 >        File file = new File("test");
 >        file.getName().length();
-$        | J_APPLY 12
-$                       | J_APPLY 6
+$            | J_APPLY 8
+$                      | J_APPLY 7
 >    }
 >}