Repository navigation
Review do PR upstream #1521 #1
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.google.googlejavaformat.intellij.GoogleJavaFormatConfigurable"> | ||
| <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> | ||
| <margin top="0" left="0" bottom="0" right="0"/> | ||
| <constraints> | ||
| <xy x="20" y="20" width="500" height="400"/> | ||
|
|
@@ -18,7 +18,7 @@ | |
| </component> | ||
| <vspacer id="19e83"> | ||
| <constraints> | ||
| <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/> | ||
| </constraints> | ||
| </vspacer> | ||
| <component id="c93e1" class="javax.swing.JLabel"> | ||
|
|
@@ -35,20 +35,6 @@ | |
| </constraints> | ||
| <properties/> | ||
| </component> | ||
| </children> | ||
| </grid> | ||
| </form> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,15 +16,12 @@ | |
|
|
||
| package com.google.googlejavaformat.intellij; | ||
|
|
||
| import com.google.googlejavaformat.intellij.GoogleJavaFormatSettings.EnabledState; | ||
| import com.intellij.openapi.options.BaseConfigurable; | ||
| import com.intellij.openapi.options.ConfigurationException; | ||
| import com.intellij.openapi.options.SearchableConfigurable; | ||
| import com.intellij.openapi.project.Project; | ||
| import com.intellij.openapi.ui.ComboBox; | ||
| import com.intellij.uiDesigner.core.GridConstraints; | ||
| import com.intellij.uiDesigner.core.GridLayoutManager; | ||
| import com.intellij.uiDesigner.core.Spacer; | ||
|
|
@@ -44,7 +41,6 @@ class GoogleJavaFormatConfigurable extends BaseConfigurable implements Searchabl | |
| private JPanel panel; | ||
| private JCheckBox enable; | ||
| private JComboBox styleComboBox; | ||
|
|
||
| public GoogleJavaFormatConfigurable(Project project) { | ||
| this.project = project; | ||
|
|
@@ -85,17 +81,6 @@ public void apply() throws ConfigurationException { | |
| GoogleJavaFormatSettings settings = GoogleJavaFormatSettings.getInstance(project); | ||
| settings.setEnabled(enable.isSelected() ? EnabledState.ENABLED : getDisabledState()); | ||
| settings.setStyle(((UiFormatterStyle) styleComboBox.getSelectedItem()).convert()); | ||
| } | ||
|
|
||
| private EnabledState getDisabledState() { | ||
|
|
@@ -110,25 +95,20 @@ public void reset() { | |
| GoogleJavaFormatSettings settings = GoogleJavaFormatSettings.getInstance(project); | ||
| enable.setSelected(settings.isEnabled()); | ||
| styleComboBox.setSelectedItem(UiFormatterStyle.convert(settings.getStyle())); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isModified() { | ||
| GoogleJavaFormatSettings settings = GoogleJavaFormatSettings.getInstance(project); | ||
| return enable.isSelected() != settings.isEnabled() | ||
| || !styleComboBox.getSelectedItem().equals(UiFormatterStyle.convert(settings.getStyle())); | ||
| } | ||
|
|
||
| @Override | ||
| public void disposeUIResources() {} | ||
|
|
||
| private void createUIComponents() { | ||
| styleComboBox = new ComboBox<>(UiFormatterStyle.values()); | ||
| } | ||
|
|
||
| { | ||
|
|
@@ -147,7 +127,7 @@ private void createUIComponents() { | |
| private void $$$setupUI$$$() { | ||
| createUIComponents(); | ||
| panel = new JPanel(); | ||
| panel.setLayout(new GridLayoutManager(3, 2, new Insets(0, 0, 0, 0), -1, -1)); | ||
| enable = new JCheckBox(); | ||
| enable.setText("Enable google-java-format"); | ||
| panel.add( | ||
|
|
@@ -170,7 +150,7 @@ private void createUIComponents() { | |
| panel.add( | ||
| spacer1, | ||
| new GridConstraints( | ||
| 2, | ||
| 0, | ||
| 1, | ||
| 2, | ||
|
|
@@ -217,40 +197,6 @@ private void createUIComponents() { | |
| null, | ||
| 1, | ||
| false)); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -72,21 +72,11 @@ boolean isUninitialized() { | |
| } | ||
|
|
||
| JavaFormatterOptions.Style getStyle() { | ||
| return state.style; | ||
|
There was a problem hiding this comment. Preserve the default style when the loaded style is null. If Return
 |
||
| } | ||
|
|
||
| void setStyle(JavaFormatterOptions.Style style) { | ||
| state.style = style; | ||
| } | ||
|
|
||
| enum EnabledState { | ||
|
|
@@ -98,8 +88,7 @@ enum EnabledState { | |
| static class State { | ||
|
|
||
| private EnabledState enabled = EnabledState.UNKNOWN; | ||
| public JavaFormatterOptions.Style style = JavaFormatterOptions.Style.GOOGLE; | ||
|
There was a problem hiding this comment. Update the settings tests for the new state representation.
Update the style assignments and assertions. Remove or replace the maximum-line-length tests. Otherwise, plugin test compilation fails.
|
||
|
|
||
| // enabled used to be a boolean so we use bean property methods for backwards compatibility | ||
| public void setEnabled(@Nullable String enabledStr) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,8 @@ | |
|
|
||
| import com.google.googlejavaformat.java.JavaFormatterOptions; | ||
| import com.google.googlejavaformat.java.JavaFormatterOptions.Style; | ||
| import java.util.Arrays; | ||
| import java.util.Objects; | ||
|
|
||
| /** Configuration options for the formatting style. */ | ||
| enum UiFormatterStyle { | ||
|
|
@@ -32,7 +34,8 @@ enum UiFormatterStyle { | |
| this.style = style; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return description; | ||
| } | ||
|
|
||
|
|
@@ -41,6 +44,9 @@ public JavaFormatterOptions.Style convert() { | |
| } | ||
|
|
||
| static UiFormatterStyle convert(JavaFormatterOptions.Style style) { | ||
| return Arrays.stream(UiFormatterStyle.values()) | ||
| .filter(value -> Objects.equals(value.style, style)) | ||
| .findFirst() | ||
| .get(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,9 +35,6 @@ | |
| ]]></description> | ||
| <change-notes><![CDATA[ | ||
| <dl> | ||
| <dt>2.0.0.0</dt> | ||
| <dd>Updated to use google-java-format 2.0.0.</dd> | ||
| <dt>1.36.1.1</dt> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -116,31 +116,6 @@ public void aospStyle() throws Exception { | |
| assertThat(delegatingFormatter.wasInvoked()).isTrue(); | ||
| } | ||
|
|
||
| @Test | ||
| public void canChangeWhitespaceOnlyDoesNotReorderModifiers() throws Exception { | ||
| settings.setStyle(Style.GOOGLE); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Serialize release runs before the shared staging cleanup.
The workflow declares no
concurrencygroup. Twoworkflow_dispatchruns can therefore overlap. The cleanup step deletes every package in the sharedgoogle-java-fmt--mavencentralrepository, so a later run can delete packages that an earlier run has already staged. The run-specific manifest name does not limit the cleanup to one run's packages.Add a workflow-level concurrency group that does not cancel runs in progress:
Suggested fix
permissions: {} + +concurrency: + group: google-java-format-release + cancel-in-progress: false