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

Minor: remove warnings

Browse Source
This commit is contained in:
Nikolay Krasko
2014-05-20 15:35:37 +04:00
parent 950840b8c7
commit 34a9d9e91d
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt
+1 -1
View File
@@ -281,7 +281,7 @@ private object KotlinResolveDataProvider {
private fun analyzeExpressionCodeFragment(resolveSession: ResolveSessionForBodies, codeFragment: JetCodeFragment): BindingContext { private fun analyzeExpressionCodeFragment(resolveSession: ResolveSessionForBodies, codeFragment: JetCodeFragment): BindingContext {
val codeFragmentExpression = codeFragment.getContentElement() val codeFragmentExpression = codeFragment.getContentElement()
if (!(codeFragmentExpression is JetExpression)) return BindingContext.EMPTY if (codeFragmentExpression !is JetExpression) return BindingContext.EMPTY
val contextElement = codeFragment.getContext() val contextElement = codeFragment.getContext()
if (contextElement !is JetExpression) return BindingContext.EMPTY if (contextElement !is JetExpression) return BindingContext.EMPTY
idea/src/org/jetbrains/jet/plugin/references/JetReference.kt
+5 -5
View File
@@ -50,7 +50,7 @@ abstract class AbstractJetReference<T : JetElement>(element: T)
: PsiPolyVariantReferenceBase<T>(element), JetReference { : PsiPolyVariantReferenceBase<T>(element), JetReference {
val expression: T val expression: T
get() = getElement()!! get() = getElement()
override fun multiResolve(incompleteCode: Boolean): Array<ResolveResult> { override fun multiResolve(incompleteCode: Boolean): Array<ResolveResult> {
return PsiElementResolveResult.createResults(resolveToPsiElements()) return PsiElementResolveResult.createResults(resolveToPsiElements())
@@ -133,21 +133,21 @@ abstract class AbstractJetReference<T : JetElement>(element: T)
if (reference !is JetReferenceExpression) { if (reference !is JetReferenceExpression) {
return null return null
} }
val labelTarget = context.get(BindingContext.LABEL_TARGET, reference) val labelTarget = context[BindingContext.LABEL_TARGET, reference]
if (labelTarget != null) { if (labelTarget != null) {
return listOf(labelTarget) return listOf(labelTarget)
} }
return context.get(BindingContext.AMBIGUOUS_LABEL_TARGET, reference) return context[BindingContext.AMBIGUOUS_LABEL_TARGET, reference]
} }
} }
public abstract class JetSimpleReference<T : JetReferenceExpression>(expression: T) : AbstractJetReference<T>(expression) { public abstract class JetSimpleReference<T : JetReferenceExpression>(expression: T) : AbstractJetReference<T>(expression) {
override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> { override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
val targetDescriptor = context.get(BindingContext.REFERENCE_TARGET, expression) val targetDescriptor = context[BindingContext.REFERENCE_TARGET, expression]
if (targetDescriptor != null) { if (targetDescriptor != null) {
return listOf(targetDescriptor) return listOf(targetDescriptor)
} }
return context.get(BindingContext.AMBIGUOUS_REFERENCE_TARGET, expression).orEmpty() return context[BindingContext.AMBIGUOUS_REFERENCE_TARGET, expression].orEmpty()
} }
override fun isReferenceTo(element: PsiElement?): Boolean { override fun isReferenceTo(element: PsiElement?): Boolean {