Removed IDE templates from completion, replaced them with keywords.

idea/testData/completion/keywords/InClassBeforeFun.kt

@@ -15,17 +15,17 @@ public class Test {
 // ABSENT: break
 // ABSENT: by
 // ABSENT: catch
-// EXIST:  class ... {...}
+// EXIST:  class
 // ABSENT: continue
 // ABSENT: default
 // ABSENT: do
 // ABSENT: else
-// EXIST:  enum class ... {...}
+// EXIST:  enum
 // ABSENT: false
 // EXIST:  final
 // ABSENT: finally
 // ABSENT: for
-// EXIST:  fun ...(...) : ... {...}
+// EXIST:  fun
 // EXIST:  get
 // ABSENT: if
 // ABSENT: import
@@ -49,14 +49,12 @@ public class Test {
 // ABSENT: This
 // ABSENT: this
 // ABSENT: throw
-// EXIST:  trait ... {...}
+// EXIST:  trait
 // ABSENT: true
 // ABSENT: try
 // EXIST:  type
-// EXIST:  val ... : ... = ...
-// EXIST:  val ... : ...get() {...}
-// EXIST:  var ... : ... = ...
-// EXIST:  var ... : ...get() {...}set(value) {...}
+// EXIST:  val
+// EXIST:  var
 // ABSENT: vararg
 // ABSENT: when
 // ABSENT: where

idea/testData/completion/keywords/InClassScope.kt

@@ -10,17 +10,17 @@ class TestClass {
 // ABSENT: break
 // ABSENT: by
 // ABSENT: catch
-// EXIST:  class ... {...}
+// EXIST:  class
 // ABSENT: continue
 // ABSENT: default
 // ABSENT: do
 // ABSENT: else
-// EXIST:  enum class ... {...}
+// EXIST:  enum
 // ABSENT: false
 // EXIST:  final
 // ABSENT: finally
 // ABSENT: for
-// EXIST:  fun ...(...) : ... {...}
+// EXIST:  fun
 // EXIST:  get
 // ABSENT: if
 // ABSENT: import
@@ -44,14 +44,12 @@ class TestClass {
 // ABSENT: This
 // ABSENT: this
 // ABSENT: throw
-// EXIST:  trait ... {...}
+// EXIST:  trait
 // ABSENT: true
 // ABSENT: try
 // EXIST:  type
-// EXIST:  val ... : ... = ...
-// EXIST:  val ... : ...get() {...}
-// EXIST:  var ... : ... = ...
-// EXIST:  var ... : ...get() {...}set(value) {...}
+// EXIST:  val
+// EXIST:  var
 // ABSENT: vararg
 // ABSENT: when
 // ABSENT: where

idea/testData/completion/keywords/InFunctionScope.kt

@@ -8,18 +8,18 @@ fun foo() {
 // EXIST: break
 // EXIST: by
 // EXIST: catch
-// EXIST: class ... {...}
+// EXIST: class
 // EXIST: continue
-// EXIST: do {...} while (...)
+// EXIST: do
 // EXIST: else
-// EXIST: enum class ... {...}
+// EXIST: enum
 // EXIST: false
 // ABSENT: final
 // EXIST: finally
-// EXIST: for (... in ...) {...}
-// EXIST: fun ...(...) : ... {...}
+// EXIST: for
+// EXIST: fun
 // EXIST: get
-// EXIST: if (...) {...}
+// EXIST: if
 // ABSENT: import
 // EXIST: in
 // EXIST: inline
@@ -40,13 +40,13 @@ fun foo() {
 // EXIST: This
 // EXIST: this
 // EXIST: throw
-// EXIST: trait ... {...}
+// EXIST: trait
 // EXIST: true
 // EXIST: try
 // EXIST: type
-// EXIST: val ... = ...
-// EXIST: var ... = ...
+// EXIST: val
+// EXIST: var
 // EXIST: vararg
-// EXIST: when (...) {... -> ...else -> ...}
+// EXIST: when
 // EXIST: where
-// EXIST: while (...) {...}
+// EXIST: while

idea/testData/completion/keywords/InTopProperty.kt

@@ -2,7 +2,7 @@ var a : Int = <caret>
 
 // EXIST:  else
 // EXIST:  false
-// EXIST:  if (...) ... else ...
+// EXIST:  if
 // EXIST:  null
 // EXIST:  this
 // EXIST:  true

idea/testData/completion/keywords/InTopScopeAfterPackage.kt

@@ -2,8 +2,8 @@ package Test
 
 <caret>
 
-// EXIST:  enum class ... {...}
-// EXIST:  trait ... {...}
-// EXIST:  class ... {...}
-// EXIST:  fun ...(...) : ... {...}
+// EXIST:  enum
+// EXIST:  trait
+// EXIST:  class
+// EXIST:  fun
 

idea/testData/completion/keywords/InTypeScope.kt

@@ -8,18 +8,18 @@ fun foo() {
 // EXIST: break
 // EXIST: by
 // EXIST: catch
-// EXIST: class ... {...}
+// EXIST: class
 // EXIST: continue
-// EXIST: do {...} while (...)
+// EXIST: do
 // EXIST: else
-// EXIST: enum class ... {...}
+// EXIST: enum
 // EXIST: false
 // ABSENT: final
 // EXIST: finally
-// EXIST: for (... in ...) {...}
-// EXIST: fun ...(...) : ... {...}
+// EXIST: for
+// EXIST: fun
 // EXIST: get
-// EXIST: if (...) {...}
+// EXIST: if
 // ABSENT: import
 // EXIST: in
 // EXIST: inline
@@ -40,13 +40,13 @@ fun foo() {
 // EXIST: This
 // EXIST: this
 // EXIST: throw
-// EXIST: trait ... {...}
+// EXIST: trait
 // EXIST: true
 // EXIST: try
 // EXIST: type
-// EXIST: val ... = ...
-// EXIST: var ... = ...
+// EXIST: val
+// EXIST: var
 // EXIST: vararg
-// EXIST: when (...) {... -> ...else -> ...}
+// EXIST: when
 // EXIST: where
-// EXIST: while (...) {...}
+// EXIST: while

idea/testData/completion/keywords/TopScope.kt

@@ -6,17 +6,17 @@
 // ABSENT: break
 // ABSENT: by
 // ABSENT: catch
-// EXIST:  class ... {...}
+// EXIST:  class
 // ABSENT: continue
 // ABSENT: default
 // ABSENT: do
 // ABSENT: else
-// EXIST:  enum class ... {...}
+// EXIST:  enum
 // ABSENT: false
 // EXIST:  final
 // ABSENT: finally
 // ABSENT: for
-// EXIST:  fun ...(...) : ... {...}
+// EXIST:  fun
 // EXIST:  get
 // ABSENT: if
 // EXIST:  import
@@ -39,14 +39,12 @@
 // ABSENT: This
 // ABSENT: this
 // ABSENT: throw
-// EXIST:  trait ... {...}
+// EXIST:  trait
 // ABSENT: true
 // ABSENT: try
 // EXIST:  type
-// EXIST:  val ... : ... = ...
-// EXIST:  val ... : ...get() {...}
-// EXIST:  var ... : ... = ...
-// EXIST:  var ... : ...get() {...}set(value) {...}
+// EXIST:  val
+// EXIST:  var
 // ABSENT: vararg
 // ABSENT: when
 // ABSENT: where

idea/testData/completion/keywords/classObject.kt

@@ -2,4 +2,4 @@ class Test {
     class <caret>
 }
 
-// EXIST: object {...}
+// EXIST: object

idea/testData/completion/weighers/KeywordsLast.kt

@@ -3,4 +3,4 @@ fun main(variables: Array<String>) {
     va<caret>
 }
 
-// ORDER: values, variables, val ... = ..., var ... = ..., vararg
+// ORDER: values, val, variables, var, vararg

idea/testData/completion/weighers/ParametersBeforeKeywords.kt

@@ -2,4 +2,4 @@ fun bar(fop: Int) {
     fo<caret>
 }
 
-// ORDER: fop, for (... in ...) {...}
+// ORDER: fop, for