From 043502f8365e4d1bd2ddf21118716c57afe0d0be Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 24 Aug 2016 18:12:39 +0300 Subject: [PATCH] Minor: remove warnings and refactoring --- .../parsing/KotlinExpressionParsing.java | 16 +++--- .../kotlin/psi/KtBlockExpression.java | 2 +- .../idea/project/ResolveElementCache.kt | 56 ++++++++++--------- .../references/KotlinReferenceContributor.kt | 19 +++---- 4 files changed, 48 insertions(+), 45 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java index e6c73bf23e9..dd4af0d7c98 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java @@ -1070,16 +1070,14 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing { } } - if (!paramsFound) { - if (preferBlock) { - literal.drop(); - parseStatements(); - expect(RBRACE, "Expecting '}'"); - literalExpression.done(BLOCK); - myBuilder.restoreNewlinesState(); + if (!paramsFound && preferBlock) { + literal.drop(); + parseStatements(); + expect(RBRACE, "Expecting '}'"); + literalExpression.done(BLOCK); + myBuilder.restoreNewlinesState(); - return; - } + return; } PsiBuilder.Marker body = mark(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockExpression.java index 3f200e06f69..4eda4079416 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockExpression.java @@ -35,7 +35,7 @@ public class KtBlockExpression extends KtExpressionImpl implements KtStatementEx @Override public boolean shouldChangeModificationCount(PsiElement place) { - // To prent OutOfBlockModification increase from JavaCodeBlockModificationListener + // To prevent OutOfBlockModification increase from JavaCodeBlockModificationListener return false; } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt index 63a3e4266cf..71044f046e3 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt @@ -71,12 +71,10 @@ class ResolveElementCache( // drop whole cache after change "out of code block" private val fullResolveCache: CachedValue> = CachedValuesManager.getManager(project).createCachedValue( - object : CachedValueProvider> { - override fun compute(): CachedValueProvider.Result> { - return CachedValueProvider.Result.create(ContainerUtil.createConcurrentSoftValueMap(), - PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, - resolveSession.exceptionTracker) - } + CachedValueProvider> { + CachedValueProvider.Result.create(ContainerUtil.createConcurrentSoftValueMap(), + PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, + resolveSession.exceptionTracker) }, false) @@ -93,15 +91,14 @@ class ResolveElementCache( } } - private val partialBodyResolveCache: CachedValue> = CachedValuesManager.getManager(project).createCachedValue( - object : CachedValueProvider> { - override fun compute(): CachedValueProvider.Result> { - return CachedValueProvider.Result.create(ContainerUtil.createConcurrentSoftValueMap(), - PsiModificationTracker.MODIFICATION_COUNT, - resolveSession.exceptionTracker) - } - }, - false) + private val partialBodyResolveCache: CachedValue> = + CachedValuesManager.getManager(project).createCachedValue( + CachedValueProvider> { + CachedValueProvider.Result.create(ContainerUtil.createConcurrentSoftValueMap(), + PsiModificationTracker.MODIFICATION_COUNT, + resolveSession.exceptionTracker) + }, + false) private fun probablyNothingCallableNames(): ProbablyNothingCallableNames { @@ -163,7 +160,9 @@ class ResolveElementCache( partialResolveMap[statement] = resolveToCache } } - partialResolveMap[resolveElement] = resolveToCache // we use the whole declaration key in the map to obtain resolve not inside any block (e.g. default parameter values) + + // we use the whole declaration key in the map to obtain resolve not inside any block (e.g. default parameter values) + partialResolveMap[resolveElement] = resolveToCache return bindingContext } @@ -256,7 +255,8 @@ class ResolveElementCache( } } - private fun performElementAdditionalResolve(resolveElement: KtElement, contextElement: KtElement, bodyResolveMode: BodyResolveMode): Pair { + private fun performElementAdditionalResolve(resolveElement: KtElement, contextElement: KtElement, + bodyResolveMode: BodyResolveMode): Pair { val file = resolveElement.getContainingKtFile() var statementFilterUsed = StatementFilter.NONE @@ -312,7 +312,7 @@ class ResolveElementCache( is KtTypeConstraint -> typeConstraintAdditionalResolve(resolveSession, resolveElement) - is KtCodeFragment -> codeFragmentAdditionalResolve(resolveSession, resolveElement, bodyResolveMode) + is KtCodeFragment -> codeFragmentAdditionalResolve(resolveElement, bodyResolveMode) else -> { if (resolveElement.getParentOfType(true) != null) { @@ -360,7 +360,7 @@ class ResolveElementCache( return resolveSession.trace } - private fun codeFragmentAdditionalResolve(resolveSession: ResolveSession, codeFragment: KtCodeFragment, bodyResolveMode: BodyResolveMode): BindingTrace { + private fun codeFragmentAdditionalResolve(codeFragment: KtCodeFragment, bodyResolveMode: BodyResolveMode): BindingTrace { val trace = createDelegatingTrace(codeFragment) val contextResolveMode = if (bodyResolveMode == BodyResolveMode.PARTIAL) @@ -418,7 +418,8 @@ class ResolveElementCache( return resolveSession.trace } - private fun delegationSpecifierAdditionalResolve(resolveSession: ResolveSession, ktElement: KtElement, classOrObject: KtClassOrObject, file: KtFile): BindingTrace { + private fun delegationSpecifierAdditionalResolve(resolveSession: ResolveSession, ktElement: KtElement, + classOrObject: KtClassOrObject, file: KtFile): BindingTrace { val trace = createDelegatingTrace(ktElement) val descriptor = resolveSession.resolveToDescriptor(classOrObject) as LazyClassDescriptor @@ -436,7 +437,8 @@ class ResolveElementCache( return trace } - private fun propertyAdditionalResolve(resolveSession: ResolveSession, property: KtProperty, file: KtFile, statementFilter: StatementFilter): BindingTrace { + private fun propertyAdditionalResolve(resolveSession: ResolveSession, property: KtProperty, + file: KtFile, statementFilter: StatementFilter): BindingTrace { val trace = createDelegatingTrace(property) val bodyResolver = createBodyResolver(resolveSession, trace, file, statementFilter) @@ -461,7 +463,8 @@ class ResolveElementCache( return trace } - private fun functionAdditionalResolve(resolveSession: ResolveSession, namedFunction: KtNamedFunction, file: KtFile, statementFilter: StatementFilter): BindingTrace { + private fun functionAdditionalResolve(resolveSession: ResolveSession, namedFunction: KtNamedFunction, file: KtFile, + statementFilter: StatementFilter): BindingTrace { val trace = createDelegatingTrace(namedFunction) val scope = resolveSession.declarationScopeProvider.getResolutionScopeForDeclaration(namedFunction) @@ -476,7 +479,8 @@ class ResolveElementCache( return trace } - private fun secondaryConstructorAdditionalResolve(resolveSession: ResolveSession, constructor: KtSecondaryConstructor, file: KtFile, statementFilter: StatementFilter): BindingTrace { + private fun secondaryConstructorAdditionalResolve(resolveSession: ResolveSession, constructor: KtSecondaryConstructor, + file: KtFile, statementFilter: StatementFilter): BindingTrace { val trace = createDelegatingTrace(constructor) val scope = resolveSession.declarationScopeProvider.getResolutionScopeForDeclaration(constructor) @@ -497,7 +501,8 @@ class ResolveElementCache( val classDescriptor = resolveSession.resolveToDescriptor(klass) as ClassDescriptor val constructorDescriptor = classDescriptor.unsubstitutedPrimaryConstructor - ?: error("Can't get primary constructor for descriptor '$classDescriptor' in from class '${klass.getElementTextWithContext()}'") + ?: error("Can't get primary constructor for descriptor '$classDescriptor' " + + "in from class '${klass.getElementTextWithContext()}'") val bodyResolver = createBodyResolver(resolveSession, trace, file, StatementFilter.NONE) bodyResolver.resolveConstructorParameterDefaultValuesAndAnnotations(DataFlowInfo.EMPTY, trace, klass, constructorDescriptor, scope) @@ -513,7 +518,8 @@ class ResolveElementCache( return trace } - private fun initializerAdditionalResolve(resolveSession: ResolveSession, anonymousInitializer: KtAnonymousInitializer, file: KtFile, statementFilter: StatementFilter): BindingTrace { + private fun initializerAdditionalResolve(resolveSession: ResolveSession, anonymousInitializer: KtAnonymousInitializer, + file: KtFile, statementFilter: StatementFilter): BindingTrace { val trace = createDelegatingTrace(anonymousInitializer) val classOrObjectDescriptor = resolveSession.resolveToDescriptor(anonymousInitializer.containingDeclaration) as LazyClassDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KotlinReferenceContributor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KotlinReferenceContributor.kt index c1ecd2b2af5..f1ab00da826 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KotlinReferenceContributor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KotlinReferenceContributor.kt @@ -19,14 +19,13 @@ package org.jetbrains.kotlin.idea.references import com.intellij.psi.PsiReference import com.intellij.psi.PsiReferenceRegistrar import org.jetbrains.kotlin.idea.kdoc.KDocReference -import org.jetbrains.kotlin.kdoc.psi.impl.KDocName import org.jetbrains.kotlin.lexer.KtTokens -import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.KtNameReferenceExpression class KotlinReferenceContributor() : AbstractKotlinReferenceContributor() { override fun registerReferenceProviders(registrar: PsiReferenceRegistrar) { with(registrar) { - registerProvider(factory = ::KtSimpleNameReference) + registerProvider(factory = ::KtSimpleNameReference) registerMultiProvider { if (it.getReferencedNameElementType() != KtTokens.IDENTIFIER) return@registerMultiProvider emptyArray() @@ -41,19 +40,19 @@ class KotlinReferenceContributor() : AbstractKotlinReferenceContributor() { } } - registerProvider(factory = ::KtConstructorDelegationReference) + registerProvider(factory = ::KtConstructorDelegationReference) - registerProvider(factory = ::KtInvokeFunctionReference) + registerProvider(factory = ::KtInvokeFunctionReference) - registerProvider(factory = ::KtArrayAccessReference) + registerProvider(factory = ::KtArrayAccessReference) - registerProvider(factory = ::KtForLoopInReference) + registerProvider(factory = ::KtForLoopInReference) - registerProvider(factory = ::KtPropertyDelegationMethodsReference) + registerProvider(factory = ::KtPropertyDelegationMethodsReference) - registerProvider(factory = ::KtDestructuringDeclarationReference) + registerProvider(factory = ::KtDestructuringDeclarationReference) - registerProvider(factory = ::KDocReference) + registerProvider(factory = ::KDocReference) } } }