diff options
author | cushon <cushon@google.com> | 2018-12-17 11:54:20 -0800 |
---|---|---|
committer | Liam Miller-Cushon <cushon@google.com> | 2019-01-28 21:35:29 -0800 |
commit | 6f4bab196a3558618206cd59e5bb7477776cffff (patch) | |
tree | 2fb4f0eab3a79e28f4cf692802c32cd4e8580bf6 | |
parent | 4897f9e0c5c9df43d6cfb86b71f6c37f0d6d0945 (diff) | |
download | turbine-6f4bab196a3558618206cd59e5bb7477776cffff.tar.gz |
Reformat with google-java-format
MOE_MIGRATED_REVID=225864459
5 files changed, 21 insertions, 39 deletions
diff --git a/java/com/google/turbine/binder/lookup/ImportIndex.java b/java/com/google/turbine/binder/lookup/ImportIndex.java index 97556ca..afa985a 100644 --- a/java/com/google/turbine/binder/lookup/ImportIndex.java +++ b/java/com/google/turbine/binder/lookup/ImportIndex.java @@ -120,10 +120,7 @@ public class ImportIndex implements ImportScope { } private static ClassSymbol resolveNext( - TurbineLogWithSource log, - CanonicalSymbolResolver resolve, - ClassSymbol sym, - Ident bit) { + TurbineLogWithSource log, CanonicalSymbolResolver resolve, ClassSymbol sym, Ident bit) { ClassSymbol next = resolve.resolveOne(sym, bit); if (next == null) { log.error( diff --git a/java/com/google/turbine/binder/lookup/WildImportIndex.java b/java/com/google/turbine/binder/lookup/WildImportIndex.java index 043ccc5..cfe58c7 100644 --- a/java/com/google/turbine/binder/lookup/WildImportIndex.java +++ b/java/com/google/turbine/binder/lookup/WildImportIndex.java @@ -67,9 +67,7 @@ public class WildImportIndex implements ImportScope { /** Full resolve the type for a non-static on-demand import. */ private static ImportScope onDemandImport( - TopLevelIndex cpi, - ImportDecl i, - final CanonicalSymbolResolver importResolver) { + TopLevelIndex cpi, ImportDecl i, final CanonicalSymbolResolver importResolver) { ImmutableList.Builder<String> flatNames = ImmutableList.builder(); for (Tree.Ident ident : i.type()) { flatNames.add(ident.value()); @@ -106,9 +104,7 @@ public class WildImportIndex implements ImportScope { * deferred). */ private static ImportScope staticOnDemandImport( - TopLevelIndex cpi, - ImportDecl i, - final CanonicalSymbolResolver importResolver) { + TopLevelIndex cpi, ImportDecl i, final CanonicalSymbolResolver importResolver) { LookupResult result = cpi.scope().lookup(new LookupKey(i.type())); if (result == null) { return null; @@ -141,9 +137,7 @@ public class WildImportIndex implements ImportScope { } static ClassSymbol resolveImportBase( - LookupResult result, - ResolveFunction resolve, - CanonicalSymbolResolver importResolver) { + LookupResult result, ResolveFunction resolve, CanonicalSymbolResolver importResolver) { ClassSymbol member = (ClassSymbol) result.sym(); for (Tree.Ident bit : result.remaining()) { member = resolve.resolveOne(member, bit); diff --git a/javatests/com/google/turbine/deps/AbstractTransitiveTest.java b/javatests/com/google/turbine/deps/AbstractTransitiveTest.java index 1bd9349..4cb8adf 100644 --- a/javatests/com/google/turbine/deps/AbstractTransitiveTest.java +++ b/javatests/com/google/turbine/deps/AbstractTransitiveTest.java @@ -145,17 +145,16 @@ public abstract class AbstractTransitiveTest { Path libc = temporaryFolder.newFolder().toPath().resolve("out.jar"); List<String> sources = new SourceBuilder() - .addSourceLines( - "c/C.java", - "package c;", - "public class C extends b.B {", - " @Anno(x = 2) static final Inner i; // a.A$Inner ", - " static final int X = CONST; // a.A#CONST", - "}") - .build() - .stream() - .map(Path::toString) - .collect(toImmutableList()); + .addSourceLines( + "c/C.java", + "package c;", + "public class C extends b.B {", + " @Anno(x = 2) static final Inner i; // a.A$Inner ", + " static final int X = CONST; // a.A#CONST", + "}") + .build().stream() + .map(Path::toString) + .collect(toImmutableList()); boolean ok = Main.compile( optionsWithBootclasspath() diff --git a/javatests/com/google/turbine/lower/IntegrationTestSupport.java b/javatests/com/google/turbine/lower/IntegrationTestSupport.java index a3c6c37..680b073 100644 --- a/javatests/com/google/turbine/lower/IntegrationTestSupport.java +++ b/javatests/com/google/turbine/lower/IntegrationTestSupport.java @@ -136,12 +136,10 @@ public class IntegrationTestSupport { if (!isDeprecated(n.visibleAnnotations)) { n.access &= ~Opcodes.ACC_DEPRECATED; } - n.methods - .stream() + n.methods.stream() .filter(m -> !isDeprecated(m.visibleAnnotations)) .forEach(m -> m.access &= ~Opcodes.ACC_DEPRECATED); - n.fields - .stream() + n.fields.stream() .filter(f -> !isDeprecated(f.visibleAnnotations)) .forEach(f -> f.access &= ~Opcodes.ACC_DEPRECATED); } @@ -189,21 +187,18 @@ public class IntegrationTestSupport { /** Remove elements that are omitted by turbine, e.g. private and synthetic members. */ private static void removeImplementation(ClassNode n) { n.innerClasses = - n.innerClasses - .stream() + n.innerClasses.stream() .filter(x -> (x.access & Opcodes.ACC_SYNTHETIC) == 0 && x.innerName != null) .collect(toList()); n.methods = - n.methods - .stream() + n.methods.stream() .filter(x -> (x.access & (Opcodes.ACC_SYNTHETIC | Opcodes.ACC_PRIVATE)) == 0) .filter(x -> !x.name.equals("<clinit>")) .collect(toList()); n.fields = - n.fields - .stream() + n.fields.stream() .filter(x -> (x.access & (Opcodes.ACC_SYNTHETIC | Opcodes.ACC_PRIVATE)) == 0) .collect(toList()); } @@ -442,9 +437,7 @@ public class IntegrationTestSupport { Optional<String> moduleVersion) throws IOException { List<Tree.CompUnit> units = - input - .entrySet() - .stream() + input.entrySet().stream() .map(e -> new SourceFile(e.getKey(), e.getValue())) .map(Parser::parse) .collect(toList()); diff --git a/javatests/com/google/turbine/lower/ModuleIntegrationTest.java b/javatests/com/google/turbine/lower/ModuleIntegrationTest.java index a72c971..03c6fb7 100644 --- a/javatests/com/google/turbine/lower/ModuleIntegrationTest.java +++ b/javatests/com/google/turbine/lower/ModuleIntegrationTest.java @@ -108,8 +108,7 @@ public class ModuleIntegrationTest { private String dump(Map<String, byte[]> map) throws Exception { return IntegrationTestSupport.dump( - map.entrySet() - .stream() + map.entrySet().stream() .filter(e -> e.getKey().endsWith("module-info")) .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue))); } |