More correct completion testing + fixed small bug in keyword completion

idea/testData/completion/basic/common/NoAutoPopupInValName.kt

@@ -2,6 +2,7 @@ fun test() {
     val <caret>
 }
 
+// INVOCATION_COUNT: 0
 // NUMBER: 0
 
 /* KT-4158 Type "var i" and press space. "var if" is auto-inserted. */

idea/testData/completion/basic/common/NoAutopopupInFunName.kt

@@ -0,0 +1,4 @@
+fun f<caret>
+
+// INVOCATION_COUNT: 0
+// NUMBER: 0

idea/testData/completion/basic/common/NoAutopopupInVarName.kt

@@ -1,5 +1,6 @@
 var <caret>
 
+// INVOCATION_COUNT: 0
 // NUMBER: 0
 
 /* KT-4158 Type "var i" and press space. "var if" is auto-inserted. */

idea/testData/completion/keywords/InBlockComment.kt

@@ -5,7 +5,7 @@ class TestClass {
 }
 
 // ABSENT: abstract, annotation, as, break, by, catch, class, continue, default, do
-// ABSENT: else, enum, false, final, finally, for, fun, get, if, import, in, inline
+// ABSENT: else, enum, false, final, finally, for, fun, get, if, import, in
 // ABSENT: internal, is, null, object, open, out, override, package, private, protected, public
 // ABSENT: ref, return, set, super, This, this, throw, trait, true, try, type, val, var
 // ABSENT: vararg, when, where, while

idea/testData/completion/keywords/InChar.kt

@@ -5,7 +5,7 @@ class TestClass {
 }
 
 // ABSENT: abstract, annotation, as, break, by, catch, class, continue, default, do
-// ABSENT: else, enum, false, final, finally, for, fun, get, if, import, in, inline
+// ABSENT: else, enum, false, final, finally, for, fun, get, if, import, in
 // ABSENT: internal, is, null, object, open, out, override, package, private, protected, public
 // ABSENT: ref, return, set, super, This, this, throw, trait, true, try, type, val, var
 // ABSENT: vararg, when, where, while

idea/testData/completion/keywords/InClassBeforeFun.kt

@@ -7,8 +7,6 @@ public class Test {
     }
 }
 
-// INVOCATION_COUNT: 1
-
 // EXIST:  abstract
 /* // ABSENT: annotation */
 // ABSENT: as

idea/testData/completion/keywords/InClassScope.kt

@@ -2,8 +2,6 @@ class TestClass {
     <caret>
 }
 
-// INVOCATION_COUNT: 1
-
 // EXIST:  abstract
 // ABSENT: annotation
 // ABSENT: as

idea/testData/completion/keywords/InFunctionScope.kt

@@ -22,7 +22,6 @@ fun foo() {
 // EXIST: if
 // ABSENT: import
 // EXIST: in
-// EXIST: inline
 // EXIST: internal
 // EXIST: is
 // EXIST: null

idea/testData/completion/keywords/InMethodParametersList.kt

@@ -25,7 +25,6 @@ class TestSample() {
 // ABSENT: if
 // ABSENT: import
 // ABSENT: in
-// ABSENT: inline
 // ABSENT: internal
 // ABSENT: is
 // ABSENT: null

idea/testData/completion/keywords/InParametersList.kt

@@ -22,7 +22,6 @@ fun test(<caret>) {
 // ABSENT: if
 // ABSENT: import
 // ABSENT: in
-// ABSENT: inline
 // ABSENT: internal
 // ABSENT: is
 // ABSENT: null

idea/testData/completion/keywords/InString.kt

@@ -5,7 +5,7 @@ class TestClass {
 }
 
 // ABSENT: abstract, annotation, as, break, by, catch, class, continue, default, do
-// ABSENT: else, enum, false, final, finally, for, fun, get, if, import, in, inline
+// ABSENT: else, enum, false, final, finally, for, fun, get, if, import, in
 // ABSENT: internal, is, null, object, open, out, override, package, private, protected, public
 // ABSENT: ref, return, set, super, This, this, throw, trait, true, try, type, val, var
 // ABSENT: vararg, when, where, while

idea/testData/completion/keywords/InTypeScope.kt

@@ -22,7 +22,6 @@ fun foo() {
 // EXIST: if
 // ABSENT: import
 // EXIST: in
-// EXIST: inline
 // EXIST: internal
 // EXIST: is
 // EXIST: null

idea/testData/completion/keywords/LineComment.kt

@@ -3,7 +3,7 @@ class TestClass {
 }
 
 // ABSENT: abstract, annotation, as, break, by, catch, class, continue, default, do
-// ABSENT: else, enum, false, final, finally, for, fun, get, if, import, in, inline
+// ABSENT: else, enum, false, final, finally, for, fun, get, if, import, in
 // ABSENT: internal, is, null, object, open, out, override, package, private, protected, public
 // ABSENT: ref, return, set, super, This, this, throw, trait, true, try, type, val, var
 // ABSENT: vararg, when, where, while