Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,24 @@
"devDependencies": {
"@eslint/js": "^10.0.1",
"@types/chai": "^5.2.3",
"@types/emscripten": "^1.41.5",
"@types/emscripten": "^1.41.6",
"@types/mocha": "^10.0.10",
"@types/node": "^26.0.0",
"chai": "^6.2.2",
"eslint": "^10.1.0",
"globals": "^17.4.0",
"@types/node": "^26.6.6",
"chai": "^6.3.0",
"eslint": "^10.15.0",
"globals": "^17.14.0",
"husky": "^9.1.7",
"lerna": "^10.0.0",
"lint-staged": "^17.0.2",
"lerna": "^10.1.1",
"lint-staged": "^17.6.0",
"mitata": "^1.0.34",
"mocha": "^12.0.0",
"postcss": "^8.5.15",
"prettier": "^3.8.1",
"mocha": "^12.0.3",
"postcss": "^8.5.33",
"prettier": "^3.10.1",
"prettier-plugin-css-order": "^2.2.0",
"tree-sitter-java-orchard": "0.5.23",
"tsdown": "^0.23.0",
"tree-sitter-java-orchard": "0.5.25",
"tsdown": "^0.23.7",
"typescript": "^6.0.3",
"typescript-eslint": "^8.57.1"
"typescript-eslint": "^8.72.2"
},
"peerDependencies": {
"prettier": "^3.0.0"
Expand Down
9 changes: 6 additions & 3 deletions src/comments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,14 @@ export function canAttachComment(node: SyntaxNode, ancestors: SyntaxNode[]) {
}
switch (node.type) {
case SyntaxType.EnumBodyDeclarations:
case SyntaxType.EscapeSequence:
case SyntaxType.Modifier:
case SyntaxType.MultilineStringFragment:
case SyntaxType.Program:
case SyntaxType.StringFragment:
case SyntaxType.StringTemplateBegin:
case SyntaxType.StringTemplateEnd:
case SyntaxType.StringTemplateMid:
case SyntaxType.TextBlockTemplateBegin:
case SyntaxType.TextBlockTemplateEnd:
case SyntaxType.TextBlockTemplateMid:
case SyntaxType.Visibility:
return false;
case SyntaxType.ParenthesizedExpression: {
Expand Down
82 changes: 49 additions & 33 deletions src/node-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ export const enum SyntaxType {
Modifiers = "modifiers",
ModuleBody = "module_body",
ModuleDeclaration = "module_declaration",
MultilineStringFragment = "multiline_string_fragment",
ObjectCreationExpression = "object_creation_expression",
OpensModuleDirective = "opens_module_directive",
PackageDeclaration = "package_declaration",
Expand All @@ -143,7 +142,6 @@ export const enum SyntaxType {
ScopedTypeIdentifier = "scoped_type_identifier",
SpreadParameter = "spread_parameter",
StaticInitializer = "static_initializer",
StringInterpolation = "string_interpolation",
StringLiteral = "string_literal",
SuperInterfaces = "super_interfaces",
Superclass = "superclass",
Expand Down Expand Up @@ -179,16 +177,20 @@ export const enum SyntaxType {
CharacterLiteral = "character_literal",
DecimalFloatingPointLiteral = "decimal_floating_point_literal",
DecimalIntegerLiteral = "decimal_integer_literal",
EscapeSequence = "escape_sequence",
False = "false",
HexFloatingPointLiteral = "hex_floating_point_literal",
HexIntegerLiteral = "hex_integer_literal",
Identifier = "identifier",
LineComment = "line_comment",
NullLiteral = "null_literal",
OctalIntegerLiteral = "octal_integer_literal",
StringFragment = "string_fragment",
StringTemplateBegin = "string_template_begin",
StringTemplateEnd = "string_template_end",
StringTemplateMid = "string_template_mid",
Super = "super",
TextBlockTemplateBegin = "text_block_template_begin",
TextBlockTemplateEnd = "text_block_template_end",
TextBlockTemplateMid = "text_block_template_mid",
This = "this",
True = "true",
TypeIdentifier = "type_identifier",
Expand All @@ -203,8 +205,6 @@ export type NamedType = Exclude<SyntaxType, CommentType>;
export type UnnamedType =
| "!"
| "!="
| '"'
| '"""'
| "%"
| "%="
| "&"
Expand Down Expand Up @@ -243,9 +243,7 @@ export type UnnamedType =
| ">>>="
| "?"
| "@"
| "@interface"
| "["
| "\\{"
| "]"
| "^"
| "^="
Expand Down Expand Up @@ -415,7 +413,6 @@ export type SyntaxNode =
| ModifiersNode
| ModuleBodyNode
| ModuleDeclarationNode
| MultilineStringFragmentNode
| ObjectCreationExpressionNode
| OpensModuleDirectiveNode
| PackageDeclarationNode
Expand All @@ -438,7 +435,6 @@ export type SyntaxNode =
| ScopedTypeIdentifierNode
| SpreadParameterNode
| StaticInitializerNode
| StringInterpolationNode
| StringLiteralNode
| SuperInterfacesNode
| SuperclassNode
Expand Down Expand Up @@ -470,8 +466,6 @@ export type SyntaxNode =
| YieldStatementNode
| UnnamedNode<"!">
| UnnamedNode<"!=">
| UnnamedNode<'"'>
| UnnamedNode<'"""'>
| UnnamedNode<"%">
| UnnamedNode<"%=">
| UnnamedNode<"&">
Expand Down Expand Up @@ -510,9 +504,7 @@ export type SyntaxNode =
| UnnamedNode<">>>=">
| UnnamedNode<"?">
| UnnamedNode<"@">
| UnnamedNode<"@interface">
| UnnamedNode<"[">
| UnnamedNode<"\\{">
| UnnamedNode<"]">
| UnnamedNode<"^">
| UnnamedNode<"^=">
Expand All @@ -535,7 +527,6 @@ export type SyntaxNode =
| UnnamedNode<"double">
| UnnamedNode<"else">
| UnnamedNode<"enum">
| EscapeSequenceNode
| UnnamedNode<"exports">
| UnnamedNode<"extends">
| FalseNode
Expand Down Expand Up @@ -574,10 +565,15 @@ export type SyntaxNode =
| UnnamedNode<"short">
| UnnamedNode<"static">
| UnnamedNode<"strictfp">
| StringFragmentNode
| StringTemplateBeginNode
| StringTemplateEndNode
| StringTemplateMidNode
| SuperNode
| UnnamedNode<"switch">
| UnnamedNode<"synchronized">
| TextBlockTemplateBeginNode
| TextBlockTemplateEndNode
| TextBlockTemplateMidNode
| ThisNode
| UnnamedNode<"throw">
| UnnamedNode<"throws">
Expand Down Expand Up @@ -767,7 +763,11 @@ export interface AssertStatementNode extends NamedNodeBase {

export interface AssignmentExpressionNode extends NamedNodeBase {
type: SyntaxType.AssignmentExpression;
leftNode: ArrayAccessNode | FieldAccessNode | IdentifierNode;
leftNode:
| ArrayAccessNode
| FieldAccessNode
| IdentifierNode
| ParenthesizedExpressionNode;
operatorNode:
| UnnamedNode<"%=">
| UnnamedNode<"&=">
Expand Down Expand Up @@ -824,8 +824,16 @@ export interface BreakStatementNode extends NamedNodeBase {

export interface CastExpressionNode extends NamedNodeBase {
type: SyntaxType.CastExpression;
typeNodes: TypeNode[];
valueNode: ExpressionNode;
typeNodes: (
TypeNode | BooleanTypeNode | FloatingPointTypeNode | IntegralTypeNode
)[];
valueNode:
| CastExpressionNode
| LambdaExpressionNode
| ExpressionNode
| SwitchExpressionNode
| UnaryExpressionNode
| UpdateExpressionNode;
}

export interface CatchClauseNode extends NamedNodeBase {
Expand Down Expand Up @@ -1118,10 +1126,6 @@ export interface ModuleDeclarationNode extends NamedNodeBase {
nameNode: IdentifierNode | ScopedIdentifierNode;
}

export interface MultilineStringFragmentNode extends NamedNodeBase {
type: SyntaxType.MultilineStringFragment;
}

export interface ObjectCreationExpressionNode extends NamedNodeBase {
type: SyntaxType.ObjectCreationExpression;
argumentsNode: ArgumentListNode;
Expand Down Expand Up @@ -1233,10 +1237,6 @@ export interface StaticInitializerNode extends NamedNodeBase {
type: SyntaxType.StaticInitializer;
}

export interface StringInterpolationNode extends NamedNodeBase {
type: SyntaxType.StringInterpolation;
}

export interface StringLiteralNode extends NamedNodeBase {
type: SyntaxType.StringLiteral;
}
Expand Down Expand Up @@ -1397,10 +1397,6 @@ export interface DecimalIntegerLiteralNode extends NamedNodeBase {
type: SyntaxType.DecimalIntegerLiteral;
}

export interface EscapeSequenceNode extends NamedNodeBase {
type: SyntaxType.EscapeSequence;
}

export interface FalseNode extends NamedNodeBase {
type: SyntaxType.False;
}
Expand Down Expand Up @@ -1429,14 +1425,34 @@ export interface OctalIntegerLiteralNode extends NamedNodeBase {
type: SyntaxType.OctalIntegerLiteral;
}

export interface StringFragmentNode extends NamedNodeBase {
type: SyntaxType.StringFragment;
export interface StringTemplateBeginNode extends NamedNodeBase {
type: SyntaxType.StringTemplateBegin;
}

export interface StringTemplateEndNode extends NamedNodeBase {
type: SyntaxType.StringTemplateEnd;
}

export interface StringTemplateMidNode extends NamedNodeBase {
type: SyntaxType.StringTemplateMid;
}

export interface SuperNode extends NamedNodeBase {
type: SyntaxType.Super;
}

export interface TextBlockTemplateBeginNode extends NamedNodeBase {
type: SyntaxType.TextBlockTemplateBegin;
}

export interface TextBlockTemplateEndNode extends NamedNodeBase {
type: SyntaxType.TextBlockTemplateEnd;
}

export interface TextBlockTemplateMidNode extends NamedNodeBase {
type: SyntaxType.TextBlockTemplateMid;
}

export interface ThisNode extends NamedNodeBase {
type: SyntaxType.This;
}
Expand Down
6 changes: 6 additions & 0 deletions src/printers/blocks-and-statements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ export default {
values.push(print(child));
}
}, "namedChildren");
const hasDefault = path.node.children.some(
({ type }) => type === "default"
);
if (hasDefault) {
values.push("default");
}

const hasMultipleValues = values.length > 1;
const label = hasMultipleValues
Expand Down
2 changes: 1 addition & 1 deletion src/printers/expressions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1648,7 +1648,7 @@ function shouldExtraIndentForTernaryExpression(

function isStringLiteral(node: NamedNode) {
return (
node.type === SyntaxType.StringLiteral && node.children[0].value === '"'
node.type === SyntaxType.StringLiteral && !node.value.startsWith('"""')
);
}

Expand Down
5 changes: 1 addition & 4 deletions src/printers/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -633,10 +633,7 @@ export function embedTextBlock(
path: NamedNodePath<SyntaxType.StringLiteral>,
options: Options
) {
const hasInterpolations = path.node.namedChildren.some(
({ type }) => type === SyntaxType.StringInterpolation
);
if (hasInterpolations || path.node.children[0].value === '"') {
if (path.node.children.length > 0 || !path.node.value.startsWith('"""')) {
return null;
}

Expand Down
42 changes: 21 additions & 21 deletions src/printers/lexical-structure.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@ const { group, hardline, indent, join, softline } = builders;

export default {
string_literal(path, print) {
const hasInterpolations = path.node.namedChildren.some(
({ type }) => type === SyntaxType.StringInterpolation
);
if (hasInterpolations || path.node.children[0].value === '"') {
return path.map(print, "children");
if (path.node.children.length > 0) {
return path.map(
child =>
child.node.type === SyntaxType.BinaryExpression ||
child.node.type === SyntaxType.TernaryExpression
? group([indent([softline, print(child)]), softline])
: print(child),
"children"
);
}

return printTextBlock(
join(hardline, textBlockContents(path.node).split("\n"))
);
},

string_fragment: printValue,
multiline_string_fragment: printValue,

string_interpolation(path, print) {
const expressionType = path.node.namedChildren[0].type;
const expression = path.call(print, "namedChildren", 0);
if (path.node.value.startsWith('"""')) {
return printTextBlock(
join(hardline, textBlockContents(path.node).split("\n"))
);
}

return expressionType === SyntaxType.BinaryExpression ||
expressionType === SyntaxType.TernaryExpression
? group(["\\{", indent([softline, expression]), softline, "}"])
: ["\\{", expression, "}"];
return path.node.value;
},

escape_sequence: printValue,
string_template_begin: printValue,
string_template_mid: printValue,
string_template_end: printValue,
text_block_template_begin: printValue,
text_block_template_mid: printValue,
text_block_template_end: printValue,
character_literal: printValue,
binary_integer_literal: printValue,
decimal_integer_literal: printValue,
Expand Down
18 changes: 18 additions & 0 deletions test/unit-test/text-blocks/_input.java
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,22 @@ void unsupported() {
function f(){let i=0;}
""";
}

void comments() {
"""
/* a "b" c */
x""";

"""
// a "b
x""";

"""
/* a \\n b */
x""";

"""
// a \\ b
x""";
}
}
Loading
Loading