Skip to content
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

Jump to bottom

Fix NoSuchFieldError in newer Kotlin plugins #3422

Merged
merged 1 commit into from
Aug 8, 2022
Merged

Fix NoSuchFieldError in newer Kotlin plugins #3422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion ...dea-plugin/src/main/kotlin/app/cash/sqldelight/intellij/SqlDelightReferenceContributor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ internal class SqlDelightReferenceContributor : PsiReferenceContributor() {
val scope = module.getModuleWithDependenciesAndLibrariesScope(false)
val classNameIndex = KotlinFullClassNameIndex.getInstance()
val ktClass = { classNameIndex[qName, project, scope].firstOrNull() }
val typeAliasFqNameIndex = KotlinTopLevelTypeAliasFqNameIndex.getInstance()
val typeAliasFqNameIndex = getKotlinTopLevelTypeAliasFqNameIndex()
val typeAlias = { typeAliasFqNameIndex[qName, project, scope].firstOrNull() }
val javaPsiFacade = JavaPsiFacade.getInstance(project)
val javaClass = { javaPsiFacade.findClass(qName, scope) }
Expand All @@ -74,3 +74,17 @@ internal class SqlDelightReferenceContributor : PsiReferenceContributor() {
private fun typeForThisPackage(file: SqlDelightFile) = "${file.packageName}.${element.text}"
}
}

private fun getKotlinTopLevelTypeAliasFqNameIndex(): KotlinTopLevelTypeAliasFqNameIndex {
// read the INSTANCE variable reflectively first (newer Kotlin plugins)
try {
val instanceField = KotlinTopLevelTypeAliasFqNameIndex::class.java.getField("INSTANCE")
val instance = instanceField.get(null)
if (instance is KotlinTopLevelTypeAliasFqNameIndex) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should not we throw an exception in the else block in case instance is of any type other than KotlinTopLevelTypeAliasFqNameIndex? So if in the future it breaks again, we at least get a proper stacktrace

Copy link
Contributor Author

@madisp madisp Aug 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, I think that case overall is highly unlikely: <T>.INSTANCE static field exists but is not of type T.

I guess to make it safer we could reflectively check for Companion + getInstance method though and then throw if neither INSTANCE field nor $Companion.getInstance is present?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough!

return instance
}
} catch (e: Exception) {
/* intentionally empty, fall back to getInstance() call in case of errors */
}
return KotlinTopLevelTypeAliasFqNameIndex.getInstance()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And then this could be moved into the catch block

}