prettier-plugin-java 1.3.0 → 1.6.0

package/src/printers/interfaces.js

@@ -1,324 +0,0 @@
-"use strict";
-
-const { line, softline, hardline } = require("prettier").doc.builders;
-const { concat, group, indent } = require("./prettier-builder");
-const { printTokenWithComments } = require("./comments/format-comments");
-const {
-  rejectAndConcat,
-  rejectAndJoin,
-  sortModifiers,
-  rejectAndJoinSeps,
-  getInterfaceBodyDeclarationsSeparator,
-  putIntoBraces,
-  displaySemicolon,
-  isStatementEmptyStatement,
-  printArrayList
-} = require("./printer-utils");
-
-class InterfacesPrettierVisitor {
-  interfaceDeclaration(ctx) {
-    const modifiers = sortModifiers(ctx.interfaceModifier);
-    const firstAnnotations = this.mapVisit(modifiers[0]);
-    const otherModifiers = this.mapVisit(modifiers[1]);
-
-    const declaration = ctx.normalInterfaceDeclaration
-      ? this.visit(ctx.normalInterfaceDeclaration)
-      : this.visit(ctx.annotationTypeDeclaration);
-
-    return rejectAndJoin(hardline, [
-      rejectAndJoin(hardline, firstAnnotations),
-      rejectAndJoin(" ", [rejectAndJoin(" ", otherModifiers), declaration])
-    ]);
-  }
-
-  normalInterfaceDeclaration(ctx) {
-    const typeIdentifier = this.visit(ctx.typeIdentifier);
-    const typeParameters = this.visit(ctx.typeParameters);
-    const extendsInterfaces = this.visit(ctx.extendsInterfaces);
-    const optionalInterfacePermits = this.visit(ctx.interfacePermits);
-    const interfaceBody = this.visit(ctx.interfaceBody);
-
-    let extendsInterfacesPart = "";
-    if (extendsInterfaces) {
-      extendsInterfacesPart = indent(
-        rejectAndConcat([softline, extendsInterfaces])
-      );
-    }
-
-    let interfacePermits = "";
-    if (optionalInterfacePermits) {
-      interfacePermits = indent(
-        rejectAndConcat([softline, optionalInterfacePermits])
-      );
-    }
-
-    return rejectAndJoin(" ", [
-      group(
-        rejectAndJoin(" ", [
-          ctx.Interface[0],
-          concat([typeIdentifier, typeParameters]),
-          extendsInterfacesPart,
-          interfacePermits
-        ])
-      ),
-      interfaceBody
-    ]);
-  }
-
-  interfaceModifier(ctx) {
-    if (ctx.annotation) {
-      return this.visitSingle(ctx);
-    }
-    return printTokenWithComments(this.getSingle(ctx));
-  }
-
-  extendsInterfaces(ctx) {
-    const interfaceTypeList = this.visit(ctx.interfaceTypeList);
-
-    return group(
-      rejectAndConcat([
-        ctx.Extends[0],
-        indent(rejectAndConcat([line, interfaceTypeList]))
-      ])
-    );
-  }
-
-  interfacePermits(ctx) {
-    return this.classPermits(ctx);
-  }
-
-  interfaceBody(ctx) {
-    let joinedInterfaceMemberDeclaration = "";
-
-    if (ctx.interfaceMemberDeclaration !== undefined) {
-      const interfaceMemberDeclaration = this.mapVisit(
-        ctx.interfaceMemberDeclaration
-      );
-
-      const separators = getInterfaceBodyDeclarationsSeparator(
-        ctx.interfaceMemberDeclaration
-      );
-
-      joinedInterfaceMemberDeclaration = rejectAndJoinSeps(
-        separators,
-        interfaceMemberDeclaration
-      );
-    }
-    return putIntoBraces(
-      joinedInterfaceMemberDeclaration,
-      hardline,
-      ctx.LCurly[0],
-      ctx.RCurly[0]
-    );
-  }
-
-  interfaceMemberDeclaration(ctx) {
-    if (ctx.Semicolon) {
-      return displaySemicolon(ctx.Semicolon[0]);
-    }
-    return this.visitSingle(ctx);
-  }
-
-  constantDeclaration(ctx) {
-    const modifiers = sortModifiers(ctx.constantModifier);
-    const firstAnnotations = this.mapVisit(modifiers[0]);
-    const otherModifiers = this.mapVisit(modifiers[1]);
-
-    const unannType = this.visit(ctx.unannType);
-    const variableDeclaratorList = this.visit(ctx.variableDeclaratorList);
-
-    return rejectAndJoin(hardline, [
-      rejectAndJoin(hardline, firstAnnotations),
-      rejectAndJoin(" ", [
-        rejectAndJoin(" ", otherModifiers),
-        unannType,
-        rejectAndConcat([variableDeclaratorList, ctx.Semicolon[0]])
-      ])
-    ]);
-  }
-
-  constantModifier(ctx) {
-    if (ctx.annotation) {
-      return this.visitSingle(ctx);
-    }
-    return printTokenWithComments(this.getSingle(ctx));
-  }
-
-  interfaceMethodDeclaration(ctx) {
-    const modifiers = sortModifiers(ctx.interfaceMethodModifier);
-    const firstAnnotations = this.mapVisit(modifiers[0]);
-    const otherModifiers = this.mapVisit(modifiers[1]);
-
-    const methodHeader = this.visit(ctx.methodHeader);
-    const methodBody = this.visit(ctx.methodBody);
-    const separator = isStatementEmptyStatement(methodBody) ? "" : " ";
-
-    return rejectAndJoin(hardline, [
-      rejectAndJoin(hardline, firstAnnotations),
-      rejectAndJoin(" ", [
-        rejectAndJoin(" ", otherModifiers),
-        rejectAndJoin(separator, [methodHeader, methodBody])
-      ])
-    ]);
-  }
-
-  interfaceMethodModifier(ctx) {
-    if (ctx.annotation) {
-      return this.visitSingle(ctx);
-    }
-    return printTokenWithComments(this.getSingle(ctx));
-  }
-
-  annotationTypeDeclaration(ctx) {
-    const typeIdentifier = this.visit(ctx.typeIdentifier);
-    const annotationTypeBody = this.visit(ctx.annotationTypeBody);
-
-    return rejectAndJoin(" ", [
-      concat([ctx.At[0], ctx.Interface[0]]),
-      typeIdentifier,
-      annotationTypeBody
-    ]);
-  }
-
-  annotationTypeBody(ctx) {
-    const annotationTypeMemberDeclaration = this.mapVisit(
-      ctx.annotationTypeMemberDeclaration
-    );
-
-    return rejectAndJoin(line, [
-      indent(
-        rejectAndJoin(line, [
-          ctx.LCurly[0],
-          rejectAndJoin(concat([line, line]), annotationTypeMemberDeclaration)
-        ])
-      ),
-      ctx.RCurly[0]
-    ]);
-  }
-
-  annotationTypeMemberDeclaration(ctx) {
-    if (ctx.Semicolon) {
-      return printTokenWithComments(this.getSingle(ctx));
-    }
-    return this.visitSingle(ctx);
-  }
-
-  annotationTypeElementDeclaration(ctx) {
-    const modifiers = sortModifiers(ctx.annotationTypeElementModifier);
-    const firstAnnotations = this.mapVisit(modifiers[0]);
-    const otherModifiers = this.mapVisit(modifiers[1]);
-
-    const unannType = this.visit(ctx.unannType);
-    const identifier = ctx.Identifier[0];
-    const dims = this.visit(ctx.dims);
-    const defaultValue = ctx.defaultValue
-      ? concat([" ", this.visit(ctx.defaultValue)])
-      : "";
-
-    return rejectAndJoin(hardline, [
-      rejectAndJoin(hardline, firstAnnotations),
-      rejectAndJoin(" ", [
-        rejectAndJoin(" ", otherModifiers),
-        unannType,
-        rejectAndConcat([
-          identifier,
-          concat([ctx.LBrace[0], ctx.RBrace[0]]),
-          dims,
-          defaultValue,
-          ctx.Semicolon[0]
-        ])
-      ])
-    ]);
-  }
-
-  annotationTypeElementModifier(ctx) {
-    if (ctx.annotation) {
-      return this.visitSingle(ctx);
-    }
-    return printTokenWithComments(this.getSingle(ctx));
-  }
-
-  defaultValue(ctx) {
-    const elementValue = this.visit(ctx.elementValue);
-
-    return rejectAndJoin(" ", [ctx.Default[0], elementValue]);
-  }
-
-  annotation(ctx) {
-    const fqn = this.visit(ctx.typeName);
-
-    let annoArgs = "";
-    if (ctx.LBrace) {
-      if (ctx.elementValuePairList) {
-        annoArgs = putIntoBraces(
-          this.visit(ctx.elementValuePairList),
-          softline,
-          ctx.LBrace[0],
-          ctx.RBrace[0]
-        );
-      } else if (ctx.elementValue) {
-        annoArgs = putIntoBraces(
-          this.visit(ctx.elementValue),
-          softline,
-          ctx.LBrace[0],
-          ctx.RBrace[0]
-        );
-      }
-    }
-
-    return group(rejectAndConcat([ctx.At[0], fqn, annoArgs]));
-  }
-
-  elementValuePairList(ctx) {
-    const elementValuePairs = this.mapVisit(ctx.elementValuePair);
-    const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
-
-    return rejectAndJoinSeps(commas, elementValuePairs);
-  }
-
-  elementValuePair(ctx) {
-    const identifier = ctx.Identifier[0];
-    const elementValue = this.visit(ctx.elementValue);
-
-    return rejectAndJoin(" ", [identifier, ctx.Equals[0], elementValue]);
-  }
-
-  elementValue(ctx) {
-    return this.visitSingle(ctx);
-  }
-
-  elementValueArrayInitializer(ctx) {
-    const elementValueList = this.visit(ctx.elementValueList);
-
-    return printArrayList({
-      list: elementValueList,
-      extraComma: ctx.Comma,
-      LCurly: ctx.LCurly[0],
-      RCurly: ctx.RCurly[0],
-      trailingComma: this.prettierOptions.trailingComma
-    });
-  }
-
-  elementValueList(ctx) {
-    const elementValues = this.mapVisit(ctx.elementValue);
-    const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
-
-    return group(rejectAndConcat([rejectAndJoinSeps(commas, elementValues)]));
-  }
-
-  identifyInterfaceBodyDeclarationType() {
-    return "identifyInterfaceBodyDeclarationType";
-  }
-
-  identifyAnnotationBodyDeclarationType() {
-    return "identifyAnnotationBodyDeclarationType";
-  }
-
-  isSimpleElementValueAnnotation() {
-    return "isSimpleElementValueAnnotation";
-  }
-}
-
-module.exports = {
-  InterfacesPrettierVisitor
-};

package/src/printers/lexical-structure.js

@@ -1,27 +0,0 @@
-"use strict";
-const { printTokenWithComments } = require("./comments/format-comments");
-
-class LexicalStructurePrettierVisitor {
-  literal(ctx) {
-    if (ctx.CharLiteral || ctx.TextBlock || ctx.StringLiteral || ctx.Null) {
-      return printTokenWithComments(this.getSingle(ctx));
-    }
-    return this.visitSingle(ctx);
-  }
-
-  integerLiteral(ctx) {
-    return printTokenWithComments(this.getSingle(ctx));
-  }
-
-  floatingPointLiteral(ctx) {
-    return printTokenWithComments(this.getSingle(ctx));
-  }
-
-  booleanLiteral(ctx) {
-    return printTokenWithComments(this.getSingle(ctx));
-  }
-}
-
-module.exports = {
-  LexicalStructurePrettierVisitor
-};

package/src/printers/names.js

@@ -1,42 +0,0 @@
-"use strict";
-
-const { buildFqn } = require("./printer-utils");
-const { printTokenWithComments } = require("./comments/format-comments");
-
-class NamesPrettierVisitor {
-  typeIdentifier(ctx) {
-    return printTokenWithComments(ctx.Identifier[0]);
-  }
-
-  moduleName(ctx) {
-    return buildFqn(ctx.Identifier, ctx.Dot);
-  }
-
-  packageName(ctx) {
-    return buildFqn(ctx.Identifier, ctx.Dot);
-  }
-
-  typeName(ctx) {
-    return buildFqn(ctx.Identifier, ctx.Dot);
-  }
-
-  expressionName(ctx) {
-    return buildFqn(ctx.Identifier, ctx.Dot);
-  }
-
-  methodName(ctx) {
-    return printTokenWithComments(ctx.Identifier[0]);
-  }
-
-  packageOrTypeName(ctx) {
-    return buildFqn(ctx.Identifier, ctx.Dot);
-  }
-
-  ambiguousName(ctx) {
-    return buildFqn(ctx.Identifier, ctx.Dot);
-  }
-}
-
-module.exports = {
-  NamesPrettierVisitor
-};

package/src/printers/packages-and-modules.js

@@ -1,231 +0,0 @@
-"use strict";
-
-const { line, hardline, indent, group } = require("prettier").doc.builders;
-const { concat, join } = require("./prettier-builder");
-const { printTokenWithComments } = require("./comments/format-comments");
-const {
-  buildFqn,
-  rejectAndJoin,
-  rejectAndConcat,
-  rejectAndJoinSeps,
-  displaySemicolon,
-  putIntoBraces,
-  getBlankLinesSeparator,
-  sortImports
-} = require("./printer-utils");
-
-class PackagesAndModulesPrettierVisitor {
-  compilationUnit(ctx) {
-    const compilationUnit =
-      ctx.ordinaryCompilationUnit || ctx.modularCompilationUnit;
-
-    return concat([this.visit(compilationUnit[0]), line]);
-  }
-
-  ordinaryCompilationUnit(ctx) {
-    const packageDecl = this.visit(ctx.packageDeclaration);
-
-    const sortedImportsDecl = sortImports(ctx.importDeclaration);
-    const nonStaticImports = this.mapVisit(sortedImportsDecl.nonStaticImports);
-    const staticImports = this.mapVisit(sortedImportsDecl.staticImports);
-
-    const typesDecl = this.mapVisit(ctx.typeDeclaration);
-    // TODO: utility to add item+line (or multiple lines) but only if an item exists
-    return rejectAndConcat([
-      rejectAndJoin(concat([hardline, hardline]), [
-        packageDecl,
-        rejectAndJoin(hardline, staticImports),
-        rejectAndJoin(hardline, nonStaticImports),
-        rejectAndJoin(concat([hardline, hardline]), typesDecl)
-      ])
-    ]);
-  }
-
-  modularCompilationUnit(ctx) {
-    const sortedImportsDecl = sortImports(ctx.importDeclaration);
-    const nonStaticImports = this.mapVisit(sortedImportsDecl.nonStaticImports);
-    const staticImports = this.mapVisit(sortedImportsDecl.staticImports);
-
-    const moduleDeclaration = this.visit(ctx.moduleDeclaration);
-
-    return rejectAndConcat([
-      rejectAndJoin(concat([hardline, hardline]), [
-        rejectAndJoin(hardline, staticImports),
-        rejectAndJoin(hardline, nonStaticImports),
-        moduleDeclaration
-      ])
-    ]);
-  }
-
-  packageDeclaration(ctx) {
-    const modifiers = this.mapVisit(ctx.packageModifier);
-    const name = buildFqn(ctx.Identifier, ctx.Dot);
-
-    return rejectAndJoin(hardline, [
-      rejectAndJoin(hardline, modifiers),
-      concat([ctx.Package[0], " ", name, ctx.Semicolon[0]])
-    ]);
-  }
-
-  packageModifier(ctx) {
-    return this.visitSingle(ctx);
-  }
-
-  importDeclaration(ctx) {
-    if (ctx.emptyStatement !== undefined) {
-      return this.visit(ctx.emptyStatement);
-    }
-
-    const optionalStatic = ctx.Static ? ctx.Static[0] : "";
-    const packageOrTypeName = this.visit(ctx.packageOrTypeName);
-
-    const optionalDotStar = ctx.Dot ? concat([ctx.Dot[0], ctx.Star[0]]) : "";
-
-    return rejectAndJoin(" ", [
-      ctx.Import[0],
-      optionalStatic,
-      rejectAndConcat([packageOrTypeName, optionalDotStar, ctx.Semicolon[0]])
-    ]);
-  }
-
-  typeDeclaration(ctx) {
-    if (ctx.Semicolon) {
-      return displaySemicolon(ctx.Semicolon[0]);
-    }
-    return this.visitSingle(ctx);
-  }
-
-  moduleDeclaration(ctx) {
-    const annotations = this.mapVisit(ctx.annotation);
-    const optionalOpen = ctx.Open ? ctx.Open[0] : "";
-    const name = buildFqn(ctx.Identifier, ctx.Dot);
-    const moduleDirectives = this.mapVisit(ctx.moduleDirective);
-
-    const content = rejectAndJoinSeps(
-      getBlankLinesSeparator(ctx.moduleDirective),
-      moduleDirectives
-    );
-
-    return rejectAndJoin(" ", [
-      join(" ", annotations),
-      optionalOpen,
-      ctx.Module[0],
-      name,
-      putIntoBraces(content, hardline, ctx.LCurly[0], ctx.RCurly[0])
-    ]);
-  }
-
-  moduleDirective(ctx) {
-    return this.visitSingle(ctx);
-  }
-
-  requiresModuleDirective(ctx) {
-    const modifiers = this.mapVisit(ctx.requiresModifier);
-    const moduleName = this.visit(ctx.moduleName);
-
-    return rejectAndJoin(" ", [
-      ctx.Requires[0],
-      join(" ", modifiers),
-      concat([moduleName, ctx.Semicolon[0]])
-    ]);
-  }
-
-  exportsModuleDirective(ctx) {
-    const packageName = this.visit(ctx.packageName);
-    const to = ctx.To ? ctx.To[0] : "";
-    const moduleNames = this.mapVisit(ctx.moduleName);
-    const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
-
-    return group(
-      rejectAndConcat([
-        indent(
-          rejectAndJoin(line, [
-            rejectAndJoin(" ", [ctx.Exports[0], packageName]),
-            group(
-              indent(
-                rejectAndJoin(line, [
-                  to,
-                  rejectAndJoinSeps(commas, moduleNames)
-                ])
-              )
-            )
-          ])
-        ),
-        ctx.Semicolon[0]
-      ])
-    );
-  }
-
-  opensModuleDirective(ctx) {
-    const packageName = this.visit(ctx.packageName);
-    const to = ctx.To ? ctx.To[0] : "";
-    const moduleNames = this.mapVisit(ctx.moduleName);
-    const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
-
-    return group(
-      rejectAndConcat([
-        indent(
-          rejectAndJoin(line, [
-            rejectAndJoin(" ", [ctx.Opens[0], packageName]),
-            group(
-              indent(
-                rejectAndJoin(line, [
-                  to,
-                  rejectAndJoinSeps(commas, moduleNames)
-                ])
-              )
-            )
-          ])
-        ),
-        ctx.Semicolon[0]
-      ])
-    );
-  }
-
-  usesModuleDirective(ctx) {
-    const typeName = this.visit(ctx.typeName);
-
-    return rejectAndConcat([
-      concat([ctx.Uses[0], " "]),
-      typeName,
-      ctx.Semicolon[0]
-    ]);
-  }
-
-  providesModuleDirective(ctx) {
-    const firstTypeName = this.visit(ctx.typeName[0]);
-    const otherTypeNames = this.mapVisit(ctx.typeName.slice(1));
-    const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
-
-    return group(
-      rejectAndConcat([
-        indent(
-          rejectAndJoin(line, [
-            rejectAndJoin(" ", [ctx.Provides[0], firstTypeName]),
-            group(
-              indent(
-                rejectAndJoin(line, [
-                  ctx.With[0],
-                  rejectAndJoinSeps(commas, otherTypeNames)
-                ])
-              )
-            )
-          ])
-        ),
-        ctx.Semicolon[0]
-      ])
-    );
-  }
-
-  requiresModifier(ctx) {
-    return printTokenWithComments(this.getSingle(ctx));
-  }
-
-  isModuleCompilationUnit() {
-    return "isModuleCompilationUnit";
-  }
-}
-
-module.exports = {
-  PackagesAndModulesPrettierVisitor
-};

package/src/printers/prettier-builder.js

@@ -1,60 +0,0 @@
-"use strict";
-const prettier = require("prettier").doc.builders;
-
-const { processComments } = require("./comments/format-comments");
-
-/*
- * ------------------------------------------------------------------
- * Wraps the Prettier builder functions to print tokens with comments
- * ------------------------------------------------------------------
- */
-
-function concat(docs) {
-  const concatenation = prettier.concat(processComments(docs));
-  return concatenation.parts.length === 0 ? "" : concatenation;
-}
-
-function join(sep, docs) {
-  const concatenation = prettier.join(
-    processComments(sep),
-    processComments(docs)
-  );
-  return concatenation.parts.length === 0 ? "" : concatenation;
-}
-
-function group(doc, opts) {
-  const group = prettier.group(processComments(doc), opts);
-  return group.contents === undefined ? "" : group;
-}
-
-function fill(docs) {
-  const fill = prettier.fill(processComments(docs));
-  return fill.parts.length === 0 ? "" : fill;
-}
-
-function indent(doc) {
-  const indentedDoc = prettier.indent(processComments(doc));
-  return indentedDoc.contents.length === 0 ? "" : indentedDoc;
-}
-
-function dedent(doc) {
-  const indentedDoc = prettier.dedent(processComments(doc));
-  return indentedDoc.contents.length === 0 ? "" : indentedDoc;
-}
-
-function ifBreak(breakContents, flatContents) {
-  return prettier.ifBreak(
-    processComments(breakContents),
-    processComments(flatContents)
-  );
-}
-
-module.exports = {
-  concat,
-  join,
-  group,
-  fill,
-  indent,
-  dedent,
-  ifBreak
-};