fix(comment): fix bug in the usage of the new flag (closes #721)

INRIA · Jun 24, 2016 · 3095468 · 3095468
1 parent e34b6c4
commit 3095468
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java b/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java
@@ -1126,7 +1126,7 @@ public <T> void visitCtSuperAccess(CtSuperAccess<T> f) {
 
  @Override
  public void visitCtComment(CtComment comment) {
- if (!env.isGenerateJavadoc() && !env.isCommentsEnabled() && context.elementStack.size() > 1) {
+ if (!(env.isGenerateJavadoc() || env.isCommentsEnabled()) && context.elementStack.size() > 1) {
  return;
  }
  switch (comment.getCommentType()) {
@@ -1613,15 +1613,15 @@ public DefaultJavaPrettyPrinter writeThrowsClause(CtExecutable<?> e) {
  }
 
  private void printComment(CtComment comment) {
- if (!env.isGenerateJavadoc() || !env.isCommentsEnabled() || comment == null) {
+ if (!(env.isGenerateJavadoc() || env.isCommentsEnabled()) || comment == null) {
  return;
  }
  scan(comment);
  writeln().writeTabs();
  }
 
  private void printComment(List<CtComment> comments) {
- if (!env.isGenerateJavadoc() || !env.isCommentsEnabled() || comments == null) {
+ if (!(env.isGenerateJavadoc() || env.isCommentsEnabled()) || comments == null) {
  return;
  }
  for (CtComment comment : comments) {
@@ -1642,7 +1642,7 @@ private void printComment(CtElement e, CommentOffset offset) {
 
  private List<CtComment> getComments(CtElement e, CommentOffset offset) {
  List<CtComment> commentsToPrint = new ArrayList<>();
- if (!env.isGenerateJavadoc() || !env.isCommentsEnabled() || e == null) {
+ if (!(env.isGenerateJavadoc() || env.isCommentsEnabled()) || e == null) {
  return commentsToPrint;
  }
  for (CtComment comment : e.getComments()) {

diff --git a/src/test/java/spoon/test/comment/CommentTest.java b/src/test/java/spoon/test/comment/CommentTest.java
@@ -42,7 +42,6 @@ private Factory getSpoonFactory() {
  launcher.run(new String[] {
  "-i", "./src/test/java/spoon/test/comment/testclasses/",
  "-o", "./target/spooned/",
- "-j",
  "-c"
  });
  return launcher.getFactory();