Skip to content

Commit aca5a77

Browse files
plumpyronshapiro
authored andcommitted
Fix the open source google-java-format plugin. It was never enabled on project open.
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=155899110
1 parent b1652c4 commit aca5a77

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

idea_plugin/google-java-format.iml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
<exclude-output />
66
<content url="file://$MODULE_DIR$">
77
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
8-
<sourceFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2016_3" packagePrefix="com.google.googlejavaformat.intellij.v2016_3" isTestSource="false" />
9-
<excludeFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2016_2" />
108
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
119
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
10+
<sourceFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2017_1" isTestSource="false" packagePrefix="com.google.googlejavaformat.intellij" />
11+
<excludeFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2016_2" />
12+
<excludeFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2016_3" />
1213
</content>
1314
<orderEntry type="inheritedJdk" />
1415
<orderEntry type="sourceFolder" forTests="false" />

idea_plugin/resources/META-INF/plugin.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<idea-plugin version="2">
22
<id>google-java-format</id>
33
<name>google-java-format</name>
4-
<version>1.2.SNAPSHOT.20161216</version>
4+
<version>1.3.1</version>
55
<vendor url="https://github.com/google/google-java-format">
66
Google
77
</vendor>
@@ -15,10 +15,9 @@
1515
Formats Java source code to comply with Google Style.
1616
]]></description>
1717

18-
<!-- CodeStyleManager stayed the same from 143 (IDEA 15) through 162
19-
(2016.2). But they changed a parameter type of a method in 163 (2016.3),
20-
so it needs some work to fix. -->
21-
<idea-version since-build="143.0" until-build="163.0"/>
18+
<!-- CodeStyleManager continues to change across API versions, and will need to be updated again
19+
for 2017.2. -->
20+
<idea-version since-build="171" until-build="171.*"/>
2221

2322
<project-components>
2423
<component>

idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatSettings.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public State getState() {
5252
@Override
5353
public void loadState(State state) {
5454
this.state = state;
55+
updateFormatterState();
5556
}
5657

5758
boolean isEnabled() {

0 commit comments

Comments
 (0)