Revert "Describe 2.98.0.2: one style, exit code 2 and a Windows binary"

This reverts commit c3e740b. It was meant for a branch that waits for the release, and reached main by mistake: 2.98.0.2 is not published yet, so the site would tell users of 2.98.0.1 to run the formatter without --ojf, which formats in Google style, and would link to downloads that do not exist yet. It goes back in once 2.98.0.2 is out.

Author: abashev

docs/ai-agents.md

@@ -81,7 +81,7 @@ and [`jq`](https://jqlang.org/), which takes the path of the file out of that JS
         "hooks": [
           {
             "type": "command",
-            "command": "open-java-format --skip-removing-unused-imports --replace \"$(jq -r '.tool_input.file_path')\""
+            "command": "open-java-format --ojf --skip-removing-unused-imports --replace \"$(jq -r '.tool_input.file_path')\" || exit 2"
           }
         ]
       }
@@ -102,8 +102,8 @@ it in the next. A full format after the first edit would delete that import, so
 imports that really are unused.
 
 **A file that does not parse goes back to the agent.** The formatter leaves the file as it is,
-prints the error and exits with 2, the exit code that makes Claude Code show a hook's message to
-the model, so Claude sees it right after its edit:
+prints the error and exits with 1. `|| exit 2` turns that into 2, the exit code that makes Claude
+Code show a hook's message to the model, so Claude sees it right after its edit:
 
 ``` text
 src/main/java/com/example/Broken.java:5:22: error: ';' expected
@@ -128,13 +128,13 @@ for coding agents. Add a section that matches how the project runs the formatter
     After you create or edit a `.java` file, format it:
 
     ```sh
-    open-java-format --replace path/to/File.java
+    open-java-format --ojf --replace path/to/File.java
     ```
 
     Before you commit, run this check. It must print nothing, so format every file it lists:
 
     ```sh
-    open-java-format --dry-run --set-exit-if-changed $(git ls-files '*.java')
+    open-java-format --ojf --dry-run --set-exit-if-changed $(git ls-files '*.java')
     ```
     ````
 

docs/get-started/command-line.md

@@ -14,20 +14,18 @@ Pick the file for your platform from the
 | Linux AArch64, glibc | `open-java-format-linux-glibc_aarch64` |
 | macOS, Apple silicon | `open-java-format-macos_aarch64` |
 | macOS, Intel | `open-java-format-macos_x86-64` |
-| Windows, x86-64 | `open-java-format-windows_x86-64.exe` |
 | Anything else with Java 21 or later | `open-java-format-{{ ojf_version }}-all.jar` |
 
-There is no native binary for Windows on ARM or for musl-based Linux such as Alpine. Use the jar
-there.
+There is no native binary for Windows or for musl-based Linux such as Alpine. Use the jar there.
 
 ``` sh title="Native binary, here for Apple silicon"
 curl -LO https://github.com/openjavaformat/open-java-format/releases/download/{{ ojf_version }}/open-java-format-macos_aarch64
 chmod +x open-java-format-macos_aarch64
 ./open-java-format-macos_aarch64 --version
 ```
 
-Rename the file to `open-java-format`, or `open-java-format.exe` on Windows, and move it to a
-directory on your `PATH`. The examples below assume you did.
+Rename the file to `open-java-format` and move it to a directory on your `PATH`. The examples below
+assume you did.
 
 !!! note "macOS and files downloaded with a browser"
 
@@ -61,32 +59,33 @@ Every release has a `checksums_sha256.txt`. Download it next to your file and ch
 
 ## Format and check
 
-There is one style, so no flag chooses it. Version 2.98.0.1 needed `--ojf`: later versions still
-accept it, print a warning and format as usual, so drop it from your scripts.
+Pass `--ojf` every time. Without a style flag the formatter uses Google Java Style, and the old
+`--palantir` flag is no longer accepted.
 
 ``` sh title="Format files in place"
-open-java-format --replace src/main/java/com/example/Hello.java
+open-java-format --ojf --replace src/main/java/com/example/Hello.java
 ```
 
 ``` sh title="Format every tracked Java file"
-open-java-format --replace $(git ls-files '*.java')
+open-java-format --ojf --replace $(git ls-files '*.java')
 ```
 
 ``` sh title="Check without changing anything"
-open-java-format --dry-run --set-exit-if-changed $(git ls-files '*.java')
+open-java-format --ojf --dry-run --set-exit-if-changed $(git ls-files '*.java')
 ```
 
 The check prints the files that would change and exits with 1 if there are any, which is what a CI
 step needs.
 
 ``` sh title="Format standard input"
-cat Hello.java | open-java-format -
+cat Hello.java | open-java-format --ojf -
 ```
 
 ## Options
 
 | Option | What it does |
 | --- | --- |
+| `--ojf` | Use the open-java-format style: 120 columns, 4-space indents |
 | `--replace`, `-i` | Write the result back to the files instead of printing it |
 | `--dry-run`, `-n` | Print the files that would change, change nothing |
 | `--set-exit-if-changed` | Exit with 1 if anything would change |
@@ -98,14 +97,3 @@ cat Hello.java | open-java-format -
 | `--skip-reflowing-long-strings` | Do not rewrap string literals that pass the column limit |
 | `@file` | Read options and file names from a file |
 | `--version`, `--help` | Print the version, or every option |
-
-## Exit codes
-
-| Code | Meaning |
-| --- | --- |
-| 0 | Every file was formatted or checked without a problem |
-| 1 | With `--set-exit-if-changed`: a file is not formatted |
-| 2 | A file could not be read, parsed or written, or an option is wrong. The reason is on standard error |
-
-A file that does not parse is left as it is. When a run hits both, a file that is not formatted and
-one it cannot format, the exit code is 2.

docs/get-started/github-actions.md

@@ -1,7 +1,7 @@
 # GitHub Action and pre-commit
 
 Both checks run the native binary, so they need no Java, Maven or Gradle. They work on Linux with
-glibc and on macOS, and stop with an error on Windows and on musl-based Linux such as Alpine.
+glibc and on macOS. There is no native binary for Windows or for musl-based Linux such as Alpine.
 
 ## Check pull requests and pushes
 
@@ -41,7 +41,7 @@ Run the formatter locally with the same version, then commit the result. See
 [Command line](command-line.md) for the download.
 
 ``` sh
-open-java-format --replace path/to/File.java
+open-java-format --ojf --replace path/to/File.java
 ```
 
 ## Exclude files

docs/get-started/index.md

@@ -27,8 +27,8 @@ the same formatter, so they all produce the same files. Set up the ones your pro
 
     ---
 
-    A native binary for Linux, macOS and Windows, or a runnable jar anywhere else. Formats files in
-    place or checks them.
+    A native binary for Linux and macOS, or a runnable jar anywhere else. Formats files in place or
+    checks them.
 
 -   :simple-intellijidea:{ .lg .middle } __[IntelliJ IDEA](intellij-idea.md)__
 

docs/index.md

@@ -122,14 +122,14 @@ a native binary on Linux and macOS. For Windows and for multi-project builds see
 ### On the command line
 
 Every [release](https://github.com/openjavaformat/open-java-format/releases/latest) carries native
-binaries for Linux, macOS and Windows, and a runnable jar for Java 21 or later.
+binaries for Linux and macOS, and a runnable jar for Java 21 or later.
 
 ``` sh title="Format files in place"
-open-java-format --replace src/main/java/com/example/Hello.java
+open-java-format --ojf --replace src/main/java/com/example/Hello.java
 ```
 
 ``` sh title="Fail when anything is not formatted"
-open-java-format --dry-run --set-exit-if-changed $(git ls-files '*.java')
+open-java-format --ojf --dry-run --set-exit-if-changed $(git ls-files '*.java')
 ```
 
 Downloads, checksums and every option are on the [Command line](get-started/command-line.md) page.

docs/migrate.md

@@ -16,7 +16,7 @@ The Java packages are unchanged as well. Only the names in your build and your s
 | SPI | `palantir-java-format-spi` | `open-java-format-spi` |
 | Gradle plugin | `com.palantir.java-format` | `dev.openjavaformat.java-format` |
 | Gradle property | `palantir.native.formatter` | `openjavaformat.native.formatter` |
-| Command-line style flag | `--palantir` | none: there is one style |
+| Command-line style flag | `--palantir` | `--ojf` |
 | Style in the API | `PALANTIR` | `OJF` |
 | IntelliJ plugin | `palantir-java-format` | `open-java-format` |
 | Java packages | `com.palantir.javaformat.*` | the same, for the whole 2.x line |
@@ -43,14 +43,15 @@ settings and multi-project builds.
 
 ### Command line and scripts
 
-Remove `--palantir`: there is one style, so no flag chooses it. Take the binary or the jar from
+Replace `--palantir` with `--ojf`, and take the binary or the jar from
 [our releases](get-started/command-line.md).
 
-!!! note "A leftover flag fails the run"
+!!! warning "The old flag does not fail"
 
-    An unknown flag such as `--palantir` stops the formatter with exit code 2, so a CI step that
-    still passes it fails instead of going green. Version 2.98.0.1 printed its usage text there and
-    exited with 0, without checking anything.
+    `--palantir` is no longer accepted, but it is not an error either: the formatter prints
+    `unexpected flag: --palantir` with its usage text and exits with 0. A CI step that still passes
+    the old flag would go green without checking anything. Search your scripts and workflows for
+    it.
 
 ### Libraries that call the formatter
 
@@ -94,7 +95,7 @@ the same method in both styles.
 2. Format everything once and commit only that:
 
     ``` sh
-    open-java-format --replace $(git ls-files '*.java')
+    open-java-format --ojf --replace $(git ls-files '*.java')
     git commit -am "Reformat with open-java-format"
     ```
 

zensical.toml

@@ -105,7 +105,7 @@ toggle.name = "Switch to system preference"
 # plugin puts it in before the Markdown is rendered, so it lands in code blocks too. The key is not
 # extra.version: the theme reads that one as the switch for a version selector.
 [project.extra]
-ojf_version = "2.98.0.2"
+ojf_version = "2.98.0.1"
 
 # Renders every page as a Jinja template, for {{ ojf_version }}. A misspelt variable or a stray {{
 # fails the build instead of leaving a gap or the raw text on the site.