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

feat: adjust text block indentation #596

Merged
merged 1 commit into from
Aug 15, 2023
Merged

feat: adjust text block indentation #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion packages/prettier-plugin-java/src/printers/lexical-structure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { printTokenWithComments } from "./comments/format-comments";
import { join } from "./prettier-builder";
import { BaseCstPrettierPrinter } from "../base-cst-printer";
import {
BooleanLiteralCtx,
Expand All @@ -7,10 +8,24 @@ import {
IToken,
LiteralCtx
} from "java-parser";
import { builders } from "prettier/doc";

const { hardline } = builders;

export class LexicalStructurePrettierVisitor extends BaseCstPrettierPrinter {
literal(ctx: LiteralCtx) {
if (ctx.CharLiteral || ctx.TextBlock || ctx.StringLiteral || ctx.Null) {
if (ctx.TextBlock) {
const lines = ctx.TextBlock[0].image.split("\n");
const open = lines.shift()!;
const baseIndent = Math.min(
clementdessoude marked this conversation as resolved.
Show resolved Hide resolved
...lines.map(line => line.search(/\S/)).filter(indent => indent >= 0)
);
return join(hardline, [
open,
...lines.map(line => line.slice(baseIndent))
]);
}
if (ctx.CharLiteral || ctx.StringLiteral || ctx.Null) {
return printTokenWithComments(this.getSingle(ctx) as IToken);
}
return this.visitSingle(ctx);
Expand Down
21 changes: 21 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/text-blocks/_input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,27 @@ public void print(%s object) {
</body>\r
</html>\r
""";

System.out.println(
// leading comment
"""
abaoeu
euaoeu
aoeu

oaeu
abc""" // trailing comment
);

System.out.println(
"""
abaoeu
euaoeu
aoeu

oaeu
abc"""
);
}

}
52 changes: 36 additions & 16 deletions packages/prettier-plugin-java/test/unit-test/text-blocks/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,50 @@
public class TextBlock {

void method() {
String myTextBlock = """
my text
String myTextBlock =
"""
my text


sentence\"""
sentence\"""

""";
""";

String source =
"""
public void print(%s object) {
System.out.println(Objects.toString(object));
}
""".formatted(
type
);
public void print(%s object) {
System.out.println(Objects.toString(object));
}
""".formatted(type);

String html =
"""
<html>\r
<body>\r
<p>Hello, world</p>\r
</body>\r
</html>\r
""";
<html>\r
<body>\r
<p>Hello, world</p>\r
</body>\r
</html>\r
""";

System.out.println(
// leading comment
"""
abaoeu
euaoeu
aoeu

oaeu
abc""" // trailing comment
);

System.out.println(
"""
abaoeu
euaoeu
aoeu

oaeu
abc"""
);
}
}
Loading