Merge remote-tracking branch 'javaparser/master' into no_receiver_param_in_signature

# Conflicts:
#	javaparser-testing/src/test/java/com/github/javaparser/ast/body/ConstructorDeclarationTest.java

1 files changed, 6 insertions, 1 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
index 27b0f4029..f11f009d7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
@@ -36,6 +36,7 @@ import com.github.javaparser.ast.stmt.*;
 import com.github.javaparser.ast.type.*;
 import com.github.javaparser.ast.visitor.Visitable;
 import com.github.javaparser.ast.visitor.VoidVisitor;
+import com.github.javaparser.utils.Utils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -304,7 +305,11 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
     @Override
     public void visit(final JavadocComment n, final Void arg) {
         printer.print("/**");
-        printer.print(n.getContent());
+        String commentContent = n.getContent();
+        if (configuration.isNormalizeEolInComment()) {
+            commentContent = Utils.normalizeEolInTextBlock(commentContent, configuration.getEndOfLineCharacter());
+        }
+        printer.print(commentContent);
         printer.println("*/");
     }