Prepend 'the' to a couple of ambiguous messages.

sandersn · sandersn · commit 9e5fba603654 · 2016-04-01T11:33:33.000-07:00
Based on feedback from @DanielRosenwasser @Arnavion and @RichiCoder1
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -5480,7 +5480,7 @@ namespace ts {
                     || compareTypes(target.thisType, source.thisType, reportErrors);
                 if (!related) {
                     if (reportErrors) {
-                        errorReporter(Diagnostics.this_types_of_each_signature_are_incompatible);
+                        errorReporter(Diagnostics.The_this_types_of_each_signature_are_incompatible);
                     }
                     return Ternary.False;
                 }
@@ -10223,7 +10223,7 @@ namespace ts {
                 const thisArgumentNode = getThisArgumentOfCall(node);
                 const thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 const errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
-                const headMessage = Diagnostics.this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
+                const headMessage = Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
                 if (!checkTypeRelatedTo(thisArgumentType, signature.thisType, relation, errorNode, headMessage)) {
                     return false;
                 }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -1899,11 +1899,11 @@
         "category": "Error",
         "code": 2683
     },
-    "'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'.": {
+    "The 'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'.": {
         "category": "Error",
         "code": 2684
     },
-    "'this' types of each signature are incompatible.": {
+    "The 'this' types of each signature are incompatible.": {
         "category": "Error",
         "code": 2685
     },
diff --git a/tests/baselines/reference/looseThisTypeInFunctions.errors.txt b/tests/baselines/reference/looseThisTypeInFunctions.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(21,1): error TS2322: Type '(this: C, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
-  'this' types of each signature are incompatible.
+  The 'this' types of each signature are incompatible.
     Type 'void' is not assignable to type 'C'.
 tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(33,28): error TS2339: Property 'length' does not exist on type 'number'.
-tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(37,9): error TS2684: 'this' context of type 'void' is not assignable to method's 'this' of type 'I'.
+tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(37,9): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'I'.
 tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(46,20): error TS2339: Property 'length' does not exist on type 'number'.
 
 
@@ -30,7 +30,7 @@ tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(46,20): error
     c.explicitVoid = c.explicitThis; // error, 'void' is missing everything
     ~~~~~~~~~~~~~~
 !!! error TS2322: Type '(this: C, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
-!!! error TS2322:   'this' types of each signature are incompatible.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
 !!! error TS2322:     Type 'void' is not assignable to type 'C'.
     let o = { 
         n: 101,
@@ -51,7 +51,7 @@ tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(46,20): error
     let x = i.explicitThis;
     let n = x(12); // callee:void doesn't match this:I
             ~~~~~
-!!! error TS2684: 'this' context of type 'void' is not assignable to method's 'this' of type 'I'.
+!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'I'.
     let u: Unused;
     let y = u.implicitNoThis;
     n = y(12); // ok, callee:void matches this:any
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt

Original file line number	Diff line number	Diff line change
`@@ -5480,7 +5480,7 @@ namespace ts {`
`5480`	`5480`	`\|\| compareTypes(target.thisType, source.thisType, reportErrors);`
`5481`	`5481`	`if (!related) {`
`5482`	`5482`	`if (reportErrors) {`
`5483`		`- errorReporter(Diagnostics.this_types_of_each_signature_are_incompatible);`
	`5483`	`+ errorReporter(Diagnostics.The_this_types_of_each_signature_are_incompatible);`
`5484`	`5484`	`}`
`5485`	`5485`	`return Ternary.False;`
`5486`	`5486`	`}`
`@@ -10223,7 +10223,7 @@ namespace ts {`
`10223`	`10223`	`const thisArgumentNode = getThisArgumentOfCall(node);`
`10224`	`10224`	`const thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;`
`10225`	`10225`	`const errorNode = reportErrors ? (thisArgumentNode \|\| node) : undefined;`
`10226`		`- const headMessage = Diagnostics.this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;`
	`10226`	`+ const headMessage = Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;`
`10227`	`10227`	`if (!checkTypeRelatedTo(thisArgumentType, signature.thisType, relation, errorNode, headMessage)) {`
`10228`	`10228`	`return false;`
`10229`	`10229`	`}`