Improve choosing between simpleName and canonicalName in rendered code (UnitTestBot#1040)

EgorkaKulikov · AbdullinAM · commit 40bf31b58d25 · 2022-10-17T16:58:56.000+03:00
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt
@@ -834,7 +834,8 @@ internal abstract class CgAbstractRenderer(
     }
 
     protected open fun isAccessibleBySimpleNameImpl(classId: ClassId): Boolean =
-        classId in context.importedClasses || classId.packageName == context.classPackageName
+        classId in context.importedClasses ||
+                classId.simpleName !in context.importedClasses.map { it.simpleName } && classId.packageName == context.classPackageName
 
     protected abstract fun escapeNamePossibleKeywordImpl(s: String): String
 

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,8 @@ internal abstract class CgAbstractRenderer(`
`834`	`834`	`}`
`835`	`835`
`836`	`836`	`protected open fun isAccessibleBySimpleNameImpl(classId: ClassId): Boolean =`
`837`		`- classId in context.importedClasses \|\| classId.packageName == context.classPackageName`
	`837`	`+ classId in context.importedClasses \|\|`
	`838`	`+ classId.simpleName !in context.importedClasses.map { it.simpleName } && classId.packageName == context.classPackageName`
`838`	`839`
`839`	`840`	`protected abstract fun escapeNamePossibleKeywordImpl(s: String): String`
`840`	`841`