addressed CR feedback: changed error message

vladima · vladima · commit a62b47eace85 · 2014-07-31T11:06:42.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -4909,7 +4909,7 @@ module ts {
                     error(errorNode, Diagnostics.Constructor_implementation_is_missing);
                 }
                 else {
-                    error(errorNode, Diagnostics.Function_implementation_is_missing);
+                    error(errorNode, Diagnostics.Function_implementation_is_missing_or_not_immediately_following_the_declaration);
                 }
             }
 
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
@@ -279,7 +279,7 @@ module ts {
         Types_of_parameters_0_and_1_are_incompatible_Colon: { code: -9999999, category: DiagnosticCategory.Error, key: "Types of parameters '{0}' and '{1}' are incompatible:" },
         Unknown_identifier_0: { code: -9999999, category: DiagnosticCategory.Error, key: "Unknown identifier '{0}'." },
         Property_0_is_inaccessible: { code: -9999999, category: DiagnosticCategory.Error, key: "Property '{0}' is inaccessible." },
-        Function_implementation_is_missing: { code: -9999999, category: DiagnosticCategory.Error, key: "Function implementation is missing." },
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: -9999999, category: DiagnosticCategory.Error, key: "Function implementation is missing or not immediately following the declaration." },
         Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: -9999999, category: DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
         Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: -9999999, category: DiagnosticCategory.Error, key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
         Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: -9999999, category: DiagnosticCategory.Error, key: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -1132,7 +1132,7 @@
         "category": "Error",
         "code": -9999999
     },
-    "Function implementation is missing.": {
+    "Function implementation is missing or not immediately following the declaration.": {
         "category": "Error",
         "code": -9999999
     },
diff --git a/tests/baselines/reference/ClassDeclaration10.errors.txt b/tests/baselines/reference/ClassDeclaration10.errors.txt
@@ -5,5 +5,5 @@
 !!! Constructor implementation is missing.
        foo();
        ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
diff --git a/tests/baselines/reference/ClassDeclaration14.errors.txt b/tests/baselines/reference/ClassDeclaration14.errors.txt
@@ -2,7 +2,7 @@
     class C {
        foo();
        ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
        constructor();
        ~~~~~~~~~~~~~~
 !!! Constructor implementation is missing.
diff --git a/tests/baselines/reference/ClassDeclaration15.errors.txt b/tests/baselines/reference/ClassDeclaration15.errors.txt
@@ -2,6 +2,6 @@
     class C {
        foo();
        ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
        constructor() { }
     }
diff --git a/tests/baselines/reference/ClassDeclaration25.errors.txt b/tests/baselines/reference/ClassDeclaration25.errors.txt
@@ -6,9 +6,9 @@
     class List<U> implements IList<U> {
         data(): U;
         ~~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
         next(): string;
         ~~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
     
diff --git a/tests/baselines/reference/ClassDeclaration9.errors.txt b/tests/baselines/reference/ClassDeclaration9.errors.txt
@@ -2,5 +2,5 @@
     class C {
        foo();
        ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
diff --git a/tests/baselines/reference/FunctionDeclaration3.errors.txt b/tests/baselines/reference/FunctionDeclaration3.errors.txt
@@ -1,4 +1,4 @@
 ==== tests/cases/compiler/FunctionDeclaration3.ts (1 errors) ====
     function foo();
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
diff --git a/tests/baselines/reference/FunctionDeclaration7.errors.txt b/tests/baselines/reference/FunctionDeclaration7.errors.txt
@@ -2,5 +2,5 @@
     module M {
        function foo();
                 ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
diff --git a/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt b/tests/baselines/reference/assignmentCompatFunctionsWithOptionalArgs.errors.txt
@@ -1,7 +1,7 @@
 ==== tests/cases/compiler/assignmentCompatFunctionsWithOptionalArgs.ts (3 errors) ====
     function foo(x: { id: number; name?: string; }): void;
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     foo({ id: 1234 });                 // Ok
     foo({ id: 1234, name: "hello" });  // Ok
     foo({ id: 1234, name: false });    // Error, name of wrong type
diff --git a/tests/baselines/reference/callOverloads1.errors.txt b/tests/baselines/reference/callOverloads1.errors.txt
@@ -9,7 +9,7 @@
     
     function Foo(); // error
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
              ~~~
 !!! Duplicate identifier 'Foo'.
     function F1(s:string);
diff --git a/tests/baselines/reference/callOverloads2.errors.txt b/tests/baselines/reference/callOverloads2.errors.txt
@@ -22,7 +22,7 @@
     
     function Goo(s:string); // error - no implementation
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     
     declare function Gar(s:String); // expect no error
     
diff --git a/tests/baselines/reference/callOverloads3.errors.txt b/tests/baselines/reference/callOverloads3.errors.txt
@@ -5,7 +5,7 @@
 !!! Cannot find name 'Foo'.
     function Foo(s:string):Foo;
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
                            ~~~
 !!! Cannot find name 'Foo'.
     class Foo {    
diff --git a/tests/baselines/reference/callOverloads4.errors.txt b/tests/baselines/reference/callOverloads4.errors.txt
@@ -5,7 +5,7 @@
 !!! Cannot find name 'Foo'.
     function Foo(s:string):Foo;
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
                            ~~~
 !!! Cannot find name 'Foo'.
     class Foo {    
diff --git a/tests/baselines/reference/callOverloads5.errors.txt b/tests/baselines/reference/callOverloads5.errors.txt
@@ -4,7 +4,7 @@
 !!! Cannot find name 'Foo'.
     function Foo(s:string):Foo;
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
                            ~~~
 !!! Cannot find name 'Foo'.
     class Foo {
diff --git a/tests/baselines/reference/classOverloadForFunction2.errors.txt b/tests/baselines/reference/classOverloadForFunction2.errors.txt
@@ -1,7 +1,7 @@
 ==== tests/cases/compiler/classOverloadForFunction2.ts (2 errors) ====
     function bar(): string;
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     class bar {}
           ~~~
 !!! Duplicate identifier 'bar'.
diff --git a/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.errors.txt b/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.errors.txt
@@ -6,5 +6,5 @@
 !!! Function implementation name must be 'foo'.
         foo(x): number;
         ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
diff --git a/tests/baselines/reference/crashOnMethodSignatures.errors.txt b/tests/baselines/reference/crashOnMethodSignatures.errors.txt
@@ -2,6 +2,6 @@
     class A {
         a(completed: () => any): void;
         ~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
     
diff --git a/tests/baselines/reference/dottedModuleName.errors.txt b/tests/baselines/reference/dottedModuleName.errors.txt
@@ -5,7 +5,7 @@
     	                           ~~
 !!! Block or ';' expected.
     	                ~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     	                               ~
 !!! Cannot find name 'x'.
     	export module X.Y.Z {
diff --git a/tests/baselines/reference/externModule.errors.txt b/tests/baselines/reference/externModule.errors.txt
@@ -15,10 +15,10 @@
 !!! Cannot compile external modules unless the '--module' flag is provided.
     		public getDay():number;
     		       ~~~~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     		public getXDate():number;
     		       ~~~~~~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     		// etc.
     
     	    // Called as a function
@@ -38,19 +38,19 @@
     	    
     	    static parse(string: string): number;
     	           ~~~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     	    static UTC(year: number, month: number): number;
     	    static UTC(year: number, month: number, date: number): number;
     	    static UTC(year: number, month: number, date: number, hours: number): number;
     	    static UTC(year: number, month: number, date: number, hours: number, minutes: number): number;
     	    static UTC(year: number, month: number, date: number, hours: number, minutes: number, seconds: number): number;
     	    static UTC(year: number, month: number, date: number, hours: number, minutes: number, seconds: number,
     	           ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     		         ms: number): number;
     	    static now(): number;
     	           ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
         }
     }
     ~
diff --git a/tests/baselines/reference/functionOverloadImplementationOfWrongName2.errors.txt b/tests/baselines/reference/functionOverloadImplementationOfWrongName2.errors.txt
@@ -5,4 +5,4 @@
 !!! Function implementation name must be 'foo'.
     function foo(x, y);
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
diff --git a/tests/baselines/reference/functionOverloads1.errors.txt b/tests/baselines/reference/functionOverloads1.errors.txt
@@ -1,6 +1,6 @@
 ==== tests/cases/compiler/functionOverloads1.ts (1 errors) ====
     function foo();
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     1+1;
     function foo():string { return "a" }
diff --git a/tests/baselines/reference/functionOverloads3.errors.txt b/tests/baselines/reference/functionOverloads3.errors.txt
@@ -1,4 +1,4 @@
 ==== tests/cases/compiler/functionOverloads3.ts (1 errors) ====
     function foo():string;
              ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
diff --git a/tests/baselines/reference/functionOverloadsOutOfOrder.errors.txt b/tests/baselines/reference/functionOverloadsOutOfOrder.errors.txt
@@ -6,7 +6,7 @@
         }
         private foo(s: string): string;
                 ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
     
     class e {
@@ -16,5 +16,5 @@
         private foo(s: string): string;
         private foo(n: number): string;
                 ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
diff --git a/tests/baselines/reference/incorrectClassOverloadChain.errors.txt b/tests/baselines/reference/incorrectClassOverloadChain.errors.txt
@@ -3,6 +3,6 @@
         foo(): string;
         foo(x): number;
         ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
         x = 1;
     }
diff --git a/tests/baselines/reference/indexer2A.errors.txt b/tests/baselines/reference/indexer2A.errors.txt
@@ -4,7 +4,7 @@
         // Decided to enforce a semicolon after declarations
         hasOwnProperty(objectId: number): boolean
         ~~~~~~~~~~~~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
         [objectId: number]: IHeapObjectProperty[]
     }
     var directChildrenMap = <IDirectChildrenMap>{}; 
diff --git a/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.errors.txt b/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.errors.txt
@@ -3,7 +3,7 @@
         foo();
         static foo(); // error
                ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
                ~~~
 !!! Function overload must not be static.
     }
@@ -12,7 +12,7 @@
         static foo();
         foo(); // error    
         ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
         ~~~
 !!! Function overload must be static.
     }
@@ -21,7 +21,7 @@
         foo(x: T);
         static foo(x: number); // error
                ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
                ~~~
 !!! Function overload must not be static.
     }
@@ -30,7 +30,7 @@
         static foo(x: number);
         foo(x: T); // error    
         ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
         ~~~
 !!! Function overload must be static.
     }
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.errors.txt b/tests/baselines/reference/objectTypesWithOptionalProperties2.errors.txt
@@ -24,7 +24,7 @@
             ~
 !!! Unexpected token. A constructor, method, accessor, or property was expected.
         ~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
     
     interface I2<T> {
@@ -42,7 +42,7 @@
             ~
 !!! Unexpected token. A constructor, method, accessor, or property was expected.
         ~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
     
     
diff --git a/tests/baselines/reference/parserClassDeclaration10.errors.txt b/tests/baselines/reference/parserClassDeclaration10.errors.txt
@@ -5,5 +5,5 @@
 !!! Constructor implementation is missing.
        foo();
        ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
diff --git a/tests/baselines/reference/parserClassDeclaration14.errors.txt b/tests/baselines/reference/parserClassDeclaration14.errors.txt
@@ -2,7 +2,7 @@
     class C {
        foo();
        ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
        constructor();
        ~~~~~~~~~~~~~~
 !!! Constructor implementation is missing.
diff --git a/tests/baselines/reference/parserClassDeclaration15.errors.txt b/tests/baselines/reference/parserClassDeclaration15.errors.txt
@@ -2,6 +2,6 @@
     class C {
        foo();
        ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
        constructor() { }
     }
diff --git a/tests/baselines/reference/parserClassDeclaration25.errors.txt b/tests/baselines/reference/parserClassDeclaration25.errors.txt
@@ -6,9 +6,9 @@
     class List<U> implements IList<U> {
         data(): U;
         ~~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
         next(): string;
         ~~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
     
diff --git a/tests/baselines/reference/parserClassDeclaration9.errors.txt b/tests/baselines/reference/parserClassDeclaration9.errors.txt
@@ -2,5 +2,5 @@
     class C {
        foo();
        ~~~
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
     }
diff --git a/tests/baselines/reference/parserEqualsGreaterThanAfterFunction1.errors.txt b/tests/baselines/reference/parserEqualsGreaterThanAfterFunction1.errors.txt
@@ -3,4 +3,4 @@
              ~~
 !!! Identifier expected.
              
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
diff --git a/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt b/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt
@@ -9,4 +9,4 @@
                      
 !!! ')' expected.
              
-!!! Function implementation is missing.
+!!! Function implementation is missing or not immediately following the declaration.
diff --git a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.errors.txt b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.errors.txt
diff --git a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.errors.txt b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.errors.txt
diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.errors.txt b/tests/baselines/reference/parserErrorRecovery_ParameterList6.errors.txt
diff --git a/tests/baselines/reference/parserFunctionDeclaration3.errors.txt b/tests/baselines/reference/parserFunctionDeclaration3.errors.txt
diff --git a/tests/baselines/reference/parserFunctionDeclaration7.errors.txt b/tests/baselines/reference/parserFunctionDeclaration7.errors.txt
diff --git a/tests/baselines/reference/parserModuleDeclaration10.errors.txt b/tests/baselines/reference/parserModuleDeclaration10.errors.txt
diff --git a/tests/baselines/reference/parserSkippedTokens16.errors.txt b/tests/baselines/reference/parserSkippedTokens16.errors.txt
diff --git a/tests/baselines/reference/staticClassMemberError.errors.txt b/tests/baselines/reference/staticClassMemberError.errors.txt

Original file line number	Diff line number	Diff line change
`@@ -4909,7 +4909,7 @@ module ts {`
`4909`	`4909`	`error(errorNode, Diagnostics.Constructor_implementation_is_missing);`
`4910`	`4910`	`}`
`4911`	`4911`	`else {`
`4912`		`- error(errorNode, Diagnostics.Function_implementation_is_missing);`
	`4912`	`+ error(errorNode, Diagnostics.Function_implementation_is_missing_or_not_immediately_following_the_declaration);`
`4913`	`4913`	`}`
`4914`	`4914`	`}`
`4915`	`4915`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`!!! Constructor implementation is missing.`
`6`	`6`	`foo();`
`7`	`7`	`~~~`
`8`		`-!!! Function implementation is missing.`
	`8`	`+!!! Function implementation is missing or not immediately following the declaration.`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`class C {`
`3`	`3`	`foo();`
`4`	`4`	`~~~`
`5`		`-!!! Function implementation is missing.`
	`5`	`+!!! Function implementation is missing or not immediately following the declaration.`
`6`	`6`	`constructor() { }`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`class C {`
`3`	`3`	`foo();`
`4`	`4`	`~~~`
`5`		`-!!! Function implementation is missing.`
	`5`	`+!!! Function implementation is missing or not immediately following the declaration.`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`module M {`
`3`	`3`	`function foo();`
`4`	`4`	`~~~`
`5`		`-!!! Function implementation is missing.`
	`5`	`+!!! Function implementation is missing or not immediately following the declaration.`
`6`	`6`	`}`