azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix getModuleInfo for elements in code fragments

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-11-19 17:20:03 +03:00
parent 03a31db2ec
commit 2c9b0448a1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt
+6 -6
View File
@@ -33,12 +33,7 @@ fun PsiElement.getModuleInfo(): IdeaModuleInfo {
return NotUnderContentRootModuleInfo return NotUnderContentRootModuleInfo
} }
if (this is KotlinLightElement<*, *>) if (this is KotlinLightElement<*, *>) return this.getModuleInfoForLightElement()
return this.getModuleInfoForLightElement()
if (this is JetCodeFragment)
return this.getContext()?.getModuleInfo()
?: logAndReturnDefault("Analyzing code fragment of type $javaClass with no context element\nText:\n${getText()}")
val containingJetFile = (this as? JetElement)?.getContainingFile() as? JetFile val containingJetFile = (this as? JetElement)?.getContainingFile() as? JetFile
val context = containingJetFile?.analysisContext val context = containingJetFile?.analysisContext
@@ -51,6 +46,11 @@ fun PsiElement.getModuleInfo(): IdeaModuleInfo {
) )
} }
if (containingJetFile is JetCodeFragment) {
return containingJetFile.getContext()?.getModuleInfo()
?: logAndReturnDefault("Analyzing code fragment of type ${containingJetFile.javaClass} with no context element\nText:\n${containingJetFile.getText()}")
}
val project = getProject() val project = getProject()
val containingFile = getContainingFile() val containingFile = getContainingFile()
?: return logAndReturnDefault("Analyzing element of type $javaClass with no containing file\nText:\n${getText()}") ?: return logAndReturnDefault("Analyzing element of type $javaClass with no containing file\nText:\n${getText()}")