From 8b8d33d8b8048b2bc31408f66086f9bab51aa740 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Fri, 16 Oct 2015 16:29:11 -0700
Subject: [PATCH] Fix comments

---
 .../reference/augmentedTypesClass2.errors.txt |  4 ++--
 .../reference/augmentedTypesClass2.js         |  4 ++--
 .../augmentedTypesInterface.errors.txt        |  4 ++--
 .../reference/augmentedTypesInterface.js      |  4 ++--
 .../classAndInterfaceWithSameName.errors.txt  |  4 ++--
 .../classAndInterfaceWithSameName.js          |  4 ++--
 ...ifiersAcrossContainerBoundaries.errors.txt |  2 +-
 ...ateIdentifiersAcrossContainerBoundaries.js |  4 ++--
 .../reference/interfaceClassMerging2.js       |  4 ++--
 .../reference/interfaceClassMerging2.symbols  | 12 +++++------
 .../reference/interfaceClassMerging2.types    | 20 +++++++++----------
 .../reference/mergedClassInterface.js         | 12 +++++------
 .../reference/mergedClassInterface.symbols    |  8 ++++----
 .../reference/mergedClassInterface.types      |  8 ++++----
 .../reference/nameCollisions.errors.txt       |  4 ++--
 tests/baselines/reference/nameCollisions.js   |  6 +++---
 tests/cases/compiler/augmentedTypesClass2.ts  |  4 ++--
 .../cases/compiler/augmentedTypesInterface.ts |  4 ++--
 ...ateIdentifiersAcrossContainerBoundaries.ts |  2 +-
 .../cases/compiler/interfaceClassMerging2.ts  |  2 +-
 tests/cases/compiler/nameCollisions.ts        |  4 ++--
 .../classAndInterfaceWithSameName.ts          |  4 ++--
 .../classDeclarations/mergedClassInterface.ts |  8 ++++----
 23 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/tests/baselines/reference/augmentedTypesClass2.errors.txt b/tests/baselines/reference/augmentedTypesClass2.errors.txt
index 7a203f06e90..a27189cf2c2 100644
--- a/tests/baselines/reference/augmentedTypesClass2.errors.txt
+++ b/tests/baselines/reference/augmentedTypesClass2.errors.txt
@@ -6,13 +6,13 @@ tests/cases/compiler/augmentedTypesClass2.ts(21,6): error TS2300: Duplicate iden
     // Checking class with other things in type space not value space
     
     // class then interface
-    class c11 { // error
+    class c11 {
         foo() {
             return 1;
         }
     }
     
-    interface c11 { // error
+    interface c11 {
         bar(): void;
     }
     
diff --git a/tests/baselines/reference/augmentedTypesClass2.js b/tests/baselines/reference/augmentedTypesClass2.js
index f75c08a5920..4a919913ce0 100644
--- a/tests/baselines/reference/augmentedTypesClass2.js
+++ b/tests/baselines/reference/augmentedTypesClass2.js
@@ -2,13 +2,13 @@
 // Checking class with other things in type space not value space
 
 // class then interface
-class c11 { // error
+class c11 {
     foo() {
         return 1;
     }
 }
 
-interface c11 { // error
+interface c11 {
     bar(): void;
 }
 
diff --git a/tests/baselines/reference/augmentedTypesInterface.errors.txt b/tests/baselines/reference/augmentedTypesInterface.errors.txt
index 534cba43ba1..51092e1d27f 100644
--- a/tests/baselines/reference/augmentedTypesInterface.errors.txt
+++ b/tests/baselines/reference/augmentedTypesInterface.errors.txt
@@ -14,11 +14,11 @@ tests/cases/compiler/augmentedTypesInterface.ts(26,6): error TS2300: Duplicate i
     }
     
     // interface then class
-    interface i2 { // error
+    interface i2 {
         foo(): void;
     }
     
-    class i2 {  // error
+    class i2 {
         bar() {
             return 1;
         }
diff --git a/tests/baselines/reference/augmentedTypesInterface.js b/tests/baselines/reference/augmentedTypesInterface.js
index e28864fd547..330fc035a9e 100644
--- a/tests/baselines/reference/augmentedTypesInterface.js
+++ b/tests/baselines/reference/augmentedTypesInterface.js
@@ -10,11 +10,11 @@ interface i {
 }
 
 // interface then class
-interface i2 { // error
+interface i2 {
     foo(): void;
 }
 
-class i2 {  // error
+class i2 {
     bar() {
         return 1;
     }
diff --git a/tests/baselines/reference/classAndInterfaceWithSameName.errors.txt b/tests/baselines/reference/classAndInterfaceWithSameName.errors.txt
index 62f1e6c71f7..f1f26f50f3e 100644
--- a/tests/baselines/reference/classAndInterfaceWithSameName.errors.txt
+++ b/tests/baselines/reference/classAndInterfaceWithSameName.errors.txt
@@ -8,7 +8,7 @@ tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.
     class C { foo: string; }
               ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
-    interface C { foo: string; } // error
+    interface C { foo: string; }
                   ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     
@@ -19,7 +19,7 @@ tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.
 !!! error TS2300: Duplicate identifier 'bar'.
         }
     
-        interface D { // error
+        interface D {
             bar: string;
             ~~~
 !!! error TS2300: Duplicate identifier 'bar'.
diff --git a/tests/baselines/reference/classAndInterfaceWithSameName.js b/tests/baselines/reference/classAndInterfaceWithSameName.js
index 09886e34bc8..bca0c96892c 100644
--- a/tests/baselines/reference/classAndInterfaceWithSameName.js
+++ b/tests/baselines/reference/classAndInterfaceWithSameName.js
@@ -1,13 +1,13 @@
 //// [classAndInterfaceWithSameName.ts]
 class C { foo: string; }
-interface C { foo: string; } // error
+interface C { foo: string; }
 
 module M {
     class D {
         bar: string;
     }
 
-    interface D { // error
+    interface D {
         bar: string;
     }
 }
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt
index ed4c23bdd60..684c123ebd7 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt
@@ -9,7 +9,7 @@ tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(41,16): er
         export interface I { }
     }
     module M {
-        export class I { } // error
+        export class I { }
     }
     
     module M {
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
index 944ef4e3d5f..ad96e55a507 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
@@ -3,7 +3,7 @@ module M {
     export interface I { }
 }
 module M {
-    export class I { } // error
+    export class I { }
 }
 
 module M {
@@ -60,7 +60,7 @@ var M;
         }
         return I;
     })();
-    M.I = I; // error
+    M.I = I;
 })(M || (M = {}));
 var M;
 (function (M) {
diff --git a/tests/baselines/reference/interfaceClassMerging2.js b/tests/baselines/reference/interfaceClassMerging2.js
index 66146e29684..0b40067640c 100644
--- a/tests/baselines/reference/interfaceClassMerging2.js
+++ b/tests/baselines/reference/interfaceClassMerging2.js
@@ -28,7 +28,7 @@ class Bar extends Foo {
 
 
 var bar = new Bar();
-bar.classFooMethod().interfaceFooMethod().classBarMethod().classFooMethod();
+bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod();
 
 
 var foo = new Foo();
@@ -61,6 +61,6 @@ var Bar = (function (_super) {
     return Bar;
 })(Foo);
 var bar = new Bar();
-bar.classFooMethod().interfaceFooMethod().classBarMethod().classFooMethod();
+bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod();
 var foo = new Foo();
 foo = bar;
diff --git a/tests/baselines/reference/interfaceClassMerging2.symbols b/tests/baselines/reference/interfaceClassMerging2.symbols
index 98949cc5461..290b49fdb3d 100644
--- a/tests/baselines/reference/interfaceClassMerging2.symbols
+++ b/tests/baselines/reference/interfaceClassMerging2.symbols
@@ -54,13 +54,13 @@ var bar = new Bar();
 >bar : Symbol(bar, Decl(interfaceClassMerging2.ts, 28, 3))
 >Bar : Symbol(Bar, Decl(interfaceClassMerging2.ts, 11, 1), Decl(interfaceClassMerging2.ts, 17, 1))
 
-bar.classFooMethod().interfaceFooMethod().classBarMethod().classFooMethod();
->bar.classFooMethod().interfaceFooMethod().classBarMethod().classFooMethod : Symbol(Foo.classFooMethod, Decl(interfaceClassMerging2.ts, 6, 27))
->bar.classFooMethod().interfaceFooMethod().classBarMethod : Symbol(Bar.classBarMethod, Decl(interfaceClassMerging2.ts, 20, 27))
->bar.classFooMethod().interfaceFooMethod : Symbol(Foo.interfaceFooMethod, Decl(interfaceClassMerging2.ts, 0, 15))
->bar.classFooMethod : Symbol(Foo.classFooMethod, Decl(interfaceClassMerging2.ts, 6, 27))
+bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod();
+>bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod : Symbol(Foo.classFooMethod, Decl(interfaceClassMerging2.ts, 6, 27))
+>bar.interfaceBarMethod().interfaceFooMethod().classBarMethod : Symbol(Bar.classBarMethod, Decl(interfaceClassMerging2.ts, 20, 27))
+>bar.interfaceBarMethod().interfaceFooMethod : Symbol(Foo.interfaceFooMethod, Decl(interfaceClassMerging2.ts, 0, 15))
+>bar.interfaceBarMethod : Symbol(Bar.interfaceBarMethod, Decl(interfaceClassMerging2.ts, 14, 15))
 >bar : Symbol(bar, Decl(interfaceClassMerging2.ts, 28, 3))
->classFooMethod : Symbol(Foo.classFooMethod, Decl(interfaceClassMerging2.ts, 6, 27))
+>interfaceBarMethod : Symbol(Bar.interfaceBarMethod, Decl(interfaceClassMerging2.ts, 14, 15))
 >interfaceFooMethod : Symbol(Foo.interfaceFooMethod, Decl(interfaceClassMerging2.ts, 0, 15))
 >classBarMethod : Symbol(Bar.classBarMethod, Decl(interfaceClassMerging2.ts, 20, 27))
 >classFooMethod : Symbol(Foo.classFooMethod, Decl(interfaceClassMerging2.ts, 6, 27))
diff --git a/tests/baselines/reference/interfaceClassMerging2.types b/tests/baselines/reference/interfaceClassMerging2.types
index 127777cb70c..68da86b8821 100644
--- a/tests/baselines/reference/interfaceClassMerging2.types
+++ b/tests/baselines/reference/interfaceClassMerging2.types
@@ -55,17 +55,17 @@ var bar = new Bar();
 >new Bar() : Bar
 >Bar : typeof Bar
 
-bar.classFooMethod().interfaceFooMethod().classBarMethod().classFooMethod();
->bar.classFooMethod().interfaceFooMethod().classBarMethod().classFooMethod() : Bar
->bar.classFooMethod().interfaceFooMethod().classBarMethod().classFooMethod : () => Bar
->bar.classFooMethod().interfaceFooMethod().classBarMethod() : Bar
->bar.classFooMethod().interfaceFooMethod().classBarMethod : () => Bar
->bar.classFooMethod().interfaceFooMethod() : Bar
->bar.classFooMethod().interfaceFooMethod : () => Bar
->bar.classFooMethod() : Bar
->bar.classFooMethod : () => Bar
+bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod();
+>bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod() : Bar
+>bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod : () => Bar
+>bar.interfaceBarMethod().interfaceFooMethod().classBarMethod() : Bar
+>bar.interfaceBarMethod().interfaceFooMethod().classBarMethod : () => Bar
+>bar.interfaceBarMethod().interfaceFooMethod() : Bar
+>bar.interfaceBarMethod().interfaceFooMethod : () => Bar
+>bar.interfaceBarMethod() : Bar
+>bar.interfaceBarMethod : () => Bar
 >bar : Bar
->classFooMethod : () => Bar
+>interfaceBarMethod : () => Bar
 >interfaceFooMethod : () => Bar
 >classBarMethod : () => Bar
 >classFooMethod : () => Bar
diff --git a/tests/baselines/reference/mergedClassInterface.js b/tests/baselines/reference/mergedClassInterface.js
index 7176255655d..64b52c23713 100644
--- a/tests/baselines/reference/mergedClassInterface.js
+++ b/tests/baselines/reference/mergedClassInterface.js
@@ -11,13 +11,13 @@ interface C2 { }
 
 declare class C2 { }
 
-class C3 { } // error -- cannot merge non-ambient class and interface
+class C3 { }
 
-interface C3 { } // error -- cannot merge non-ambient class and interface
+interface C3 { }
 
-interface C4 { } // error -- cannot merge non-ambient class and interface
+interface C4 { }
 
-class C4 { } // error -- cannot merge non-ambient class and interface
+class C4 { }
 
 interface C5 {
     x1: number;
@@ -59,12 +59,12 @@ var C3 = (function () {
     function C3() {
     }
     return C3;
-})(); // error -- cannot merge non-ambient class and interface
+})();
 var C4 = (function () {
     function C4() {
     }
     return C4;
-})(); // error -- cannot merge non-ambient class and interface
+})();
 // checks if properties actually were merged
 var c5;
 c5.x1;
diff --git a/tests/baselines/reference/mergedClassInterface.symbols b/tests/baselines/reference/mergedClassInterface.symbols
index 9e886eaa4d8..1c452851780 100644
--- a/tests/baselines/reference/mergedClassInterface.symbols
+++ b/tests/baselines/reference/mergedClassInterface.symbols
@@ -13,16 +13,16 @@ interface C2 { }
 declare class C2 { }
 >C2 : Symbol(C2, Decl(file1.ts, 4, 16), Decl(file1.ts, 6, 16))
 
-class C3 { } // error -- cannot merge non-ambient class and interface
+class C3 { }
 >C3 : Symbol(C3, Decl(file1.ts, 8, 20), Decl(file1.ts, 10, 12))
 
-interface C3 { } // error -- cannot merge non-ambient class and interface
+interface C3 { }
 >C3 : Symbol(C3, Decl(file1.ts, 8, 20), Decl(file1.ts, 10, 12))
 
-interface C4 { } // error -- cannot merge non-ambient class and interface
+interface C4 { }
 >C4 : Symbol(C4, Decl(file1.ts, 12, 16), Decl(file1.ts, 14, 16))
 
-class C4 { } // error -- cannot merge non-ambient class and interface
+class C4 { }
 >C4 : Symbol(C4, Decl(file1.ts, 12, 16), Decl(file1.ts, 14, 16))
 
 interface C5 {
diff --git a/tests/baselines/reference/mergedClassInterface.types b/tests/baselines/reference/mergedClassInterface.types
index 0e75434a5b1..4c3a6cca6a9 100644
--- a/tests/baselines/reference/mergedClassInterface.types
+++ b/tests/baselines/reference/mergedClassInterface.types
@@ -13,16 +13,16 @@ interface C2 { }
 declare class C2 { }
 >C2 : C2
 
-class C3 { } // error -- cannot merge non-ambient class and interface
+class C3 { }
 >C3 : C3
 
-interface C3 { } // error -- cannot merge non-ambient class and interface
+interface C3 { }
 >C3 : C3
 
-interface C4 { } // error -- cannot merge non-ambient class and interface
+interface C4 { }
 >C4 : C4
 
-class C4 { } // error -- cannot merge non-ambient class and interface
+class C4 { }
 >C4 : C4
 
 interface C5 {
diff --git a/tests/baselines/reference/nameCollisions.errors.txt b/tests/baselines/reference/nameCollisions.errors.txt
index 5977b039847..e3c1b691371 100644
--- a/tests/baselines/reference/nameCollisions.errors.txt
+++ b/tests/baselines/reference/nameCollisions.errors.txt
@@ -82,8 +82,8 @@ tests/cases/compiler/nameCollisions.ts(37,11): error TS2300: Duplicate identifie
         interface fi { } // ok
     
         class cli { }
-        interface cli { } // error
+        interface cli { }
     
         interface cli2 { }
-        class cli2 { } // error
+        class cli2 { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/nameCollisions.js b/tests/baselines/reference/nameCollisions.js
index 2cfaba94993..96ae2e9838b 100644
--- a/tests/baselines/reference/nameCollisions.js
+++ b/tests/baselines/reference/nameCollisions.js
@@ -41,10 +41,10 @@ module T {
     interface fi { } // ok
 
     class cli { }
-    interface cli { } // error
+    interface cli { }
 
     interface cli2 { }
-    class cli2 { } // error
+    class cli2 { }
 }
 
 //// [nameCollisions.js]
@@ -102,5 +102,5 @@ var T;
         function cli2() {
         }
         return cli2;
-    })(); // error
+    })();
 })(T || (T = {}));
diff --git a/tests/cases/compiler/augmentedTypesClass2.ts b/tests/cases/compiler/augmentedTypesClass2.ts
index c6d64e2bf82..b3be1378fb8 100644
--- a/tests/cases/compiler/augmentedTypesClass2.ts
+++ b/tests/cases/compiler/augmentedTypesClass2.ts
@@ -1,13 +1,13 @@
 // Checking class with other things in type space not value space
 
 // class then interface
-class c11 { // error
+class c11 {
     foo() {
         return 1;
     }
 }
 
-interface c11 { // error
+interface c11 {
     bar(): void;
 }
 
diff --git a/tests/cases/compiler/augmentedTypesInterface.ts b/tests/cases/compiler/augmentedTypesInterface.ts
index 72c85d6619d..7a51a21736f 100644
--- a/tests/cases/compiler/augmentedTypesInterface.ts
+++ b/tests/cases/compiler/augmentedTypesInterface.ts
@@ -9,11 +9,11 @@ interface i {
 }
 
 // interface then class
-interface i2 { // error
+interface i2 {
     foo(): void;
 }
 
-class i2 {  // error
+class i2 {
     bar() {
         return 1;
     }
diff --git a/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts b/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts
index e62dc5c7f97..93d69444362 100644
--- a/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts
+++ b/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts
@@ -2,7 +2,7 @@ module M {
     export interface I { }
 }
 module M {
-    export class I { } // error
+    export class I { }
 }
 
 module M {
diff --git a/tests/cases/compiler/interfaceClassMerging2.ts b/tests/cases/compiler/interfaceClassMerging2.ts
index cd32a93c988..b214dc1e793 100644
--- a/tests/cases/compiler/interfaceClassMerging2.ts
+++ b/tests/cases/compiler/interfaceClassMerging2.ts
@@ -27,7 +27,7 @@ class Bar extends Foo {
 
 
 var bar = new Bar();
-bar.classFooMethod().interfaceFooMethod().classBarMethod().classFooMethod();
+bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod();
 
 
 var foo = new Foo();
diff --git a/tests/cases/compiler/nameCollisions.ts b/tests/cases/compiler/nameCollisions.ts
index 25b3efae26f..90b2967fa5f 100644
--- a/tests/cases/compiler/nameCollisions.ts
+++ b/tests/cases/compiler/nameCollisions.ts
@@ -40,8 +40,8 @@ module T {
     interface fi { } // ok
 
     class cli { }
-    interface cli { } // error
+    interface cli { }
 
     interface cli2 { }
-    class cli2 { } // error
+    class cli2 { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts b/tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts
index 314c1e2c8f6..27ea77644a6 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts
@@ -1,12 +1,12 @@
 class C { foo: string; }
-interface C { foo: string; } // error
+interface C { foo: string; }
 
 module M {
     class D {
         bar: string;
     }
 
-    interface D { // error
+    interface D {
         bar: string;
     }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/mergedClassInterface.ts b/tests/cases/conformance/classes/classDeclarations/mergedClassInterface.ts
index 29400c63808..d64a0df3661 100644
--- a/tests/cases/conformance/classes/classDeclarations/mergedClassInterface.ts
+++ b/tests/cases/conformance/classes/classDeclarations/mergedClassInterface.ts
@@ -10,13 +10,13 @@ interface C2 { }
 
 declare class C2 { }
 
-class C3 { } // error -- cannot merge non-ambient class and interface
+class C3 { }
 
-interface C3 { } // error -- cannot merge non-ambient class and interface
+interface C3 { }
 
-interface C4 { } // error -- cannot merge non-ambient class and interface
+interface C4 { }
 
-class C4 { } // error -- cannot merge non-ambient class and interface
+class C4 { }
 
 interface C5 {
     x1: number;