format

streem · Nov 9, 2022 · 2423750 · 2423750
1 parent f1fd6f4
commit 2423750
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/protoc-gen-pbandk/lib/src/commonMain/kotlin/pbandk/gen/FileBuilder.kt b/protoc-gen-pbandk/lib/src/commonMain/kotlin/pbandk/gen/FileBuilder.kt
@@ -263,8 +263,9 @@ internal open class FileBuilder(val namer: Namer = Namer.Standard, val supportMa
                         } else {
                             to
                         }
-                    } else
+                    } else {
                         null
+                    }
                 }
         }
 

diff --git a/protoc-gen-pbandk/lib/src/jvmTest/kotlin/CodeGeneratorTest.kt b/protoc-gen-pbandk/lib/src/jvmTest/kotlin/CodeGeneratorTest.kt
@@ -83,7 +83,7 @@ class CodeGeneratorTest {
         result.classLoader.loadClass("newname.pkg.Message1").kotlin
         result.classLoader.loadClass("newname.pkg.Message2").kotlin
 
-        assertTrue(kotlin.runCatching { result.classLoader.loadClass("foobar.Message1").kotlin }.isFailure)
+        assertFails { result.classLoader.loadClass("foobar.Message1").kotlin }
     }
 
 
@@ -98,7 +98,7 @@ class CodeGeneratorTest {
         result.classLoader.loadClass("newname.pkg.foobar.Message1").kotlin
         result.classLoader.loadClass("newname.pkg.foobar.Message2").kotlin
 
-        assertTrue(kotlin.runCatching { result.classLoader.loadClass("foobar.Message1").kotlin }.isFailure)
+        assertFails { result.classLoader.loadClass("foobar.Message1").kotlin }
     }
 
     @Test
@@ -112,7 +112,7 @@ class CodeGeneratorTest {
         result.classLoader.loadClass("newname.pkg.Message1").kotlin
         result.classLoader.loadClass("newname.pkg.Message2").kotlin
 
-        assertTrue(kotlin.runCatching { result.classLoader.loadClass("foobar.Message1").kotlin }.isFailure)
+        assertFails { result.classLoader.loadClass("foobar.Message1").kotlin }
     }
 
     @Test
@@ -127,7 +127,7 @@ class CodeGeneratorTest {
         result.classLoader.loadClass("foobar.Message2").kotlin
 
 
-        assertTrue(kotlin.runCatching { result.classLoader.loadClass("newname.pkg.Message1").kotlin }.isFailure)
+        assertFails { result.classLoader.loadClass("newname.pkg.Message1").kotlin }
     }
 
     @Test
@@ -140,7 +140,7 @@ class CodeGeneratorTest {
         // New package name should replace the prefix.
         result.classLoader.loadClass("newname.testpb.Proto3PresenceMessage").kotlin
 
-        assertTrue(kotlin.runCatching { result.classLoader.loadClass("pbandk.testpb.Proto3PresenceMessage").kotlin }.isFailure)
+        assertFails { result.classLoader.loadClass("pbandk.testpb.Proto3PresenceMessage").kotlin }
     }
 
     @Test
@@ -154,7 +154,7 @@ class CodeGeneratorTest {
         result.classLoader.loadClass("newname.javapackage.Foo").kotlin
         result.classLoader.loadClass("newname.javapackage.Goo").kotlin
 
-        assertTrue(kotlin.runCatching { result.classLoader.loadClass("pbandk.javapackage.Foo").kotlin }.isFailure)
+        assertFails { result.classLoader.loadClass("pbandk.javapackage.Foo").kotlin }
     }
 
     private fun compileProto(inputProto: String, parameter: String? = null): KotlinCompilation.Result {
-Original file line number
+Diff line change
@@ Expand Up @@
                             } else {
                                 to
                             }
-                        } else
+                        } else {
                             null
+                        }
                     }
             }
@@ Expand Down @@