Revert replacing "NUMBER" to "INVOCATION_COUNT" and replace "TIME" to "INVOCATION_COUNT"

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

@@ -15,5 +15,5 @@ class TestSample() {
     }
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: testVar, testFun, testTop

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

@@ -4,5 +4,5 @@ fun anyfun() {
     a.b.c.d.e.f.<caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
-// INVOCATION_COUNT: 0
+// NUMBER: 0

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

@@ -4,5 +4,5 @@ fun anyfun() {
     a.b.c.d.e.f.<caret>
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
-// INVOCATION_COUNT: 0
+// NUMBER: 0

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

@@ -2,7 +2,7 @@ class Test {
     val St<caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: String~(jet)
 // EXIST: IllegalStateException
 // EXIST_JAVA_ONLY: StringBuilder

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

@@ -3,7 +3,7 @@ fun testing() {}
 fun S<caret>
 
 // Should complete types for receiver after explicit basic completion call
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: String
 // EXIST_JAVA_ONLY: StringBuffer
 // EXIST: Set

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

@@ -2,7 +2,7 @@ class Test {
     val St<caret>
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: String~(jet)
 // EXIST: IllegalStateException
 // EXIST: StringBuilder

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

@@ -12,7 +12,7 @@ class StrMore {
   class StrAbsent
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: String~(jet)
 // EXIST: StrSome
 // EXIST: StrMore

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

@@ -7,4 +7,4 @@ class Test {
 }
 
 // EXIST: util
-// INVOCATION_COUNT: 1
+// NUMBER: 1

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

@@ -2,4 +2,4 @@ package kttesting<caret>.util
 
 // Test that there won't be package with completion fake suffix
 
-// INVOCATION_COUNT: 0
+// NUMBER: 0

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

@@ -4,7 +4,7 @@ class SomeClass {
   fun some(a : S<caret>)
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: SomeClass, SomeInternal
 // EXIST: String~(jet)
 // EXIST: IllegalStateException

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

@@ -4,7 +4,7 @@ class SomeClass {
   fun some(a : S<caret>)
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: SomeClass, SomeInternal
 // EXIST: String~(jet)
 // EXIST: IllegalStateException

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

@@ -7,6 +7,6 @@ fun firstFun() {
     Testin<caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: Testing
-// INVOCATION_COUNT: 1
+// NUMBER: 1

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

@@ -4,5 +4,5 @@ fun test() {
   val a : Named<caret>
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // ABSENT: NamedObject

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

@@ -4,6 +4,6 @@ fun firstFun() {
   val a = In<caret>
 }
 
-// TIME: 0
+// INVOCATION_COUNT: 0
 // EXIST: Int~(jet)
 // ABSENT: Int~(jet.runtime.SharedVar)

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

@@ -21,4 +21,4 @@ fun testMy() {
 }
 
 // EXIST: testOther
-// INVOCATION_COUNT: 3
+// NUMBER: 3

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

@@ -2,7 +2,7 @@ fun main(args: Array<String>) {
     Array<caret>
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // WITH_ORDER: 1
 // EXIST: Array~(jet)
 // EXIST_JAVA_ONLY: Array~(java.sql)

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

@@ -1,7 +1,7 @@
 fun some(a: Double<caret>) {
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // WITH_ORDER: 1
 // EXIST: Double~(jet)
 // EXIST_JAVA_ONLY: Double~(java.lang)

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

@@ -9,7 +9,7 @@ fun test() {
     Some().<caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: testPublic, testPackage
 // ABSENT: testPrivate, testProtected
 

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

@@ -9,5 +9,5 @@ fun test() {
     Some().<caret>
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: testPublic, testProtected, testPrivate, testPackage

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

@@ -11,6 +11,6 @@ class SomeSubclass : Some() {
     }
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: testPublic, testProtected, testPackage
 // ABSENT: testPrivate

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

@@ -11,5 +11,5 @@ class SomeSubclass : Some() {
     }
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: testPublic, testProtected, testPackage, testPrivate

idea/testData/completion/basic/java/AutoForceCompletion.kt

@@ -1,4 +1,4 @@
 fun some(a : Statement<caret>)
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: Statement@Statement~(java.sql)

idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt

@@ -7,6 +7,6 @@ fun firstFun() {
   a.toLinke<caret>
 }
 
-// TIME: 1
-// EXIST: toLinkedList@toLinkedList()~for jet.Iterable<T> in kotlin
 // INVOCATION_COUNT: 1
+// EXIST: toLinkedList@toLinkedList()~for jet.Iterable<T> in kotlin
+// NUMBER: 1

idea/testData/completion/basic/java/JavaClassNames.kt

@@ -7,6 +7,6 @@ class Hello() {
    }
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: SortedMap, Short, Socket
 // ABSENT: hashSetOf

idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt

@@ -1,5 +1,5 @@
 val x = LineIterator<caret>
 
-// TIME: 1
-// EXIST: LineIterator~(kotlin.io)
 // INVOCATION_COUNT: 1
+// EXIST: LineIterator~(kotlin.io)
+// NUMBER: 1

idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt

@@ -2,6 +2,6 @@ import java.io.InputStreamReader
 
 val x = InputStreamReader<caret>
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: InputStreamReader~(java.io)
-// INVOCATION_COUNT: 1
+// NUMBER: 1

idea/testData/completion/basic/java/PropertyMetadata.kt

@@ -5,7 +5,7 @@ fun firstFun() {
   val a = PropertyM<caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: PropertyMetadata@PropertyMetadata~(jet)
 // EXIST: PropertyMetadataImpl@PropertyMetadataImpl~(jet)
-// INVOCATION_COUNT: 2
+// NUMBER: 2

idea/testData/completion/basic/js/AutoForceCompletion.kt

@@ -1,4 +1,4 @@
 fun some(a : HTMLStyle<caret>)
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: HTMLStyleElement

idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints-1.kt

@@ -12,4 +12,4 @@ fun firstFun() {
 // EXIST: testingExpectedFunction
 // ABSENT: testingUnexpectedFunction
 
-// INVOCATION_COUNT: 2
+// NUMBER: 2

idea/testData/completion/basic/multifile/ExtensionFunctionOnUnresolved-1.kt

@@ -8,4 +8,4 @@ fun firstFun() {
 // ABSENT: helloFun
 // ABSENT: helloFunPreventAutoInsert
 // ABSENT: helloWithParams
-// INVOCATION_COUNT: 0
+// NUMBER: 0

idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt

@@ -9,4 +9,4 @@ fun firstFun() {
 // EXIST: helloFunPreventAutoInsert
 // EXIST: helloWithParams
 // ABSENT: helloFake
-// INVOCATION_COUNT: 3
+// NUMBER: 3

idea/testData/completion/basic/multifile/ExtensionProperty-1.kt

@@ -9,4 +9,4 @@ fun firstFun() {
 // EXIST: someProperty
 // EXIST: someOtherProperty
 // EXIST: someSelfProperty
-// INVOCATION_COUNT: 3
+// NUMBER: 3

idea/testData/completion/basic/multifile/NotImportedExtensionFunction-1.kt

@@ -9,4 +9,4 @@ fun firstFun() {
 // EXIST: helloFunPreventAutoInsert
 // EXIST: helloWithParams
 // ABSENT: helloFake
-// INVOCATION_COUNT: 3
+// NUMBER: 3

idea/testData/completion/injava/ClassFromNamespace.java

@@ -6,4 +6,4 @@ public class Testing {
 
 // EXIST: ClassFromJet
 // EXIST: SomePackage
-// INVOCATION_COUNT: 2
+// NUMBER: 2

idea/testData/completion/injava/JetSubpackage.java

@@ -8,4 +8,4 @@ public class Testing {
 // ABSENT: jet2
 
 // Only two proposals expected
-// INVOCATION_COUNT: 1
+// NUMBER: 1

idea/testData/completion/keywords/InClassBeforeFun.kt

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

idea/testData/completion/keywords/InClassScope.kt

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

idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java

@@ -104,11 +104,11 @@ public class ExpectedCompletionUtils {
     private static final String EXIST_JAVA_ONLY_LINE_PREFIX = "EXIST_JAVA_ONLY:";
     private static final String EXIST_JS_ONLY_LINE_PREFIX = "EXIST_JS_ONLY:";
 
-    private static final String NUMBER_LINE_PREFIX = "INVOCATION_COUNT:";
+    private static final String NUMBER_LINE_PREFIX = "NUMBER:";
-    private static final String NUMBER_JS_LINE_PREFIX = "INVOCATION_COUNT_JS:";
+    private static final String NUMBER_JS_LINE_PREFIX = "NUMBER_JS:";
-    private static final String NUMBER_JAVA_LINE_PREFIX = "INVOCATION_COUNT_JAVA:";
+    private static final String NUMBER_JAVA_LINE_PREFIX = "NUMBER_JAVA:";
 
-    private static final String EXECUTION_TIME_PREFIX = "TIME:";
+    private static final String INVOCATION_COUNT_PREFIX = "INVOCATION_COUNT:";
     private static final String WITH_ORDER_PREFIX = "WITH_ORDER:";
 
     public static final List<String> KNOWN_PREFIXES = ImmutableList.of(
@@ -121,7 +121,7 @@ public class ExpectedCompletionUtils {
             NUMBER_LINE_PREFIX,
             NUMBER_JS_LINE_PREFIX,
             NUMBER_JAVA_LINE_PREFIX,
-            EXECUTION_TIME_PREFIX,
+            INVOCATION_COUNT_PREFIX,
             WITH_ORDER_PREFIX);
 
     @NotNull
@@ -201,8 +201,8 @@ public class ExpectedCompletionUtils {
     }
 
     @Nullable
-    public static Integer getExecutionTime(String fileText) {
+    public static Integer getInvocationCount(String fileText) {
-        return InTextDirectivesUtils.getPrefixedInt(fileText, EXECUTION_TIME_PREFIX);
+        return InTextDirectivesUtils.getPrefixedInt(fileText, INVOCATION_COUNT_PREFIX);
     }
 
     public static boolean isWithOrder(String fileText) {

idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java

@@ -47,9 +47,9 @@ public abstract class JetFixtureCompletionBaseTestCase extends LightCodeInsightF
 
         String fileText = myFixture.getFile().getText();
 
-        Integer completionTime = ExpectedCompletionUtils.getExecutionTime(fileText);
+        Integer invocationCount = ExpectedCompletionUtils.getInvocationCount(fileText);
 
-        myFixture.complete(CompletionType.BASIC, completionTime == null ? 0 : completionTime);
+        myFixture.complete(CompletionType.BASIC, invocationCount == null ? 0 : invocationCount);
 
         ExpectedCompletionUtils.assertDirectivesValid(fileText);