commit 705d48f8f34cc8608b9a3b6893cf514e91838c82
author Rico Wind <ricow@google.com> Tue Dec 17 07:57:15 2019 +0100
committer Rico Wind <ricow@google.com> Tue Dec 17 07:57:15 2019 +0100
tree 13f7b9eeab08626f27557972d49af3a47dc34c9f
parent d2a1db0c537d4aca97d489ef0e801f3660ea609d

Format ProguardConfigurationParser

Ran git fmt

Change-Id: Iccb8599b84de79152e79faedb5e7987fbb869fb2

src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java

diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
index 2dc865b..ab9e92f 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -217,7 +217,7 @@
       // This may be unknown, but we want to always ensure that we don't attribute lines to the
       // wrong configuration.
       configurationBuilder.addParsedConfiguration(
-            "# The proguard configuration file for the following section is " + origin.toString());
+          "# The proguard configuration file for the following section is " + origin.toString());
 
       // Collect the parsed configuration.
       configurationBuilder.addParsedConfiguration(contents.substring(positionAfterInclude));

src/test/java/com/android/tools/r8/shaking/PrintConfigurationTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/PrintConfigurationTest.java b/src/test/java/com/android/tools/r8/shaking/PrintConfigurationTest.java
index df33e06..3fc3434 100644
--- a/src/test/java/com/android/tools/r8/shaking/PrintConfigurationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/PrintConfigurationTest.java
@@ -53,14 +53,13 @@
         .addProgramClasses(PrintConfigurationTestClass.class)
         .addKeepRules(proguardConfig)
         .compile();
-    assertEqualsStripOrigin(proguardConfig,
-        FileUtils.readTextFile(printConfigurationFile, Charsets.UTF_8));
+    assertEqualsStripOrigin(
+        proguardConfig, FileUtils.readTextFile(printConfigurationFile, Charsets.UTF_8));
   }
 
   private String removeOriginComments(String s) {
     return StringUtils.lines(
-        StringUtils.splitLines(s)
-        .stream()
+        StringUtils.splitLines(s).stream()
             .filter(line -> !line.startsWith("# The proguard"))
             .filter(line -> !line.startsWith("# End of content"))
             .filter(line -> !line.equals(""))
@@ -91,8 +90,8 @@
 
     String outFileContent = FileUtils.readTextFile(proguardConfigOutFile, Charsets.UTF_8);
     assertEqualsStripOrigin(proguardConfig, outFileContent);
-    // We should have added the proguard-config.txt file as the origin in the config output
 
+    // We should have added the proguard-config.txt file as the origin in the config output
     String firstLine = StringUtils.splitLines(outFileContent).get(0);
     assertThat(outFileContent, containsString(proguardConfigFile.toString()));
   }
@@ -151,7 +150,7 @@
         "-printconfiguration " + printConfigurationFile.toString()
     ));
     compileWithR8(ImmutableList.of(mainClass), proguardConfig);
-    assertEqualsStripOrigin(expected,
-        FileUtils.readTextFile(printConfigurationFile, Charsets.UTF_8));
+    assertEqualsStripOrigin(
+        expected, FileUtils.readTextFile(printConfigurationFile, Charsets.UTF_8));
   }
 }