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

Cleanup in idea plugin modules, idea-analysis

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-12-29 04:26:39 +03:00
parent bce9514739
commit be590312f7
35 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+1 -1
View File
@@ -164,7 +164,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
val lightClasses = ArrayList<PsiClass>()
lightClasses.add(lightClassForFacade)
if (facadeFiles.size() > 1) {
if (facadeFiles.size > 1) {
lightClasses.addAll(facadeFiles.map {
FakeLightClassForFileOfPackage(lightClassForFacade, it)
})
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinOutOfBlockCompletionModificationTracker.kt
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.asJava.KotlinCodeBlockModificationListener
public class KotlinOutOfBlockCompletionModificationTracker() : SimpleModificationTracker() {
companion object {
public fun getInstance(project: Project): KotlinOutOfBlockCompletionModificationTracker
= ServiceManager.getService(project, javaClass<KotlinOutOfBlockCompletionModificationTracker>())!!
= ServiceManager.getService(project, KotlinOutOfBlockCompletionModificationTracker::class.java)!!
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+14 -14
View File
@@ -60,7 +60,7 @@ internal class PerFileAnalysisCache(val file: KtFile, val componentProvider: Com
descendantsOfCurrent.add(current)
}
cache.keySet().removeAll(toRemove)
cache.keys.removeAll(toRemove)
return result
}
@@ -109,18 +109,18 @@ internal class PerFileAnalysisCache(val file: KtFile, val componentProvider: Com
private object KotlinResolveDataProvider {
private val topmostElementTypes = arrayOf<Class<out PsiElement?>?>(
javaClass<KtNamedFunction>(),
javaClass<KtAnonymousInitializer>(),
javaClass<KtProperty>(),
javaClass<KtImportDirective>(),
javaClass<KtPackageDirective>(),
javaClass<KtCodeFragment>(),
KtNamedFunction::class.java,
KtAnonymousInitializer::class.java,
KtProperty::class.java,
KtImportDirective::class.java,
KtPackageDirective::class.java,
KtCodeFragment::class.java,
// TODO: Non-analyzable so far, add more granular analysis
javaClass<KtAnnotationEntry>(),
javaClass<KtTypeConstraint>(),
javaClass<KtSuperTypeList>(),
javaClass<KtTypeParameter>(),
javaClass<KtParameter>()
KtAnnotationEntry::class.java,
KtTypeConstraint::class.java,
KtSuperTypeList::class.java,
KtTypeParameter::class.java,
KtParameter::class.java
)
fun findAnalyzableParent(element: KtElement): KtElement {
@@ -134,12 +134,12 @@ private object KotlinResolveDataProvider {
is KtTypeConstraint,
is KtSuperTypeList,
is KtTypeParameter,
is KtParameter -> PsiTreeUtil.getParentOfType(topmostElement, javaClass<KtClassOrObject>(), javaClass<KtCallableDeclaration>())
is KtParameter -> PsiTreeUtil.getParentOfType(topmostElement, KtClassOrObject::class.java, KtCallableDeclaration::class.java)
else -> topmostElement
}
return analyzableElement
// if none of the above worked, take the outermost declaration
?: PsiTreeUtil.getTopmostParentOfType(element, javaClass<KtDeclaration>())
?: PsiTreeUtil.getTopmostParentOfType(element, KtDeclaration::class.java)
// if even that didn't work, take the whole file
?: element.getContainingKtFile()
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
+1 -1
View File
@@ -46,7 +46,7 @@ fun createModuleResolverProvider(
val allModuleInfos = collectAllModuleInfosFromIdeaModel(project).toHashSet()
val syntheticFilesByModule = syntheticFiles.groupBy { it.getModuleInfo() }
val syntheticFilesModules = syntheticFilesByModule.keySet()
val syntheticFilesModules = syntheticFilesByModule.keys
allModuleInfos.addAll(syntheticFilesModules)
val modulesToCreateResolversFor = allModuleInfos.filter(moduleFilter)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt
+1 -1
View File
@@ -98,7 +98,7 @@ internal class ResolutionFacadeImpl(
get() = projectFacade.findModuleDescriptor(moduleInfo)
override fun analyze(element: KtElement, bodyResolveMode: BodyResolveMode): BindingContext {
val resolveElementCache = getFrontendService(element, javaClass<ResolveElementCache>())
val resolveElementCache = getFrontendService(element, ResolveElementCache::class.java)
return resolveElementCache.resolveToElement(element, bodyResolveMode)
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt
+1 -1
View File
@@ -44,7 +44,7 @@ private class ExceptionTrackerWithProcessCanceledReport() : ExceptionTracker() {
companion object {
val LOG = Logger.getInstance(javaClass<ExceptionTrackerWithProcessCanceledReport>())
val LOG = Logger.getInstance(ExceptionTrackerWithProcessCanceledReport::class.java)
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/shortenWaitingSet.kt
+1 -1
View File
@@ -79,7 +79,7 @@ public fun performDelayedShortening(project: Project) {
}
}
private val LOG = Logger.getInstance(javaClass<Project>().getCanonicalName())
private val LOG = Logger.getInstance(Project::class.java.getCanonicalName())
public fun prepareElementsToShorten(project: Project) {
val elementsToShorten = project.elementsToShorten
idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
+1 -1
View File
@@ -33,7 +33,7 @@ import com.intellij.openapi.util.SimpleModificationTracker
class ModuleTypeCacheManager private constructor(project: Project) {
companion object {
@JvmStatic
fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<ModuleTypeCacheManager>())
fun getInstance(project: Project) = ServiceManager.getService(project, ModuleTypeCacheManager::class.java)
}
private val vfsModificationTracker = VfsModificationTracker(project)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtDecompiledFile.kt
+1 -1
View File
@@ -74,7 +74,7 @@ open class KtDecompiledFile(
private fun DeclarationDescriptor.findElementForDescriptor(): KtDeclaration? {
return decompiledText.get().renderedDescriptorsToRange[descriptorToKey(this)]?.let { range ->
PsiTreeUtil.findElementOfClassAtRange(this@KtDecompiledFile, range.getStartOffset(), range.getEndOffset(), javaClass<KtDeclaration>())
PsiTreeUtil.findElementOfClassAtRange(this@KtDecompiledFile, range.getStartOffset(), range.getEndOffset(), KtDeclaration::class.java)
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+2 -2
View File
@@ -107,7 +107,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
val typeArgumentsListStub = KotlinPlaceHolderStubImpl<KtTypeArgumentList>(typeStub, KtStubElementTypes.TYPE_ARGUMENT_LIST)
typeArgumentProtoList.forEach { typeArgumentProto ->
val projectionKind = typeArgumentProto.projection.toProjectionKind()
val typeProjection = KotlinTypeProjectionStubImpl(typeArgumentsListStub, projectionKind.ordinal())
val typeProjection = KotlinTypeProjectionStubImpl(typeArgumentsListStub, projectionKind.ordinal)
if (projectionKind != KtProjectionKind.STAR) {
val modifierKeywordToken = projectionKind.token as? KtModifierKeywordToken
createModifierListStub(typeProjection, modifierKeywordToken.singletonOrEmptyList())
@@ -135,7 +135,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
val parameterList = KotlinPlaceHolderStubImpl<KtParameterList>(functionType, KtStubElementTypes.VALUE_PARAMETER_LIST)
val typeArgumentsWithoutReceiverAndReturnType
= typeArgumentList.subList(if (isExtensionFunctionType) 1 else 0, typeArgumentList.size() - 1)
= typeArgumentList.subList(if (isExtensionFunctionType) 1 else 0, typeArgumentList.size - 1)
typeArgumentsWithoutReceiverAndReturnType.forEach { argument ->
val parameter = KotlinParameterStubImpl(
parameterList, fqName = null, name = null, isMutable = false, hasValOrVar = false, hasDefaultValue = false
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt
+2 -2
View File
@@ -107,7 +107,7 @@ public fun buildDecompiledText(
// descriptor instanceof PropertyDescriptor
builder.append(" ").append(DECOMPILED_CODE_COMMENT)
}
endOffset = builder.length()
endOffset = builder.length
}
}
else if (descriptor is ClassDescriptor && !isEnumEntry(descriptor)) {
@@ -160,7 +160,7 @@ public fun buildDecompiledText(
}
builder.append(indent).append("}")
endOffset = builder.length()
endOffset = builder.length
}
builder.append("\n")
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.util.OperatorNameConventions
public class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(javaClass(), "Replace overloaded operator with function call") {
public class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(KtExpression::class.java, "Replace overloaded operator with function call") {
companion object {
private fun isApplicablePrefix(element: KtPrefixExpression, caretOffset: Int): Boolean {
val opRef = element.getOperationReference()
idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocElementFactory.kt
+1 -1
View File
@@ -28,7 +28,7 @@ class KDocElementFactory(val project: Project) {
public fun createKDocFromText(text: String): KDoc {
val fileText = text + " fun foo { }"
val function = KtPsiFactory(project).createDeclaration<KtFunction>(fileText)
return PsiTreeUtil.findChildOfType(function, javaClass<KDoc>())!!
return PsiTreeUtil.findChildOfType(function, KDoc::class.java)!!
}
public fun createNameFromText(text: String): KDocName {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+13 -13
View File
@@ -204,19 +204,19 @@ public class ResolveElementCache(
private fun findElementOfAdditionalResolve(element: KtElement): KtElement? {
val elementOfAdditionalResolve = KtPsiUtil.getTopmostParentOfTypes(
element,
javaClass<KtNamedFunction>(),
javaClass<KtAnonymousInitializer>(),
javaClass<KtSecondaryConstructor>(),
javaClass<KtProperty>(),
javaClass<KtParameter>(),
javaClass<KtSuperTypeList>(),
javaClass<KtInitializerList>(),
javaClass<KtImportList>(),
javaClass<KtAnnotationEntry>(),
javaClass<KtTypeParameter>(),
javaClass<KtTypeConstraint>(),
javaClass<KtPackageDirective>(),
javaClass<KtCodeFragment>()) as KtElement?
KtNamedFunction::class.java,
KtAnonymousInitializer::class.java,
KtSecondaryConstructor::class.java,
KtProperty::class.java,
KtParameter::class.java,
KtSuperTypeList::class.java,
KtInitializerList::class.java,
KtImportList::class.java,
KtAnnotationEntry::class.java,
KtTypeParameter::class.java,
KtTypeConstraint::class.java,
KtPackageDirective::class.java,
KtCodeFragment::class.java) as KtElement?
when (elementOfAdditionalResolve) {
null -> {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.kt
+1 -1
View File
@@ -53,7 +53,7 @@ public class QuickFixes {
}
companion object {
public fun getInstance(): QuickFixes = ServiceManager.getService(javaClass<QuickFixes>())
public fun getInstance(): QuickFixes = ServiceManager.getService(QuickFixes::class.java)
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KotlinReferenceContributor.kt
+9 -9
View File
@@ -27,11 +27,11 @@ import org.jetbrains.kotlin.psi.*
public class KotlinReferenceContributor() : PsiReferenceContributor() {
public override fun registerReferenceProviders(registrar: PsiReferenceRegistrar) {
with(registrar) {
registerProvider(javaClass<KtSimpleNameExpression>()) {
registerProvider(KtSimpleNameExpression::class.java) {
KtSimpleNameReference(it)
}
registerMultiProvider(javaClass<KtNameReferenceExpression>()) {
registerMultiProvider(KtNameReferenceExpression::class.java) {
if (it.getReferencedNameElementType() != KtTokens.IDENTIFIER) return@registerMultiProvider emptyArray()
when (it.readWriteAccess(useResolveForReadWrite = false)) {
@@ -41,31 +41,31 @@ public class KotlinReferenceContributor() : PsiReferenceContributor() {
}
}
registerProvider(javaClass<KtConstructorDelegationReferenceExpression>()) {
registerProvider(KtConstructorDelegationReferenceExpression::class.java) {
KtConstructorDelegationReference(it)
}
registerProvider(javaClass<KtCallExpression>()) {
registerProvider(KtCallExpression::class.java) {
KtInvokeFunctionReference(it)
}
registerProvider(javaClass<KtArrayAccessExpression>()) {
registerProvider(KtArrayAccessExpression::class.java) {
KtArrayAccessReference(it)
}
registerProvider(javaClass<KtForExpression>()) {
registerProvider(KtForExpression::class.java) {
KtForLoopInReference(it)
}
registerProvider(javaClass<KtPropertyDelegate>()) {
registerProvider(KtPropertyDelegate::class.java) {
KtPropertyDelegationMethodsReference(it)
}
registerProvider(javaClass<KtDestructuringDeclaration>()) {
registerProvider(KtDestructuringDeclaration::class.java) {
KtDestructuringDeclarationReference(it)
}
registerProvider(javaClass<KDocName>()) {
registerProvider(KDocName::class.java) {
KDocReference(it)
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
+1 -1
View File
@@ -48,7 +48,7 @@ public abstract class AbstractKtReference<T : KtElement>(element: T)
override fun resolve(): PsiElement? {
val psiElements = resolveToPsiElements()
if (psiElements.size() == 1) {
if (psiElements.size == 1) {
return psiElements.iterator().next()
}
return null
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
+1 -1
View File
@@ -159,7 +159,7 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
if (shorteningMode == ShorteningMode.NO_SHORTENING) return newExpression
val needToShorten =
PsiTreeUtil.getParentOfType(expression, javaClass<KtImportDirective>(), javaClass<KtPackageDirective>()) == null
PsiTreeUtil.getParentOfType(expression, KtImportDirective::class.java, KtPackageDirective::class.java) == null
if (needToShorten) {
if (shorteningMode == ShorteningMode.FORCED_SHORTENING) {
ShortenReferences.DEFAULT.process(newQualifiedElement)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
+2 -2
View File
@@ -101,7 +101,7 @@ public fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean {
}
if ((parent as? PsiNewExpression)?.resolveConstructor()?.unwrapped == unwrappedCandidate) return true
}
if (this is PsiJavaCodeReferenceElement && candidateTarget is KtObjectDeclaration && unwrappedTargets.size() == 1) {
if (this is PsiJavaCodeReferenceElement && candidateTarget is KtObjectDeclaration && unwrappedTargets.size == 1) {
val referredClass = unwrappedTargets.first()
if (referredClass is KtClass && candidateTarget in referredClass.getCompanionObjects()) {
if (getParent() is PsiImportStaticStatement) return true
@@ -173,7 +173,7 @@ public fun KtExpression.readWriteAccess(useResolveForReadWrite: Boolean): Refere
val bindingContext = assignment.analyze(BodyResolveMode.PARTIAL)
val resolvedCall = assignment.getResolvedCall(bindingContext) ?: return ReferenceAccess.READ_WRITE
if (!resolvedCall.isReallySuccess()) return ReferenceAccess.READ_WRITE
return if (resolvedCall.resultingDescriptor.name in OperatorConventions.ASSIGNMENT_OPERATIONS.values())
return if (resolvedCall.resultingDescriptor.name in OperatorConventions.ASSIGNMENT_OPERATIONS.values)
ReferenceAccess.READ
else
ReferenceAccess.READ_WRITE
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexPatternBuilder.kt
+1 -1
View File
@@ -40,7 +40,7 @@ public class KotlinIndexPatternBuilder: IndexPatternBuilder {
override fun getCommentStartDelta(tokenType: IElementType?): Int = 0
override fun getCommentEndDelta(tokenType: IElementType?): Int = when(tokenType) {
KtTokens.BLOCK_COMMENT -> "*/".length()
KtTokens.BLOCK_COMMENT -> "*/".length
else -> 0
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexers.kt
+1 -1
View File
@@ -86,7 +86,7 @@ class KotlinFilterLexer(private val occurrenceConsumer: OccurrenceConsumer): Bas
}
if (tokenType != TokenType.WHITE_SPACE && tokenType !in commentTokens) {
if (prevTokens.size() == MAX_PREV_TOKENS) {
if (prevTokens.size == MAX_PREV_TOKENS) {
prevTokens.removeLast()
}
prevTokens.addFirst(tokenType)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt
+1 -1
View File
@@ -83,7 +83,7 @@ public object KotlinPsiMethodOverridersSearch : HierarchySearch<PsiMethod>(PsiMe
}
}
return classToMethod.values()
return classToMethod.values
}
override fun isApplicable(request: HierarchySearchRequest<PsiMethod>): Boolean =
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/conventions.kt
+3 -3
View File
@@ -27,9 +27,9 @@ import org.jetbrains.kotlin.util.OperatorNameConventions
public val ALL_SEARCHABLE_OPERATIONS: ImmutableSet<KtToken> = ImmutableSet
.builder<KtToken>()
.addAll(UNARY_OPERATION_NAMES.keySet())
.addAll(BINARY_OPERATION_NAMES.keySet())
.addAll(ASSIGNMENT_OPERATIONS.keySet())
.addAll(UNARY_OPERATION_NAMES.keys)
.addAll(BINARY_OPERATION_NAMES.keys)
.addAll(ASSIGNMENT_OPERATIONS.keys)
.addAll(COMPARISON_OPERATIONS)
.addAll(EQUALS_OPERATIONS)
.addAll(IDENTITY_EQUALS_OPERATIONS)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
+1 -1
View File
@@ -59,7 +59,7 @@ private fun <TDeclaration : KtCallableDeclaration> KtTypeElement.index(declarati
is KtNullableType -> getInnerType()?.index(declaration, sink)
is KtFunctionType -> {
val arity = getParameters().size() + (if (getReceiverTypeReference() != null) 1 else 0)
val arity = getParameters().size + (if (getReceiverTypeReference() != null) 1 else 0)
occurrence("Function$arity")
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
+1 -1
View File
@@ -29,7 +29,7 @@ public class KotlinTopLevelExtensionsByReceiverTypeIndex private constructor() :
= super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project))
companion object {
private val KEY = KotlinIndexUtil.createIndexKey<String, KtCallableDeclaration>(javaClass<KotlinTopLevelExtensionsByReceiverTypeIndex>())
private val KEY = KotlinIndexUtil.createIndexKey<String, KtCallableDeclaration>(KotlinTopLevelExtensionsByReceiverTypeIndex::class.java)
private val SEPARATOR = '\n'
public val INSTANCE: KotlinTopLevelExtensionsByReceiverTypeIndex = KotlinTopLevelExtensionsByReceiverTypeIndex()
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
+1 -1
View File
@@ -66,7 +66,7 @@ public object PackageIndexUtil {
): Boolean {
var result = false
StubIndex.getInstance().processElements<String, KtFile>(
KotlinExactPackagesIndex.getInstance().getKey(), packageFqName.asString(), project, searchScope, javaClass<KtFile>()
KotlinExactPackagesIndex.getInstance().getKey(), packageFqName.asString(), project, searchScope, KtFile::class.java
) {
result = true
false
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
+2 -2
View File
@@ -67,7 +67,7 @@ public class SubpackagesIndexService(private val project: Project) {
fun getSubpackages(fqName: FqName, scope: GlobalSearchScope, nameFilter: (Name) -> Boolean): Collection<FqName> {
val possibleFilesFqNames = fqNameByPrefix[fqName]
val existingSubPackagesShortNames = HashSet<Name>()
val len = fqName.pathSegments().size()
val len = fqName.pathSegments().size
for (filesFqName in possibleFilesFqNames) {
val candidateSubPackageShortName = filesFqName.pathSegments()[len]
if (candidateSubPackageShortName in existingSubPackagesShortNames || !nameFilter(candidateSubPackageShortName)) continue
@@ -84,7 +84,7 @@ public class SubpackagesIndexService(private val project: Project) {
companion object {
public fun getInstance(project: Project): SubpackagesIndex {
return ServiceManager.getService(project, javaClass<SubpackagesIndexService>())!!.cachedValue.getValue()!!
return ServiceManager.getService(project, SubpackagesIndexService::class.java)!!.cachedValue.getValue()!!
}
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
+1 -1
View File
@@ -36,7 +36,7 @@ abstract class ImportInsertHelper {
companion object {
@JvmStatic
public fun getInstance(project: Project): ImportInsertHelper
= ServiceManager.getService<ImportInsertHelper>(project, javaClass<ImportInsertHelper>())
= ServiceManager.getService<ImportInsertHelper>(project, ImportInsertHelper::class.java)
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt
+4 -4
View File
@@ -26,7 +26,7 @@ import java.util.*
public object PsiPrecedences {
private val LOG = Logger.getInstance(javaClass<PsiPrecedences>())
private val LOG = Logger.getInstance(PsiPrecedences::class.java)
private val precedence: Map<IElementType, Int>
init {
@@ -40,8 +40,8 @@ public object PsiPrecedences {
}
public val PRECEDENCE_OF_ATOMIC_EXPRESSION: Int = -1
public val PRECEDENCE_OF_PREFIX_EXPRESSION: Int = PREFIX.ordinal()
public val PRECEDENCE_OF_POSTFIX_EXPRESSION: Int = POSTFIX.ordinal()
public val PRECEDENCE_OF_PREFIX_EXPRESSION: Int = PREFIX.ordinal
public val PRECEDENCE_OF_POSTFIX_EXPRESSION: Int = POSTFIX.ordinal
public fun getPrecedence(expression: KtExpression): Int {
return when (expression) {
@@ -54,7 +54,7 @@ public object PsiPrecedences {
val precedenceNumber = precedence[operation]
if (precedenceNumber == null) {
LOG.error("No precedence for operation: " + operation)
precedence.size()
precedence.size
}
else precedenceNumber
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
+3 -3
View File
@@ -176,7 +176,7 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D
private fun dropNestedElements(elements: List<KtElement>): LinkedHashSet<KtElement> {
val elementSet = elements.toSet()
val newElements = LinkedHashSet<KtElement>(elementSet.size())
val newElements = LinkedHashSet<KtElement>(elementSet.size)
for (element in elementSet) {
if (!element.parents.any { it in elementSet }) {
newElements.add(element)
@@ -337,7 +337,7 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D
if (PsiTreeUtil.getParentOfType(
qualifiedExpression,
javaClass<KtImportDirective>(), javaClass<KtPackageDirective>()) != null) return true
KtImportDirective::class.java, KtPackageDirective::class.java) != null) return true
val selector = qualifiedExpression.getSelectorExpression() ?: return false
val callee = selector.getCalleeExpressionIfAny() as? KtReferenceExpression ?: return false
@@ -441,7 +441,7 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D
if (PsiTreeUtil.getParentOfType(
qualifiedExpression,
javaClass<KtImportDirective>(), javaClass<KtPackageDirective>()) != null) return false
KtImportDirective::class.java, KtPackageDirective::class.java) != null) return false
val receiverTarget = receiver.singleTarget(bindingContext) ?: return false
if (receiverTarget !is ClassDescriptor) return false
idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinder.kt
+3 -3
View File
@@ -38,8 +38,8 @@ public class IDEVirtualFileFinder(private val scope: GlobalSearchScope) : Virtua
val files = FileBasedIndex.getInstance().getContainingFiles<FqName, Void>(key, classId.asSingleFqName(), scope)
if (files.isEmpty()) return null
if (files.size() > 1) {
LOG.warn("There are " + files.size() + " classes with same fqName: " + classId + " found.")
if (files.size > 1) {
LOG.warn("There are " + files.size + " classes with same fqName: " + classId + " found.")
}
return files.iterator().next()
}
@@ -47,6 +47,6 @@ public class IDEVirtualFileFinder(private val scope: GlobalSearchScope) : Virtua
override fun findVirtualFileWithHeader(classId: ClassId): VirtualFile? = findVirtualFileWithHeader(classId, KotlinClassFileIndex.KEY)
companion object {
private val LOG = Logger.getInstance(javaClass<IDEVirtualFileFinder>())
private val LOG = Logger.getInstance(IDEVirtualFileFinder::class.java)
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinder.kt
+1 -1
View File
@@ -25,6 +25,6 @@ public interface JsVirtualFileFinder : VirtualFileFinder {
public object SERVICE {
@JvmStatic
public fun getInstance(project: Project): JsVirtualFileFinder =
ServiceManager.getService(project, javaClass<JsVirtualFileFinderFactory>()).create(GlobalSearchScope.allScope(project))
ServiceManager.getService(project, JsVirtualFileFinderFactory::class.java).create(GlobalSearchScope.allScope(project))
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinderFactory.kt
+1 -1
View File
@@ -27,6 +27,6 @@ public interface JsVirtualFileFinderFactory : VirtualFileFinderFactory {
public object SERVICE {
@JvmStatic
public fun getInstance(project: Project): JsVirtualFileFinderFactory =
ServiceManager.getService(project, javaClass<JsVirtualFileFinderFactory>())
ServiceManager.getService(project, JsVirtualFileFinderFactory::class.java)
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileFinders.kt
+4 -4
View File
@@ -37,8 +37,8 @@ private fun findVirtualFileWithHeader(classId: ClassId, key: ID<FqName, Void>, s
val files = FileBasedIndex.getInstance().getContainingFiles<FqName, Void>(key, classId.asSingleFqName(), scope)
if (files.isEmpty()) return null
if (files.size() > 1) {
logger.warn("There are " + files.size() + " classes with same fqName: " + classId + " found.")
if (files.size > 1) {
logger.warn("There are " + files.size + " classes with same fqName: " + classId + " found.")
}
return files.iterator().next()
}
@@ -51,7 +51,7 @@ public class JsIDEVirtualFileFinder(private val scope: GlobalSearchScope) : JsVi
findVirtualFileWithHeader(classId, KotlinJavaScriptMetaFileIndex.KEY, scope, LOG)
companion object {
private val LOG = Logger.getInstance(javaClass<JsIDEVirtualFileFinder>())
private val LOG = Logger.getInstance(JsIDEVirtualFileFinder::class.java)
}
}
@@ -63,7 +63,7 @@ public class JvmIDEVirtualFileFinder(private val scope: GlobalSearchScope) : Vir
findVirtualFileWithHeader(classId, KotlinClassFileIndex.KEY, scope, LOG)
companion object {
private val LOG = Logger.getInstance(javaClass<JvmIDEVirtualFileFinder>())
private val LOG = Logger.getInstance(JvmIDEVirtualFileFinder::class.java)
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt
+2 -2
View File
@@ -27,7 +27,7 @@ import java.io.DataOutput
public object KotlinModuleMappingIndex : FileBasedIndexExtension<String, PackageParts>() {
private val classOfIndex = javaClass<KotlinModuleMappingIndex>().getCanonicalName()
private val classOfIndex = KotlinModuleMappingIndex::class.java.getCanonicalName()
public val KEY: ID<String, PackageParts> = ID.create(classOfIndex)
@@ -55,7 +55,7 @@ public object KotlinModuleMappingIndex : FileBasedIndexExtension<String, Package
override fun save(out: DataOutput, value: PackageParts?) {
out.writeUTF(value!!.packageFqName)
out.writeInt(value.parts.size())
out.writeInt(value.parts.size)
value.parts.forEach { out.writeUTF(it) }
}
}