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

Partial code cleanup: can be private and some others applied

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-07-27 14:38:01 +03:00
parent 42f8a3e65b
commit c5a81691fb
126 changed files with 270 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
+7 -9
View File
@@ -290,15 +290,13 @@ object KeywordCompletion {
return buildFilterWithReducedContext("", null, position)
}
fun computeKeywordApplications(prefixText: String, keyword: KtKeywordToken): Sequence<String> {
return when (keyword) {
SUSPEND_KEYWORD -> sequenceOf("suspend () -> Unit>", "suspend X")
else -> {
if (prefixText.endsWith("@"))
sequenceOf(keyword.value + ":X Y.Z")
else
sequenceOf(keyword.value + " X")
}
private fun computeKeywordApplications(prefixText: String, keyword: KtKeywordToken): Sequence<String> = when (keyword) {
SUSPEND_KEYWORD -> sequenceOf("suspend () -> Unit>", "suspend X")
else -> {
if (prefixText.endsWith("@"))
sequenceOf(keyword.value + ":X Y.Z")
else
sequenceOf(keyword.value + " X")
}
}
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OperatorNameCompletion.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions.SET
object OperatorNameCompletion {
val additionalOperatorPresentation = mapOf(
private val additionalOperatorPresentation = mapOf(
SET to "[...] = ...",
GET to "[...]",
CONTAINS to "in !in",
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt
+2 -2
View File
@@ -153,7 +153,7 @@ class ReferenceVariantsCollector(
return ReferenceVariants(filterConfiguration.filterVariants(basicVariants).toHashSet(), emptyList())
}
fun doCollectExtensionVariants(filterConfiguration: FilterConfiguration, basicVariants: ReferenceVariants): ReferenceVariants {
private fun doCollectExtensionVariants(filterConfiguration: FilterConfiguration, basicVariants: ReferenceVariants): ReferenceVariants {
val (_, additionalPropertyNameFilter, shadowedDeclarationsFilter, completeExtensionsFromIndices) = filterConfiguration
if (completeExtensionsFromIndices) {
@@ -184,7 +184,7 @@ class ReferenceVariantsCollector(
return ReferenceVariants(emptyList(), emptyList())
}
fun <TDescriptor : DeclarationDescriptor> FilterConfiguration.filterVariants(_variants: Collection<TDescriptor>): Collection<TDescriptor> {
private fun <TDescriptor : DeclarationDescriptor> FilterConfiguration.filterVariants(_variants: Collection<TDescriptor>): Collection<TDescriptor> {
var variants = _variants
if (shadowedDeclarationsFilter != null)
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt
+8 -12
View File
@@ -56,20 +56,16 @@ class ToFromOriginalFileMapper private constructor(
shift = syntheticLength - originalLength
}
fun toOriginalFile(offset: Int): Int? {
return when {
offset <= completionOffset -> offset
offset >= syntheticLength - tailLength -> offset - shift
else -> null
}
private fun toOriginalFile(offset: Int): Int? = when {
offset <= completionOffset -> offset
offset >= syntheticLength - tailLength -> offset - shift
else -> null
}
fun toSyntheticFile(offset: Int): Int? {
return when {
offset <= completionOffset -> offset
offset >= originalLength - tailLength -> offset + shift
else -> null
}
private fun toSyntheticFile(offset: Int): Int? = when {
offset <= completionOffset -> offset
offset >= originalLength - tailLength -> offset + shift
else -> null
}
fun <TElement : PsiElement> toOriginalFile(element: TElement): TElement? {
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
+4 -1
View File
@@ -45,7 +45,10 @@ import org.jetbrains.kotlin.util.descriptorsEqualWithSubstitution
import java.util.*
class ArtificialElementInsertHandler(
val textBeforeCaret: String, val textAfterCaret: String, val shortenRefs: Boolean) : InsertHandler<LookupElement>{
private val textBeforeCaret: String,
private val textAfterCaret: String,
private val shortenRefs: Boolean
) : InsertHandler<LookupElement>{
override fun handleInsert(context: InsertionContext, item: LookupElement) {
val offset = context.editor.caretModel.offset
val startOffset = offset - item.lookupString.length