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
20 changes: 20 additions & 0 deletions packages/prettier-plugin-java/src/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,16 @@ export default {
description:
"Prettify from the entrypoint, allowing to use prettier on snippet."
},
arrowParens: {
type: "choice",
category: "Java",
default: "avoid",
choices: [
{ value: "always", description: "" },
{ value: "avoid", description: "" }
],
description: "Include parentheses around a sole arrow function parameter."
},
trailingComma: {
type: "choice",
category: "Java",
Expand All @@ -263,5 +273,15 @@ export default {
{ value: "none", description: "" }
],
description: "Print trailing commas wherever possible when multi-line."
},
experimentalOperatorPosition: {
type: "choice",
category: "Java",
default: "end",
choices: [
{ value: "start", description: "" },
{ value: "end", description: "" }
],
description: "Where to print operators when binary expressions wrap lines."
}
} satisfies SupportOptions;
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@monaco-editor/react": "^4",
"lz-string": "^1",
"prettier": "^3",
"prettier-plugin-java": "file:./../packages/prettier-plugin-java/dist",
"prettier-plugin-java": "file:../packages/prettier-plugin-java/dist",
"prism-react-renderer": "^2",
"react": "^19",
"react-dom": "^19"
Expand Down
4 changes: 2 additions & 2 deletions website/src/components/CodeEditor/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useColorMode } from "@docusaurus/theme-common";
import Editor from "@monaco-editor/react";
import { Editor, type OnChange } from "@monaco-editor/react";
import styles from "./index.module.css";

export default function CodeEditor(
props: Readonly<{
readOnly?: boolean;
rulers?: number[];
value?: string;
onChange?: (value: string | undefined) => void;
onChange?: OnChange;
}>
) {
const { colorMode } = useColorMode();
Expand Down
65 changes: 63 additions & 2 deletions website/src/pages/playground/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,29 @@ interface State {
printWidth?: number;
tabWidth?: number;
useTabs?: boolean;
arrowParens?: ArrowParens;
trailingComma?: TrailingComma;
experimentalOperatorPosition?: ExperimentalOperatorPosition;
requirePragma?: boolean;
code?: string;
}

enum ArrowParens {
Always = "always",
Avoid = "avoid"
}

enum TrailingComma {
All = "all",
Es5 = "es5",
None = "none"
}

enum ExperimentalOperatorPosition {
Start = "start",
End = "end"
}

const codeSample = `public interface MyInterface {
String foo();
int[] bar();
Expand Down Expand Up @@ -63,9 +75,17 @@ function Inner() {
const [printWidth, setPrintWidth] = useState(initialState.printWidth ?? 80);
const [tabWidth, setTabWidth] = useState(initialState.tabWidth ?? 2);
const [useTabs, setUseTabs] = useState(initialState.useTabs ?? false);
const [trailingComma, setTrailingComma] = useState<TrailingComma>(
const [arrowParens, setArrowParens] = useState(
initialState.arrowParens ?? ArrowParens.Avoid
);
const [trailingComma, setTrailingComma] = useState(
initialState.trailingComma ?? TrailingComma.All
);
const [experimentalOperatorPosition, setExperimentalOperatorPosition] =
useState(
initialState.experimentalOperatorPosition ??
ExperimentalOperatorPosition.End
);
const [requirePragma, setRequirePragma] = useState(
initialState.requirePragma ?? false
);
Expand All @@ -82,7 +102,9 @@ function Inner() {
printWidth,
tabWidth,
useTabs,
arrowParens,
trailingComma,
experimentalOperatorPosition,
requirePragma,
code
});
Expand All @@ -96,12 +118,23 @@ function Inner() {
printWidth,
tabWidth,
useTabs,
arrowParens,
trailingComma,
experimentalOperatorPosition,
requirePragma
})
.then(setFormattedCode)
.catch(error => setFormattedCode(error.message));
}, [printWidth, tabWidth, useTabs, trailingComma, requirePragma, code]);
}, [
printWidth,
tabWidth,
useTabs,
arrowParens,
trailingComma,
experimentalOperatorPosition,
requirePragma,
code
]);

return (
<div className={styles.playground}>
Expand Down Expand Up @@ -137,6 +170,19 @@ function Inner() {
</details>
<details open>
<summary>Java</summary>
<label title="Include parentheses around a sole arrow function parameter.">
--arrow-parens{" "}
<select
value={arrowParens}
onChange={event =>
setArrowParens(event.target.value as ArrowParens)
}
>
{Object.values(ArrowParens).map(option => (
<option key={option}>{option}</option>
))}
</select>
</label>
<label title="Print trailing commas wherever possible when multi-line.">
--trailing-comma{" "}
<select
Expand All @@ -150,6 +196,21 @@ function Inner() {
))}
</select>
</label>
<label title="Where to print operators when binary expressions wrap lines.">
--experimental-operator-position{" "}
<select
value={experimentalOperatorPosition}
onChange={event =>
setExperimentalOperatorPosition(
event.target.value as ExperimentalOperatorPosition
)
}
>
{Object.values(ExperimentalOperatorPosition).map(option => (
<option key={option}>{option}</option>
))}
</select>
</label>
</details>
<details open>
<summary>Special</summary>
Expand Down
Loading