Import nested enums in the same package when defined in a different file (#53)

Author: andrewparmet

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/Import.kt

@@ -24,41 +24,32 @@ sealed class Import {
     abstract val qualifiedName: String
     abstract val simpleName: String
     abstract val pkg: PPackage
+    abstract val nested: Boolean
 
     data class Class(val pClass: PClass) : Import() {
-        override val qualifiedName
-            get() = pClass.qualifiedName
-
-        override val pkg: PPackage
-            get() = pClass.ppackage
-
-        override val simpleName: String
-            get() = pClass.simpleName
+        override val qualifiedName = pClass.qualifiedName
+        override val pkg = pClass.ppackage
+        override val simpleName = pClass.simpleName
+        override val nested = pClass.enclosing.isDefined()
     }
 
     data class PackageMethod(
         override val pkg: PPackage,
         val name: String
     ) : Import() {
-        override val qualifiedName
-            get() = pkg.qualify(name)
-
-        override val simpleName: String
-            get() = name
+        override val qualifiedName = pkg.qualify(name)
+        override val simpleName = name
+        override val nested = false
     }
 
     data class ClassMethod(
         val enclosingClass: PClass,
         val name: String
     ) : Import() {
-        override val pkg: PPackage
-            get() = enclosingClass.ppackage
-
-        override val qualifiedName: String
-            get() = "${enclosingClass.qualifiedName}.$name"
-
-        override val simpleName: String
-            get() = name
+        override val pkg = enclosingClass.ppackage
+        override val qualifiedName = "${enclosingClass.qualifiedName}.$name"
+        override val simpleName = name
+        override val nested = true
     }
 }
 

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/ImportResolver.kt

@@ -66,9 +66,9 @@ class ImportResolver(
     fun resolveImports(astList: List<AST<TypeDesc>>) =
         astList.flatMapToSet { imports(it.data.type.rawType) }
             .asSequence()
-            .filterNot { it.pkg == pkg }
             .filterNot { it.pkg == PPackage.KOTLIN }
             .filterNot { it is Import.Class && it.pClass.simpleName == "Any" }
+            .filterClassesWithSamePackageName(pkg)
             .filterClassesWithSameNameAsMessageIn(astList)
             .filterClassesWithSameNameAsOneofFieldTypeIn(astList)
             .filterDuplicateSimpleNames(pkg) { getClassOrNone(it, ctx) }

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/PackageMatchImportFilterer.kt

@@ -0,0 +1,21 @@
+/*
+* Copyright (c) 2020 Toast Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.toasttab.protokt.codegen.impl
+
+import com.toasttab.protokt.codegen.model.PPackage
+
+fun Sequence<Import>.filterClassesWithSamePackageName(pkg: PPackage) =
+    filterNot { it.pkg == pkg && !it.nested }

testing/runtime-tests/src/main/proto/com/toasttab/protokt/testing/rt/defines_nested_enum.proto

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 Toast Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto3";
+
+package com.toasttab.protokt.testing.rt;
+
+message DefinesNestedEnum {
+  enum NestedEnum {
+    ZEROTH = 0;
+    FIRST = 1;
+  }
+}

testing/runtime-tests/src/main/proto/com/toasttab/protokt/testing/rt/enums_across_packages.proto

@@ -20,5 +20,5 @@ package com.toasttab.protokt.testing.rt;
 import "com/toasttab/protokt/testing/rt/other/other_package.proto";
 
 message UsesOtherPackageEnum {
-  com.toasttab.protokt.testing.rt.other.OtherPackageMessage.OtherPackageEnum enum = 1;
+  other.OtherPackageMessage.OtherPackageEnum enum = 1;
 }

testing/runtime-tests/src/main/proto/com/toasttab/protokt/testing/rt/import_nested_enums.proto

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020 Toast Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto3";
+
+package com.toasttab.protokt.testing.rt;
+
+import "com/toasttab/protokt/testing/rt/defines_nested_enum.proto";
+
+message UsesNestedEnumInDifferentFileSamePackage {
+  DefinesNestedEnum.NestedEnum value = 1;
+}