Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue #3678 Function accepts a configuration but it does not do anything #3692

Merged
merged 2 commits into from
Sep 15, 2022
Merged

Fix issue #3678 Function accepts a configuration but it does not do anything #3692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9724040
Fix issue #3678 Function accepts a configuration but it does not do a…
jlerbsc Sep 15, 2022
6379ee9
Merge branch 'javaparser:master' into master
jlerbsc Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrettyPrinterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import static com.github.javaparser.printer.configuration.Indentation.IndentType.TABS_WITH_SPACE_ALIGN;
import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.Optional;
Expand Down Expand Up @@ -351,6 +352,21 @@ void indentWithTabsAsFarAsPossible() {
"\t}\n" +
"}\n", printed);
}

@Test
void initializeWithSpecificConfiguration() {
CompilationUnit cu = parse("class Foo { // this is a comment \n"
+ "}");
PrinterConfiguration config = new DefaultPrinterConfiguration()
.removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS));

Printer printer = new DefaultPrettyPrinter(config);
assertFalse(printer.getConfiguration().get(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)).isPresent());
String printed = printer.print(cu);
assertEqualsStringIgnoringEol("class Foo {\n"
+ "}\n", printed);
}


@Test
void indentWithTabsAlignWithSpaces() {
Expand Down
11 changes: 3 additions & 8 deletions javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

import com.github.javaparser.ast.Node;
import com.github.javaparser.ast.visitor.VoidVisitor;
import com.github.javaparser.printer.configuration.PrinterConfiguration;
import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration;
import com.github.javaparser.printer.configuration.PrinterConfiguration;

/**
* Pretty printer for AST nodes.
Expand All @@ -41,11 +41,6 @@ public class DefaultPrettyPrinter implements Printer {
// static methods

private static Function<PrinterConfiguration, VoidVisitor<Void>> createDefaultVisitor() {
PrinterConfiguration configuration = createDefaultConfiguration();
return createDefaultVisitor(configuration);
}

private static Function<PrinterConfiguration, VoidVisitor<Void>> createDefaultVisitor(PrinterConfiguration configuration) {
return (config) -> new DefaultPrettyPrinterVisitor(config, new SourcePrinter(config));
}

Expand All @@ -59,15 +54,15 @@ private static PrinterConfiguration createDefaultConfiguration() {
* Build a new DefaultPrettyPrinter with a default configuration and a default factory
*/
public DefaultPrettyPrinter() {
this(createDefaultVisitor(), createDefaultConfiguration() );
this(createDefaultConfiguration() );
}

/**
* Build a new DefaultPrettyPrinter with a configuration and a default factory
* @param configuration
*/
public DefaultPrettyPrinter(PrinterConfiguration configuration) {
this(createDefaultVisitor(configuration), configuration );
this(createDefaultVisitor(), configuration );
}

/**
Expand Down