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

Cleanup in idea plugin modules, idea-core

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-12-29 04:38:30 +03:00
parent 6ffc407158
commit 865fdd7962
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt
+1 -1
View File
@@ -378,7 +378,7 @@ class ExpectedInfos(
= getArgumentExpression()?.let { bindingContext.getType(it) }?.isError ?: true
private fun namedArgumentTail(argumentToParameter: Map<ValueArgument, ValueParameterDescriptor>, argumentName: Name, descriptor: FunctionDescriptor): Tail? {
val usedParameterNames = (argumentToParameter.values().map { it.getName() } + listOf(argumentName)).toSet()
val usedParameterNames = (argumentToParameter.values.map { it.getName() } + listOf(argumentName)).toSet()
val notUsedParameters = descriptor.getValueParameters().filter { it.getName() !in usedParameterNames }
return if (notUsedParameters.isEmpty())
Tail.RPARENTH // named arguments no supported for []
idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
+1 -1
View File
@@ -304,7 +304,7 @@ public class KotlinIndicesHelper(
val fqName = descriptor.importableFqName?.asString() ?: return false
return CodeInsightSettings.getInstance().EXCLUDED_PACKAGES
.any { excluded -> fqName == excluded || (fqName.startsWith(excluded) && fqName[excluded.length()] == '.') }
.any { excluded -> fqName == excluded || (fqName.startsWith(excluded) && fqName[excluded.length] == '.') }
}
private fun KtCallableDeclaration.resolveToDescriptorsWithHack(): Collection<CallableDescriptor> {
idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt
+5 -5
View File
@@ -244,16 +244,16 @@ public object KotlinNameSuggester {
for (prefix in ACCESSOR_PREFIXES) {
if (!s.startsWith(prefix)) continue
val len = prefix.length()
if (len < s.length() && Character.isUpperCase(s.charAt(len))) {
val len = prefix.length
if (len < s.length && Character.isUpperCase(s[len])) {
s = s.substring(len)
break
}
}
var upperCaseLetterBefore = false
for (i in 0..s.length() - 1) {
val c = s.charAt(i)
for (i in 0..s.length - 1) {
val c = s[i]
val upperCaseLetter = Character.isUpperCase(c)
if (i == 0) {
@@ -335,7 +335,7 @@ public object KotlinNameSuggester {
if (name == null || name.isEmpty()) return false
val lexer = KotlinLexer()
lexer.start(name, 0, name.length())
lexer.start(name, 0, name.length)
if (lexer.getTokenType() !== KtTokens.IDENTIFIER) return false
lexer.advance()
return lexer.getTokenType() == null
idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt
+2 -2
View File
@@ -73,7 +73,7 @@ public fun Call.mapArgumentsToParameters(targetDescriptor: CallableDescriptor):
positionalArgumentIndex = null
}
else {
if (positionalArgumentIndex != null && positionalArgumentIndex < parameters.size()) {
if (positionalArgumentIndex != null && positionalArgumentIndex < parameters.size) {
val parameter = parameters[positionalArgumentIndex]
map[argument] = parameter
@@ -90,7 +90,7 @@ public fun Call.mapArgumentsToParameters(targetDescriptor: CallableDescriptor):
public fun ImplicitReceiver.asExpression(resolutionScope: LexicalScope, psiFactory: KtPsiFactory): KtExpression? {
val expressionFactory = resolutionScope.getImplicitReceiversWithInstanceToExpression()
.entrySet()
.entries
.firstOrNull { it.key.getContainingDeclaration() == this.declarationDescriptor }
?.value ?: return null
return expressionFactory.createExpression(psiFactory)
idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt
+3 -3
View File
@@ -105,7 +105,7 @@ private fun generateProperty(project: Project, descriptor: PropertyDescriptor, b
descriptor.kind, /* copyOverrides = */ true) as PropertyDescriptor
newDescriptor.addOverriddenDescriptor(descriptor)
val body = StringBuilder {
val body = buildString {
append("\nget()")
append(" = ")
append(generateUnsupportedOrSuperCall(descriptor, bodyType))
@@ -143,7 +143,7 @@ public fun generateUnsupportedOrSuperCall(descriptor: CallableMemberDescriptor,
return "throw UnsupportedOperationException()"
}
else {
return StringBuilder {
return buildString {
append("super")
if (bodyType == OverrideMemberChooserObject.BodyType.QUALIFIED_SUPER) {
val superClassFqName = IdeDescriptorRenderers.SOURCE_CODE.renderClassifierName(descriptor.containingDeclaration as ClassifierDescriptor)
@@ -158,7 +158,7 @@ public fun generateUnsupportedOrSuperCall(descriptor: CallableMemberDescriptor,
}
paramTexts.joinTo(this, prefix="(", postfix=")")
}
}.toString()
}
}
}
idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt
+3 -3
View File
@@ -46,7 +46,7 @@ public class OverrideMembersHandler : OverrideImplementMembersHandler() {
}
}
val realSupers = byOriginalRealSupers.values().map { it.realSuper }
val realSupers = byOriginalRealSupers.values.map { it.realSuper }
val nonAbstractRealSupers = realSupers.filter { it.modality != Modality.ABSTRACT }
val realSupersToUse = if (nonAbstractRealSupers.isNotEmpty()) {
nonAbstractRealSupers
@@ -59,7 +59,7 @@ public class OverrideMembersHandler : OverrideImplementMembersHandler() {
val immediateSupers = byOriginalRealSupers[realSuper.original]!!.immediateSupers
assert(immediateSupers.isNotEmpty())
val immediateSuperToUse = if (immediateSupers.size() == 1) {
val immediateSuperToUse = if (immediateSupers.size == 1) {
immediateSupers.single()
}
else {
@@ -68,7 +68,7 @@ public class OverrideMembersHandler : OverrideImplementMembersHandler() {
val bodyType = if (immediateSuperToUse.modality == Modality.ABSTRACT)
OverrideMemberChooserObject.BodyType.EMPTY
else if (realSupersToUse.size() == 1)
else if (realSupersToUse.size == 1)
OverrideMemberChooserObject.BodyType.SUPER
else
OverrideMemberChooserObject.BodyType.QUALIFIED_SUPER
idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt
+1 -1
View File
@@ -93,7 +93,7 @@ public fun KtCallExpression.moveFunctionLiteralOutsideParentheses() {
val dummyCall = KtPsiFactory(this).createExpressionByPattern("foo()$0:'{}'", expression) as KtCallExpression
val functionLiteralArgument = dummyCall.getLambdaArguments().single()
this.add(functionLiteralArgument)
if (argumentList.getArguments().size() > 1) {
if (argumentList.getArguments().size > 1) {
argumentList.removeArgument(argument)
}
else {
idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt
+2 -2
View File
@@ -46,8 +46,8 @@ public open class DescriptorMemberChooserObject(
val parent = descriptor.containingDeclaration ?: error("No parent for $descriptor")
val declaration = if (psiElement is KtDeclaration) { // kotlin
PsiTreeUtil.getStubOrPsiParentOfType(psiElement, javaClass<KtNamedDeclaration>())
?: PsiTreeUtil.getStubOrPsiParentOfType(psiElement, javaClass<KtFile>())
PsiTreeUtil.getStubOrPsiParentOfType(psiElement, KtNamedDeclaration::class.java)
?: PsiTreeUtil.getStubOrPsiParentOfType(psiElement, KtFile::class.java)
}
else { // java or compiled
(psiElement as PsiMember).containingClass