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

Minor: hasTopLevelCallables rename

Browse Source
This commit is contained in:
Nikolay Krasko
2018-01-10 18:45:00 +03:00
parent 14a0434737
commit 34569c2541
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt
+4 -4
View File
@@ -48,7 +48,7 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) :
private var isScript: Boolean? = null private var isScript: Boolean? = null
@Volatile @Volatile
private var hasTopLeveCallables: Boolean? = null private var hasTopLevelCallables: Boolean? = null
@Volatile @Volatile
private var pathCached: String? = null private var pathCached: String? = null
@@ -181,14 +181,14 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) :
@Suppress("RemoveExplicitSuperQualifier") @Suppress("RemoveExplicitSuperQualifier")
super<PsiFileBase>.clearCaches() super<PsiFileBase>.clearCaches()
isScript = null isScript = null
hasTopLeveCallables = null hasTopLevelCallables = null
pathCached = null pathCached = null
} }
fun isScript(): Boolean = stub?.isScript() ?: isScriptByTree fun isScript(): Boolean = stub?.isScript() ?: isScriptByTree
fun hasTopLevelCallables(): Boolean { fun hasTopLevelCallables(): Boolean {
hasTopLeveCallables?.let { return it } hasTopLevelCallables?.let { return it }
val result = declarations.any { val result = declarations.any {
(it is KtProperty || (it is KtProperty ||
@@ -197,7 +197,7 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) :
it is KtTypeAlias) && !it.hasExpectModifier() it is KtTypeAlias) && !it.hasExpectModifier()
} }
hasTopLeveCallables = result hasTopLevelCallables = result
return result return result
} }