chore: flatten repo and update changelog

Author: jtkiesel

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,15 +4,16 @@
 
 ## Example
 
+### Input
+
 ```java
-// Input
 
-// Output
+```
+
+### Output
+
+```java
 
 ```
 
 ## Relative issues or prs:
-
-<!--
-Please also reference the issue number in a commit message to [automatically close the related Github issue](https://help.github.com/articles/closing-issues-via-commit-messages/)
--->

.github/workflows/binaries.yml

@@ -22,14 +22,6 @@ jobs:
           sudo apt update
           sudo apt install jq
           npm i -g pkg
-      - name: Installing/Linking dependencies
-        run: |
-          cd $GITHUB_WORKSPACE/prettier-java/packages/java-parser
-          npm i
-          npm link
-          cd $GITHUB_WORKSPACE/prettier-java/packages/prettier-plugin-java
-          npm i
-          npm link java-parser
       - name: Checkout Prettier
         uses: actions/checkout@v2
         with:

.github/workflows/github-ci.yml

@@ -46,6 +46,6 @@ jobs:
       - name: Install dependencies
         run: yarn
       - name: Build prettier-plugin-java
-        run: yarn run build:prettier-plugin-java
+        run: yarn run build
       - name: Run e2e tests
-        run: yarn run test:prettier-plugin-java test:${{ matrix.test_repository }}
+        run: yarn run test:${{ matrix.test_repository }}

.github/workflows/github-pages-deploy.yml

@@ -23,10 +23,10 @@ jobs:
           cache: yarn
 
       - name: Install prettier-plugin-java dependencies
-        working-directory: ./packages/prettier-plugin-java
+        working-directory: .
         run: yarn install --frozen-lockfile
       - name: Build prettier-plugin-java
-        working-directory: ./packages/prettier-plugin-java
+        working-directory: .
         run: yarn build
 
       - name: Install dependencies

.github/workflows/github-pages-test.yml

@@ -23,10 +23,10 @@ jobs:
           cache: yarn
 
       - name: Install prettier-plugin-java dependencies
-        working-directory: ./packages/prettier-plugin-java
+        working-directory: .
         run: yarn install --frozen-lockfile
       - name: Build prettier-plugin-java
-        working-directory: ./packages/prettier-plugin-java
+        working-directory: .
         run: yarn build
 
       - name: Install dependencies

packages/prettier-plugin-java/.gitignore .gitignorepackages/prettier-plugin-java/.gitignore renamed to .gitignore

@@ -10,7 +10,7 @@
 
 # Tests
 /samples
-/test-samples
+/test-samples/**/*
 !/test-samples/.eslintrc.json
 
 # Misc

…kages/prettier-plugin-java/.mocharc.json .mocharc.jsonpackages/prettier-plugin-java/.mocharc.json renamed to .mocharc.json packages/prettier-plugin-java/.mocharc.json renamed to .mocharc.json

@@ -1,10 +1,6 @@
-samples
-lerna.json
-packages/prettier-plugin-java/samples
-packages/prettier-plugin-java/test-samples
-packages/prettier-plugin-java/README.md
-packages/prettier-plugin-java/dist
-CHANGELOG*
-website/build
-website/.docusaurus
 /.nx/workspace-data
+/src/tree-sitter-java.d.ts
+/website/.docusaurus
+/website/build
+/CHANGELOG.md
+/lerna.json

.prettierignore

@@ -1,4 +1,85 @@
-# Latest v2.6.7
+# Latest v2.8.1
+
+## What's Changed
+* fix: indent ternary binary expressions in return statements by @jtkiesel in https://github.com/jhipster/prettier-java/pull/803
+
+**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.8.0...prettier-plugin-java@2.8.1
+
+# v2.8.0
+
+## What's Changed
+* feat: improve class/enum/interface/record clause wrapping/indentation by @jtkiesel in https://github.com/jhipster/prettier-java/pull/783
+* fix: break empty switch/rule, try/catch/finally, and if blocks by @jtkiesel in https://github.com/jhipster/prettier-java/pull/791
+* feat: support `prettier-ignore-start`/`-end` in addition to `@formatter:off`/`:on` by @jtkiesel in https://github.com/jhipster/prettier-java/pull/796
+* fix: improve binary expression assignment breaking by @jtkiesel in https://github.com/jhipster/prettier-java/pull/797
+* fix: proper breaking of parenthesized expressions by @jtkiesel in https://github.com/jhipster/prettier-java/pull/800
+
+**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.7...prettier-plugin-java@2.8.0
+
+# v2.7.7
+
+## What's Changed
+* fix: remove extra indent from ternary/lambda expressions in parentheses by @jtkiesel in https://github.com/jhipster/prettier-java/pull/787
+
+**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.6...prettier-plugin-java@2.7.7
+
+# v2.7.6
+
+## What's Changed
+* fix: indent non-block switch rule bodies with leading comments by @jtkiesel in https://github.com/jhipster/prettier-java/pull/778
+* fix: ternary comment placement and indentation by @jtkiesel in https://github.com/jhipster/prettier-java/pull/780
+* fix: avoid unwrapping empty array initializer with comments by @jtkiesel in https://github.com/jhipster/prettier-java/pull/784
+
+**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.5...prettier-plugin-java@2.7.6
+
+# v2.7.5
+
+## What's Changed
+* fix: eliminate repeated printer function execution from our naively-implemented 'call' helper by @jtkiesel in https://github.com/jhipster/prettier-java/pull/771
+* fix: correct indentation of some method argument lists containing lambda bodies by @jtkiesel in https://github.com/jhipster/prettier-java/pull/772
+* fix: correct indentation of non-root instanceof expressions by @jtkiesel in https://github.com/jhipster/prettier-java/pull/773
+* fix: indent binary expressions in annotation element value or argument lists by @jtkiesel in https://github.com/jhipster/prettier-java/pull/774
+* fix: break nested ternaries together by @jtkiesel in https://github.com/jhipster/prettier-java/pull/775
+
+**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.4...prettier-plugin-java@2.7.5
+
+# v2.7.4
+
+## What's Changed
+* fix: print class type arguments and dots in the proper order by @jtkiesel in https://github.com/jhipster/prettier-java/pull/754
+* fix: revert connection of trailing semicolon to trailingComma option by @jtkiesel in https://github.com/jhipster/prettier-java/pull/755
+
+**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.3...prettier-plugin-java@2.7.4
+
+# v2.7.3
+
+## What's Changed
+* fix: align arrowParens option's default with Prettier by @jtkiesel in https://github.com/jhipster/prettier-java/pull/749
+
+# v2.7.2
+
+## What's Changed
+* docs: Add arrowParens and experimentalOperatorPosition options to plugin and website playground by @jtkiesel in https://github.com/jhipster/prettier-java/pull/743
+* Fix update-test-outputs script to use test-specific prettier options. by @motlin in https://github.com/jhipster/prettier-java/pull/741
+* chore: add packageManager field to package.json for corepack by @mshima in https://github.com/jhipster/prettier-java/pull/744
+* chore: fix generated types by @mshima in https://github.com/jhipster/prettier-java/pull/747
+* chore: run lerna repair by @mshima in https://github.com/jhipster/prettier-java/pull/745
+
+# v2.7.1
+
+## What's Changed
+* feat: support `experimentalOperatorPosition` option (issue #534) by @jtkiesel in #731
+* fix: make formatting of comments on if statements stable (issue #592) by @jtkiesel in #731
+* fix: break nested statements without braces at the top level first (issue #720) by @jtkiesel in #731
+* fix: do not add a blank line at the end of embedded Java (issue #737) by @jtkiesel in #731
+
+# v2.6.8
+
+## What's Changed
+* fix: break hugged lambda body when closing parenthesis wraps by @jtkiesel in https://github.com/jhipster/prettier-java/pull/721
+* fix: limit TypePattern's VariableDeclaratorList to a single VariableDeclarator by @jtkiesel in https://github.com/jhipster/prettier-java/pull/734
+
+# v2.6.7
 
 ## Fixes
 
@@ -15,6 +96,29 @@
 
 - Support dims in record patterns (Issue [#707](https://github.com/jhipster/prettier-java/issues/707) closed by [#708](https://github.com/jhipster/prettier-java/pull/708) by [@clementdessoude](https://github.com/clementdessoude))
 
+# v2.6.5
+
+## Fixes
+
+- Print comment before first binary operator without failing (Issue #685) fixed by #688 by @jtkiesel
+- Add whitespace between label and statement (Issue #686) fixed by #689 by @jtkiesel
+- Break and indent assignments like declarations (Issue #687) fixed by #690 by @jtkiesel
+
+# v2.6.4
+
+## Fixes
+
+- Add es5 as trailingComma option (Issue #652) fixed by #655 by @jtkiesel
+- Add types to exports in package.json (Issue #663) fixed by #664 by @mshima
+- Hug lambdas without blocks (Issue #650) fixed by #653 by @jtkiesel
+- Align with JDK 22 spec (Issue #665) fixed by #666 by @jtkiesel
+
+## Misc
+
+- Update advanced_usage.md with current working configuration for IntelliJ (#669 by @tfield)
+- Update trailingComma option on advanced_usage.md (#451 by @jslivane)
+- Automate GitHub Pages deployment (#672 by @jtkiesel)
+
 # v2.6.0
 
 ## Enhancements

CHANGELOG.md

@@ -1,4 +1,4 @@
-# Contributing to Prettier
+# Contributing to Prettier Java
 
 To get up and running, install the dependencies and run the full build:
 
@@ -13,54 +13,8 @@ You can also inspect the other available dev flows scripts:
 yarn run
 ```
 
-## Linking the java-parser to the printer
-
-If you want to use the main java-parser for the prettier-plugin-java (printer), you will need to link it by running these commands in the root folder:
-
-```bash
-cd packages/java-parser
-yarn link
-cd ../prettier-plugin-java
-yarn link java-parser
-```
-
-To unlink the java-parser, run the following command inside packages/prettier-plugin-java.
-
-```bash
-yarn unlink java-parser
-```
-
 ## Testing your changes
 
-### java-parser
-
-In this section, we suppose you are in the packages/java-parser folder.
-
-When working on the parser, you can test the java-parser inside scripts/single-sample-runner.js. This is a simple way to check the impact of your changes on the built CST.
-You can then print the CST with this code:
-
-```javascript
-console.log(
-  JSON.stringify(
-    resultingCST,
-    (key, value) => (key !== "START_CHARS_HINT" ? value : undefined),
-    2
-  )
-);
-```
-
-You can also run the parser tests with the following command:
-
-```bash
-yarn test
-```
-
-It will basically clone some java repositories and try to parse every java file.
-
-### prettier-java-plugin
-
-In this section, we suppose you are in the packages/prettier-plugin-java folder.
-
 If you would like to check the impact of your changes on a sample code, edit the scripts/single-printer-run/\_input.java file and run
 
 ```bash
@@ -91,7 +45,7 @@ node scripts/update-test-ouput.js
 
 It will simply update all the tests located in test/unit-test folder.
 
-If you would like to run all the prettier-java-plugin tests, simple use the following command:
+If you would like to run all the tests, simple use the following command:
 
 ```bash
 yarn test