Revert commit with changes in DescriptorRenderer

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt

@@ -246,10 +246,6 @@ interface DescriptorRendererOptions {
     var parameterNamesInFunctionalTypes: Boolean
     var renderFunctionContracts: Boolean
     var presentableUnresolvedTypes: Boolean
-
-    var renderContextNearLocalVariable: Boolean
-    var fullContextForLocalVariable: Boolean
-    var useBaseClassAsReceiver: Boolean
 }
 
 object ExcludedTypeAnnotations {

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt

@@ -106,17 +106,6 @@ internal class DescriptorRendererImpl(
 
     private fun renderFqName(pathSegments: List<Name>) = escape(org.jetbrains.kotlin.renderer.renderFqName(pathSegments))
 
-    private fun renderFqNameForLocalVariables(fqName: FqNameUnsafe): String =
-        if (fqName.isRoot) {
-            "<root>"
-        } else {
-            if (fullContextForLocalVariable) {
-                renderFqName(fqName)
-            } else {
-                renderFqName(fqName).substringAfterLast(".")
-            }
-        }.replace(".", "/")
-
     override fun renderClassifierName(klass: ClassifierDescriptor): String = if (ErrorUtils.isError(klass)) {
         klass.typeConstructor.toString()
     } else
@@ -720,8 +709,6 @@ internal class DescriptorRendererImpl(
 
     private fun renderReceiver(callableDescriptor: CallableDescriptor, builder: StringBuilder) {
         val receiver = callableDescriptor.extensionReceiverParameter
-            ?: (if (useBaseClassAsReceiver) callableDescriptor.dispatchReceiverParameter else null)
-        val extensionIsNull = callableDescriptor.extensionReceiverParameter == null
         if (receiver != null) {
             builder.renderAnnotations(receiver, AnnotationUseSiteTarget.RECEIVER)
 
@@ -730,8 +717,7 @@ internal class DescriptorRendererImpl(
             if (shouldRenderAsPrettyFunctionType(type) && !TypeUtils.isNullableType(type)) {
                 result = "($result)"
             }
-            // @ symbol is used to distinguish extension receiver from dispatch
+            builder.append(result).append(".")
-            builder.append(result).append(if (extensionIsNull) "@" else ".")
         }
     }
 
@@ -823,7 +809,7 @@ internal class DescriptorRendererImpl(
         builder: StringBuilder,
         topLevel: Boolean
     ) {
-        if (topLevel && !renderContextNearLocalVariable) {
+        if (topLevel) {
             builder.append(renderKeyword("value-parameter")).append(" ")
         }
 
@@ -876,11 +862,6 @@ internal class DescriptorRendererImpl(
 
         if (includeName) {
             renderName(variable, builder, topLevel)
-            if (topLevel && renderContextNearLocalVariable) {
-                val containingDeclaration = variable.containingDeclaration
-                val fqName = DescriptorUtils.getFqName(containingDeclaration)
-                builder.append("@").append(renderFqNameForLocalVariables(fqName))
-            }
             builder.append(": ")
         }
 

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt

@@ -127,8 +127,4 @@ internal class DescriptorRendererOptionsImpl : DescriptorRendererOptions {
     override var presentableUnresolvedTypes: Boolean by property(false)
 
     override var boldOnlyForNamesInHtml: Boolean by property(false)
-
-    override var renderContextNearLocalVariable by property(false)
-    override var fullContextForLocalVariable by property(false)
-    override var useBaseClassAsReceiver by property(false)
 }