Rendering "constructor" instead of "ctor".

compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java

@@ -435,7 +435,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
         renderAnnotations(constructor, builder);
         renderVisibility(constructor.getVisibility(), builder);
 
-        builder.append(renderKeyword("ctor")).append(" ");
+        builder.append(renderKeyword("constructor")).append(" ");
 
         ClassDescriptor classDescriptor = constructor.getContainingDeclaration();
         renderName(classDescriptor, builder);

compiler/testData/renderer/Classes.kt

@@ -30,25 +30,25 @@ public trait TwoUpperBounds<T> where T: Number, T: Any
 
 //package rendererTest defined in root package
 //internal final annotation class TheAnnotation : jet.Annotation defined in rendererTest
-//public ctor TheAnnotation() defined in rendererTest.TheAnnotation
+//public constructor TheAnnotation() defined in rendererTest.TheAnnotation
 //rendererTest.TheAnnotation public open class TheClass<out T : jet.Int, X> defined in rendererTest
-//public ctor TheClass<out T : jet.Int, X>() defined in rendererTest.TheClass
+//public constructor TheClass<out T : jet.Int, X>() defined in rendererTest.TheClass
 //<out T : jet.Int> defined in rendererTest.TheClass
 //<X> defined in rendererTest.TheClass
 //private final val privateVal : jet.Int defined in rendererTest.TheClass
 //internal final val shouldBeFinal : jet.Int defined in rendererTest.TheClass
 //protected abstract fun foo() : Unit defined in rendererTest.TheClass
 //private final class Inner defined in rendererTest.TheClass
-//public ctor Inner() defined in rendererTest.TheClass.Inner
+//public constructor Inner() defined in rendererTest.TheClass.Inner
 //internal final class InternalClass defined in rendererTest
-//public ctor InternalClass() defined in rendererTest.InternalClass
+//public constructor InternalClass() defined in rendererTest.InternalClass
 //internal trait TheTrait defined in rendererTest
 //internal abstract fun abstractFun() : Unit defined in rendererTest.TheTrait
 //class object : rendererTest.TheClass<jet.Int, jet.Int> defined in rendererTest.TheTrait
-//private ctor <class-object-for-TheTrait>() defined in rendererTest.TheTrait.<class-object-for-TheTrait>
+//private constructor <class-object-for-TheTrait>() defined in rendererTest.TheTrait.<class-object-for-TheTrait>
 //internal final fun classObjectFunction() : jet.Int defined in rendererTest.TheTrait.<class-object-for-TheTrait>
 //public final class WithReified<reified A, reified out B> defined in rendererTest
-//public ctor WithReified<reified A, reified out B>() defined in rendererTest.WithReified
+//public constructor WithReified<reified A, reified out B>() defined in rendererTest.WithReified
 //<reified A> defined in rendererTest.WithReified
 //<reified out B> defined in rendererTest.WithReified
 //public trait TwoUpperBounds<T> where T : jet.Number, T : jet.Any defined in rendererTest

compiler/testData/renderer/Enum.kt

@@ -6,8 +6,8 @@ private enum class TheEnum(val rgb : Int) {
 
 //package rendererTest defined in root package
 //private final enum class TheEnum : jet.Enum<rendererTest.TheEnum> defined in rendererTest
-//private ctor TheEnum(rgb : jet.Int) defined in rendererTest.TheEnum
+//private constructor TheEnum(rgb : jet.Int) defined in rendererTest.TheEnum
 //value-parameter val rgb : jet.Int defined in rendererTest.TheEnum.<init>
 //private final enum entry VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>
-//private ctor VAL1() defined in rendererTest.TheEnum.<class-object-for-TheEnum>.VAL1
+//private constructor VAL1() defined in rendererTest.TheEnum.<class-object-for-TheEnum>.VAL1
 //public final val VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>

compiler/testData/renderer/InheritedMembersVisibility.kt

@@ -21,7 +21,7 @@ class B : A {
 //private abstract fun <set-int>(<set-?> : jet.Int) : Unit defined in A
 //protected abstract fun f() : jet.Int defined in A
 //internal final class B : A defined in root package
-//public ctor B() defined in B
+//public constructor B() defined in B
 //public open var int : jet.Int defined in B
 //public open fun <get-int>() : jet.Int defined in B
 //private open fun <set-int>(<set-?> : jet.Int) : Unit defined in B

compiler/testData/renderer/KeywordsInNames.kt

@@ -14,15 +14,15 @@ val `in` = `class`<`trait`>(null)
 fun `trait`.`fun`(`false`: `trait`): `trait`
 
 //internal final annotation class `true` : jet.Annotation defined in root package
-//public ctor `true`() defined in `true`
+//public constructor `true`() defined in `true`
 //internal final val `val` : jet.Int defined in root package
 //`true` internal trait `trait` defined in root package
 //internal final class `class`<`in`> defined in root package
-//public ctor `class`<`in`>(p : `in`?) defined in `class`
+//public constructor `class`<`in`>(p : `in`?) defined in `class`
 //<`in`> defined in `class`
 //value-parameter val p : `in`? defined in `class`.<init>
 //internal final class `class` defined in `class`
-//public ctor `class`() defined in `class`.`class`
+//public constructor `class`() defined in `class`.`class`
 //internal final val `is` : `class`.`class` defined in root package
 //internal final val `in` : `class`<`trait`> defined in root package
 //internal final fun `trait`.`fun`(`false` : `trait`) : `trait` defined in root package

idea/testData/diagnosticMessage/conflictingSubstitutions2.html

@@ -8,7 +8,7 @@ T</b>
 </td>
 <td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;">
 <b>
-ctor</b>
+constructor</b>
  Cons&lt;T, E : java.lang.Cloneable>
 </td>
 <td style="white-space:nowrap;font-weight:bold;">