prettier-plugin-java 1.6.2 → 2.1.0

package/dist/test/unit-test/snippets/types-values-and-variables/wildcard/test.spec.js

@@ -0,0 +1,112 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var base_cst_printer_1 = require("../../../../../src/base-cst-printer");
+var sinon_1 = require("sinon");
+var test_utils_1 = require("../../../../test-utils");
+describe("Wildcard", function () {
+    var wildcardBoundsSpy;
+    // eslint-disable-next-line no-undef
+    beforeEach(function () {
+        if (wildcardBoundsSpy !== undefined) {
+            wildcardBoundsSpy.restore();
+        }
+        wildcardBoundsSpy = sinon_1.spy(base_cst_printer_1.BaseCstPrettierPrinter.prototype, "wildcardBounds");
+    });
+    it("can format a wildcard", function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, test_utils_1.expectSnippetToBeFormatted({
+                        snippet: "?",
+                        expectedOutput: "?",
+                        entryPoint: "wildcard"
+                    })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("can format a wildcard with one annotations", function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, test_utils_1.expectSnippetToBeFormatted({
+                        snippet: "@Anno ?",
+                        expectedOutput: "@Anno ?",
+                        entryPoint: "wildcard"
+                    })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("can format a wildcard with annotations that exceed printWidth ", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var snippet, expectedOutput;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    snippet = "@Annotation1 @Annotation2 @Annotation3 @Annotation4 @Annotation5 @Annotation6 @Annotation7 ?";
+                    expectedOutput = "@Annotation1 @Annotation2 @Annotation3 @Annotation4 @Annotation5 @Annotation6 @Annotation7 ?";
+                    return [4 /*yield*/, test_utils_1.expectSnippetToBeFormatted({
+                            snippet: snippet,
+                            expectedOutput: expectedOutput,
+                            entryPoint: "wildcard"
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("can format a wildcard with wildcardBound", function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, test_utils_1.expectSnippetToBeFormatted({
+                        snippet: "? extends int[]",
+                        expectedOutput: "? extends int[]",
+                        entryPoint: "wildcard"
+                    })];
+                case 1:
+                    _a.sent();
+                    sinon_1.assert.calledTwice(wildcardBoundsSpy);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/dist/test/unit-test/snippets/types-values-and-variables/wildcardBounds/test.spec.js

@@ -0,0 +1,81 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var base_cst_printer_1 = require("../../../../../src/base-cst-printer");
+var sinon_1 = require("sinon");
+var test_utils_1 = require("../../../../test-utils");
+describe("Wildcard Bounds", function () {
+    var referenceTypeSpy;
+    // eslint-disable-next-line no-undef
+    beforeEach(function () {
+        if (referenceTypeSpy !== undefined) {
+            referenceTypeSpy.restore();
+        }
+        referenceTypeSpy = sinon_1.spy(base_cst_printer_1.BaseCstPrettierPrinter.prototype, "referenceType");
+    });
+    it("can format a wildcardBounds with extends", function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, test_utils_1.expectSnippetToBeFormatted({
+                        snippet: "extends int[]",
+                        expectedOutput: "extends int[]",
+                        entryPoint: "wildcardBounds"
+                    })];
+                case 1:
+                    _a.sent();
+                    sinon_1.assert.callCount(referenceTypeSpy, 2);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("can format a wildcardBounds with super", function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, test_utils_1.expectSnippetToBeFormatted({
+                        snippet: "super int[]",
+                        expectedOutput: "super int[]",
+                        entryPoint: "wildcardBounds"
+                    })];
+                case 1:
+                    _a.sent();
+                    sinon_1.assert.callCount(referenceTypeSpy, 2);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/dist/test/unit-test/switch/switch-spec.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var test_utils_1 = require("../../test-utils");
+describe("prettier-java: switch", function () {
+    test_utils_1.testSample(__dirname);
+});

package/dist/test/unit-test/synchronized/synchronized-spec.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var test_utils_1 = require("../../test-utils");
+describe("prettier-java: synchronized", function () {
+    test_utils_1.testSample(__dirname);
+});

package/dist/test/unit-test/text-blocks/text-block-spec.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var test_utils_1 = require("../../test-utils");
+describe("prettier-java: Text Blocks", function () {
+    test_utils_1.testSample(__dirname);
+});

package/dist/test/unit-test/throws/throws-spec.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var test_utils_1 = require("../../test-utils");
+describe("prettier-java: throws", function () {
+    test_utils_1.testSample(__dirname);
+});

package/dist/test/unit-test/try_catch/try_catch-spec.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var test_utils_1 = require("../../test-utils");
+describe("prettier-java: try catch", function () {
+    test_utils_1.testSample(__dirname);
+});

package/dist/test/unit-test/types/types-spec.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var test_utils_1 = require("../../test-utils");
+describe("prettier-java: types", function () {
+    test_utils_1.testSample(__dirname);
+});

package/dist/test/unit-test/variables/variables-spec.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var test_utils_1 = require("../../test-utils");
+describe("prettier-java: variables", function () {
+    test_utils_1.testSample(__dirname);
+});

package/dist/test/unit-test/while/while-spec.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var test_utils_1 = require("../../test-utils");
+describe("prettier-java: while", function () {
+    test_utils_1.testSample(__dirname);
+});

package/dist/test/unit-test/yield-statement/yield-statement-spec.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var test_utils_1 = require("../../test-utils");
+describe("prettier-java: yield statement", function () {
+    test_utils_1.testSample(__dirname);
+});

package/dist/utils/index.js

@@ -3,8 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printSingleLambdaInvocation = exports.printArgumentListWithBraces = void 0;
+exports.isEmptyDoc = exports.printSingleLambdaInvocation = exports.printArgumentListWithBraces = void 0;
 var printArgumentListWithBraces_1 = require("./printArgumentListWithBraces");
 Object.defineProperty(exports, "printArgumentListWithBraces", { enumerable: true, get: function () { return __importDefault(printArgumentListWithBraces_1).default; } });
 var printSingleLambdaInvocation_1 = require("./printSingleLambdaInvocation");
 Object.defineProperty(exports, "printSingleLambdaInvocation", { enumerable: true, get: function () { return __importDefault(printSingleLambdaInvocation_1).default; } });
+var isEmptyDoc_1 = require("./isEmptyDoc");
+Object.defineProperty(exports, "isEmptyDoc", { enumerable: true, get: function () { return __importDefault(isEmptyDoc_1).default; } });

package/dist/utils/isEmptyDoc.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var isEmptyDoc = function (argument) {
+    return argument === "" || (Array.isArray(argument) && argument.length) === 0;
+};
+exports.default = isEmptyDoc;

package/dist/utils/printArgumentListWithBraces.js

@@ -9,13 +9,13 @@ var printer_utils_1 = require("../printers/printer-utils");
 var printSingleLambdaInvocation_1 = __importDefault(require("./printSingleLambdaInvocation"));
 var softline = doc_1.builders.softline;
 function printArgumentListWithBraces(argumentListCtx, rBrace, lBrace) {
-    var isSingleLambda = expressions_utils_1.isArgumentListSingleLambda(argumentListCtx);
+    var isSingleLambda = (0, expressions_utils_1.isArgumentListSingleLambda)(argumentListCtx);
     if (isSingleLambda) {
         return printSingleLambdaInvocation_1.default.call(this, argumentListCtx, rBrace, lBrace);
     }
     var argumentList = this.visit(argumentListCtx, {
         isInsideMethodInvocationSuffix: true
     });
-    return printer_utils_1.putIntoBraces(argumentList, softline, lBrace, rBrace);
+    return (0, printer_utils_1.putIntoBraces)(argumentList, softline, lBrace, rBrace);
 }
 exports.default = printArgumentListWithBraces;

package/dist/utils/printSingleLambdaInvocation.js

@@ -12,9 +12,9 @@ function printSingleLambdaInvocation(argumentListCtx, rBrace, lBrace) {
         lambdaParametersGroupId: lambdaParametersGroupId,
         isInsideMethodInvocationSuffix: true
     });
-    var formattedRBrace = expressions_utils_1.isSingleArgumentLambdaExpressionWithBlock(argumentListCtx)
-        ? ifBreak(prettier_builder_1.indent(prettier_builder_1.concat([softline, rBrace])), format_comments_1.printTokenWithComments(rBrace), { groupId: lambdaParametersGroupId })
-        : prettier_builder_1.indent(prettier_builder_1.concat([softline, rBrace]));
-    return prettier_builder_1.dedent(printer_utils_1.putIntoBraces(argumentList, "", lBrace, formattedRBrace));
+    var formattedRBrace = (0, expressions_utils_1.isSingleArgumentLambdaExpressionWithBlock)(argumentListCtx)
+        ? ifBreak((0, prettier_builder_1.indent)((0, prettier_builder_1.concat)([softline, rBrace])), (0, format_comments_1.printTokenWithComments)(rBrace), { groupId: lambdaParametersGroupId })
+        : (0, prettier_builder_1.indent)((0, prettier_builder_1.concat)([softline, rBrace]));
+    return (0, prettier_builder_1.dedent)((0, printer_utils_1.putIntoBraces)(argumentList, "", lBrace, formattedRBrace));
 }
 exports.default = printSingleLambdaInvocation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-java",
-  "version": "1.6.2",
+  "version": "2.1.0",
   "description": "Prettier Java Plugin",
   "main": "dist/index.js",
   "files": [
@@ -9,38 +9,38 @@
   "repository": "https://github.com/jhipster/prettier-java",
   "license": "Apache-2.0",
   "dependencies": {
-    "java-parser": "2.0.2",
+    "java-parser": "2.0.4",
     "lodash": "4.17.21",
-    "prettier": "2.3.1"
+    "prettier": "2.8.4"
   },
   "scripts": {
-    "test": "npm-run-all test:unit test:e2e-core",
+    "test": "yarn run test:unit && yarn run test:e2e-core",
     "test:unit": "mocha \"test/unit-test/**/*.spec.ts\" \"test/unit-test/**/*-spec.ts\"",
     "test:e2e-core": "node scripts/clone-samples e2e-core && mocha \"test/repository-test/core-test.ts\"",
     "test:e2e-jhipster1": "node scripts/clone-samples e2e-jhipster1 && mocha \"test/repository-test/jhipster-1-test.ts\"",
     "test:e2e-jhipster2": "node scripts/clone-samples e2e-jhipster2 && mocha \"test/repository-test/jhipster-2-test.ts\"",
-    "test:all": "npm-run-all test test:e2e-jhipster1 test:e2e-jhipster2",
+    "test:all": "yarn run test && yarn run test:e2e-jhipster1 && yarn run test:e2e-jhipster2",
     "clone-samples": "node scripts/clone-samples.js",
     "build": "tsc -p tsconfig.build.json --outDir dist",
-    "build:watch": "tsc -p tsconfig.build.json --outDir dist -w"
+    "build:watch": "tsc -p tsconfig.build.json --inlineSourceMap --outDir dist -w"
   },
   "devDependencies": {
-    "@babel/cli": "7.14.8",
-    "@babel/core": "7.15.0",
-    "@babel/preset-env": "7.15.0",
-    "@babel/preset-typescript": "7.15.0",
-    "@babel/register": "7.15.3",
+    "@babel/cli": "7.19.3",
+    "@babel/core": "7.20.2",
+    "@babel/preset-env": "7.20.2",
+    "@babel/preset-typescript": "7.18.6",
+    "@babel/register": "7.18.9",
     "@chevrotain/types": "9.0.2",
-    "@types/chai": "4.2.21",
-    "@types/fs-extra": "9.0.12",
-    "@types/jest": "27.0.1",
+    "@types/chai": "4.3.4",
+    "@types/fs-extra": "9.0.13",
+    "@types/jest": "29.2.3",
     "@types/klaw-sync": "6.0.1",
-    "@types/lodash": "4.14.172",
-    "@types/node": "16.7.1",
-    "@types/prettier": "2.3.1",
-    "@types/sinon": "10.0.2",
-    "ts-node": "10.2.1",
-    "typescript": "4.3.5"
+    "@types/lodash": "4.14.190",
+    "@types/node": "18.11.9",
+    "@types/prettier": "2.7.1",
+    "@types/sinon": "10.0.13",
+    "ts-node": "10.9.1",
+    "typescript": "4.9.3"
   },
-  "gitHead": "2e731c6dcec31dc9e58ec1721eef821f7fc031ee"
+  "gitHead": "28084f4c2c6b53784c5853fc51865dc8c7b083f9"
 }

package/dist/utils/constants.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.whitespace = void 0;
-exports.whitespace = " ";