Fix #2024 Now supports removal of block and single line comments

javaparser · Jan 29, 2019 · 48339d6 · 48339d6
1 parent 3a1de78
commit 48339d6
Showing 1 changed file with 27 additions and 9 deletions.
diff --git a/...main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java b/...main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java
@@ -156,8 +156,8 @@ public void concretePropertyChange(Node observedNode, ObservableProperty propert
                     nodeText.addChild(index, (Comment) newValue);
                     nodeText.addToken(index + 1, eolTokenKind(), Utils.EOL);
                 } else if (newValue == null) {
-                    if (oldValue instanceof JavadocComment) {
-                        List<TokenTextElement> matchingTokens = getMatchingTokenTextElements((JavadocComment) oldValue, nodeText);
+                    if (oldValue instanceof Comment) {
+                        List<TokenTextElement> matchingTokens = getMatchingTokenTextElements((Comment) oldValue, nodeText);
 
                         TokenTextElement matchingElement = matchingTokens.get(0);
                         int index = nodeText.findElement(matchingElement.and(matchingElement.matchByRange()));
@@ -175,7 +175,9 @@ public void concretePropertyChange(Node observedNode, ObservableProperty propert
                         JavadocComment newJavadocComment = (JavadocComment) newValue;
                         TokenTextElement matchingElement = matchingTokens.get(0);
                         nodeText.replace(matchingElement.and(matchingElement.matchByRange()), new TokenTextElement(JAVADOC_COMMENT, "/**" + newJavadocComment.getContent() + "*/"));
-                    } else {
+                    }
+
+                    else {
                         throw new UnsupportedOperationException();
                     }
                 }
@@ -189,27 +191,43 @@ public void concretePropertyChange(Node observedNode, ObservableProperty propert
             LEXICAL_DIFFERENCE_CALCULATOR.calculatePropertyChange(nodeText, observedNode, property, oldValue, newValue);
         }
 
-        private List<TokenTextElement> getMatchingTokenTextElements(JavadocComment oldValue, NodeText nodeText) {
-            JavadocComment javadocComment = oldValue;
-            List<TokenTextElement> matchingTokens = nodeText.getElements().stream()
+        private List<TokenTextElement> getMatchingTokenTextElements(Comment oldValue, NodeText nodeText) {
+            List<TokenTextElement> matchingTokens;
+
+            if (oldValue instanceof JavadocComment) {
+                matchingTokens = nodeText.getElements().stream()
                     .filter(e -> e.isToken(JAVADOC_COMMENT))
                     .map(e -> (TokenTextElement) e)
-                    .filter(t -> t.getText().equals("/**" + javadocComment.getContent() + "*/"))
+                    .filter(t -> t.getText().equals("/**" + oldValue.getContent() + "*/"))
+                    .collect(Collectors.toList());
+            } else if (oldValue instanceof BlockComment) {
+                matchingTokens = nodeText.getElements().stream()
+                    .filter(e -> e.isToken(MULTI_LINE_COMMENT))
+                    .map(e -> (TokenTextElement) e)
+                    .filter(t -> t.getText().equals("/*" + oldValue.getContent() + "*/"))
                     .collect(Collectors.toList());
+            } else {
+                matchingTokens = nodeText.getElements().stream()
+                    .filter(e -> e.isToken(SINGLE_LINE_COMMENT))
+                    .map(e -> (TokenTextElement) e)
+                    .filter(t -> t.getText().equals("//" + oldValue.getContent() + System.lineSeparator()))
+                    .collect(Collectors.toList());
+            }
 
             if (matchingTokens.size() > 1) {
                 // Duplicate comments found, refine the result
                 matchingTokens = matchingTokens.stream()
-                        .filter(t -> isEqualRange(t.getToken().getRange(), javadocComment.getRange()))
+                        .filter(t -> isEqualRange(t.getToken().getRange(), oldValue.getRange()))
                         .collect(Collectors.toList());
             }
 
             if (matchingTokens.size() != 1) {
-                throw new IllegalStateException("The matching JavadocComment to be removed / replaced could not be found");
+                throw new IllegalStateException("The matching comment to be removed / replaced could not be found");
             }
             return matchingTokens;
         }
 
+
         private boolean isEqualRange(Optional<Range> range1, Optional<Range> range2) {
             if (range1.isPresent() && range2.isPresent()) {
                 return range1.get().equals(range2.get());