Tweak keyword completion for lateinit and companion object

#KT-13673 fixed
 #KT-12293 fixed

idea/idea-completion/testData/handlers/keywords/CompanionObject.kt.after

@@ -1,3 +1,5 @@
 class C {
-    companion object<caret>
+    companion object {
+        <caret>
+    }
 }

idea/idea-completion/testData/keywords/AfterClassProperty.kt

@@ -29,11 +29,11 @@ class MouseMovedEventArgs
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST:  companion object
+// EXIST: { itemText: "companion object", tailText: " {...}" }
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/AfterFuns.kt

@@ -28,11 +28,11 @@ class A {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST:  companion object
+// EXIST: { itemText: "companion object", tailText: " {...}" }
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt

@@ -3,4 +3,4 @@ class TestClass {
     object O {}
 }
 
-// EXIST: "companion object"
+// EXIST: { itemText: "companion object", tailText: " {...}" }

idea/idea-completion/testData/keywords/InAnnotationClassScope.kt

@@ -18,7 +18,7 @@ annotation class Test {
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/InClassBeforeFun.kt

@@ -26,11 +26,11 @@ public class Test {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST:  companion object
+// EXIST: { itemText: "companion object", tailText: " {...}" }
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/InClassScope.kt

@@ -20,11 +20,11 @@ class TestClass {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST:  companion object
+// EXIST:  { itemText: "companion object", tailText: " {...}" }
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/InEnumScope2.kt

@@ -14,11 +14,11 @@ enum class Test {
 // EXIST:  private
 // EXIST:  protected
 // EXIST:  public
-// EXIST:  companion object
+// EXIST: { itemText: "companion object", tailText: " {...}" }
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/InInterfaceScope.kt

@@ -16,11 +16,11 @@ interface Test {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST:  companion object
+// EXIST: { itemText: "companion object", tailText: " {...}" }
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/InObjectScope.kt

@@ -21,7 +21,7 @@ object Test {
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt

@@ -18,5 +18,5 @@ class TestSample(<caret>)
 /* TODO: keywords below should not be here*/
 // EXIST: abstract
 // EXIST: const
-// EXIST: lateinit
+// EXIST: lateinit var
 // NOTHING_ELSE

idea/idea-completion/testData/keywords/PropertyAccessors.kt

@@ -28,11 +28,11 @@ class Some {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST:  companion object
+// EXIST: { itemText: "companion object", tailText: " {...}" }
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/PropertyAccessors2.kt

@@ -28,11 +28,11 @@ class Some {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST:  companion object
+// EXIST: { itemText: "companion object", tailText: " {...}" }
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec

idea/idea-completion/testData/keywords/PropertySetter.kt

@@ -26,11 +26,11 @@ class Some {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST:  companion object
+// EXIST: { itemText: "companion object", tailText: " {...}" }
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  lateinit
+// EXIST:  lateinit var
 // EXIST:  data
 // EXIST:  inline
 // EXIST:  tailrec