Skip to content

Improve choosing between simpleName and canonicalName in rendered code #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2022
Merged

Improve choosing between simpleName and canonicalName in rendered code #1040

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c9f43e
Improve choosing between simpleName and canonicalName in rendered code
EgorkaKulikov Sep 30, 2022
b43e57b
Merge branch 'main' into egor/class_named_test
EgorkaKulikov Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down