Enable sorting of the default modifier.

MOE_MIGRATED_REVID=135116130
eaftan · Oct 10, 2016 · 48be506 · 48be506
1 parent bab0625
commit 48be506
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java b/core/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java
@@ -52,9 +52,7 @@ static Modifier getModifier(int tokenId) {
       case ITerminalSymbols.TokenNamestatic:
         return Modifier.STATIC;
       case ITerminalSymbols.TokenNamedefault:
-        // TODO(cushon): handle default
-        // return Modifier.DEFAULT;
-        return null;
+        return Modifier.DEFAULT;
       case ITerminalSymbols.TokenNamefinal:
         return Modifier.FINAL;
       case ITerminalSymbols.TokenNametransient:

diff --git a/core/src/test/java/com/google/googlejavaformat/java/ModifierOrdererTest.java b/core/src/test/java/com/google/googlejavaformat/java/ModifierOrdererTest.java
@@ -21,7 +21,6 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.Range;
 import java.util.Arrays;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -53,7 +52,6 @@ public void everything() throws FormatterException {
                 + " native strictfp");
   }
 
-  @Ignore
   @Test
   public void everythingIncludingDefault() throws FormatterException {
     assertThat(