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

Rename: SOURCE_CODE_SHORT_NAMES_IN_TYPES -> *_SHORT_NAMES_NO_ANNOTATIONS

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-05-15 13:14:00 +03:00
parent 06f7e77006
commit 0f2879aa32
43 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
+2 -2
View File
@@ -300,7 +300,7 @@ fun BasicLookupElementFactory.createLookupElementForType(type: KotlinType): Look
if (type.isError) return null
return if (type.isFunctionType) {
val text = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type)
val text = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(type)
val baseLookupElement = LookupElementBuilder.create(text).withIcon(KotlinIcons.LAMBDA)
BaseTypeLookupElement(type, baseLookupElement)
}
@@ -308,7 +308,7 @@ fun BasicLookupElementFactory.createLookupElementForType(type: KotlinType): Look
val classifier = type.constructor.declarationDescriptor ?: return null
val baseLookupElement = createLookupElement(classifier, qualifyNestedClasses = true, includeClassTypeArguments = false)
val itemText = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type)
val itemText = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(type)
val typeLookupElement = object : BaseTypeLookupElement(type, baseLookupElement) {
override fun renderElement(presentation: LookupElementPresentation) {
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LambdaSignatureTemplates.kt
+1 -1
View File
@@ -98,7 +98,7 @@ object LambdaSignatureTemplates {
}
fun signaturePresentation(lambdaType: KotlinType, presentationKind: SignaturePresentation): String {
fun typePresentation(type: KotlinType) = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type)
fun typePresentation(type: KotlinType) = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(type)
fun parameterPresentation(parameterType: KotlinType): String {
val name = parameterType.extractParameterNameFromFunctionTypeArgument()?.render()
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt
+1 -1
View File
@@ -47,7 +47,7 @@ class OverridesCompletion(
private val collector: LookupElementsCollector,
private val lookupElementFactory: BasicLookupElementFactory
) {
private val PRESENTATION_RENDERER = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.withOptions {
private val PRESENTATION_RENDERER = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.withOptions {
modifiers = emptySet()
includeAdditionalModifiers = false
}
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt
+1 -1
View File
@@ -177,7 +177,7 @@ class TypeInstantiationItems(
val allTypeArgsKnown = fuzzyType.freeParameters.isEmpty() || typeArgs.none { it.type.areTypeParametersUsedInside(fuzzyType.freeParameters) }
itemText += if (allTypeArgsKnown) {
IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderTypeArguments(typeArgsToUse)
IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderTypeArguments(typeArgsToUse)
}
else {
"<...>"