jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-01 15:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

workaround for incorrectly compiled PsiTreeUtil.class in AS 2.3: specify explicit type for PsiTreeUtil

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-11-14 15:56:41 +01:00
parent 8eb5006b87
commit 43bccb52ca
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
View File

@@ -160,7 +160,7 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
if (shorteningMode == ShorteningMode.NO_SHORTENING) return newExpression
val needToShorten =
PsiTreeUtil.getParentOfType(expression, KtImportDirective::class.java, KtPackageDirective::class.java) == null
PsiTreeUtil.getParentOfType<KtElement>(expression, KtImportDirective::class.java, KtPackageDirective::class.java) == null
if (needToShorten) {
if (shorteningMode == ShorteningMode.FORCED_SHORTENING) {
ShortenReferences.DEFAULT.process(newQualifiedElement)

4
idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
View File

@@ -417,7 +417,7 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
val receiver = element.receiverExpression
if (receiver !is KtThisExpression && bindingContext[BindingContext.QUALIFIER, receiver] == null) return AnalyzeQualifiedElementResult.Skip
if (PsiTreeUtil.getParentOfType(
if (PsiTreeUtil.getParentOfType<KtElement>(
element,
KtImportDirective::class.java, KtPackageDirective::class.java) != null) return AnalyzeQualifiedElementResult.Skip
@@ -524,7 +524,7 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
override fun analyzeQualifiedElement(element: KtDotQualifiedExpression, bindingContext: BindingContext): AnalyzeQualifiedElementResult {
val receiver = element.receiverExpression
if (PsiTreeUtil.getParentOfType(
if (PsiTreeUtil.getParentOfType<KtElement>(
element,
KtImportDirective::class.java, KtPackageDirective::class.java) != null) return AnalyzeQualifiedElementResult.Skip