From 32c477a4486341b0023ac318ec45539d5a4df321 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 21 Dec 2016 12:28:29 -0800
Subject: [PATCH 1/2] Test case for metadata type of class from a module

---
 .../reference/metadataOfClassFromModule.js    | 44 +++++++++++++++++++
 .../metadataOfClassFromModule.symbols         | 22 ++++++++++
 .../reference/metadataOfClassFromModule.types | 22 ++++++++++
 .../compiler/metadataOfClassFromModule.ts     | 14 ++++++
 4 files changed, 102 insertions(+)
 create mode 100644 tests/baselines/reference/metadataOfClassFromModule.js
 create mode 100644 tests/baselines/reference/metadataOfClassFromModule.symbols
 create mode 100644 tests/baselines/reference/metadataOfClassFromModule.types
 create mode 100644 tests/cases/compiler/metadataOfClassFromModule.ts

diff --git a/tests/baselines/reference/metadataOfClassFromModule.js b/tests/baselines/reference/metadataOfClassFromModule.js
new file mode 100644
index 00000000000..8d9f97489f2
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromModule.js
@@ -0,0 +1,44 @@
+//// [metadataOfClassFromModule.ts]
+module MyModule {
+
+    export function inject(target: any, key: string): void { }
+
+    export class Leg { }
+
+    export class Person {
+        @inject leftLeg: Leg;
+    }
+
+}
+
+//// [metadataOfClassFromModule.js]
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var MyModule;
+(function (MyModule) {
+    function inject(target, key) { }
+    MyModule.inject = inject;
+    var Leg = (function () {
+        function Leg() {
+        }
+        return Leg;
+    }());
+    MyModule.Leg = Leg;
+    var Person = (function () {
+        function Person() {
+        }
+        return Person;
+    }());
+    __decorate([
+        inject,
+        __metadata("design:type", Object)
+    ], Person.prototype, "leftLeg", void 0);
+    MyModule.Person = Person;
+})(MyModule || (MyModule = {}));
diff --git a/tests/baselines/reference/metadataOfClassFromModule.symbols b/tests/baselines/reference/metadataOfClassFromModule.symbols
new file mode 100644
index 00000000000..f430677f0fa
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromModule.symbols
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/metadataOfClassFromModule.ts ===
+module MyModule {
+>MyModule : Symbol(MyModule, Decl(metadataOfClassFromModule.ts, 0, 0))
+
+    export function inject(target: any, key: string): void { }
+>inject : Symbol(inject, Decl(metadataOfClassFromModule.ts, 0, 17))
+>target : Symbol(target, Decl(metadataOfClassFromModule.ts, 2, 27))
+>key : Symbol(key, Decl(metadataOfClassFromModule.ts, 2, 39))
+
+    export class Leg { }
+>Leg : Symbol(Leg, Decl(metadataOfClassFromModule.ts, 2, 62))
+
+    export class Person {
+>Person : Symbol(Person, Decl(metadataOfClassFromModule.ts, 4, 24))
+
+        @inject leftLeg: Leg;
+>inject : Symbol(inject, Decl(metadataOfClassFromModule.ts, 0, 17))
+>leftLeg : Symbol(Person.leftLeg, Decl(metadataOfClassFromModule.ts, 6, 25))
+>Leg : Symbol(Leg, Decl(metadataOfClassFromModule.ts, 2, 62))
+    }
+
+}
diff --git a/tests/baselines/reference/metadataOfClassFromModule.types b/tests/baselines/reference/metadataOfClassFromModule.types
new file mode 100644
index 00000000000..eeb24bf82aa
--- /dev/null
+++ b/tests/baselines/reference/metadataOfClassFromModule.types
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/metadataOfClassFromModule.ts ===
+module MyModule {
+>MyModule : typeof MyModule
+
+    export function inject(target: any, key: string): void { }
+>inject : (target: any, key: string) => void
+>target : any
+>key : string
+
+    export class Leg { }
+>Leg : Leg
+
+    export class Person {
+>Person : Person
+
+        @inject leftLeg: Leg;
+>inject : (target: any, key: string) => void
+>leftLeg : Leg
+>Leg : Leg
+    }
+
+}
diff --git a/tests/cases/compiler/metadataOfClassFromModule.ts b/tests/cases/compiler/metadataOfClassFromModule.ts
new file mode 100644
index 00000000000..aca356f2247
--- /dev/null
+++ b/tests/cases/compiler/metadataOfClassFromModule.ts
@@ -0,0 +1,14 @@
+// @experimentalDecorators: true
+// @emitDecoratorMetadata: true
+// @target: es5
+module MyModule {
+
+    export function inject(target: any, key: string): void { }
+
+    export class Leg { }
+
+    export class Person {
+        @inject leftLeg: Leg;
+    }
+
+}
\ No newline at end of file

From 08e6b1bc4872374f13acf5d75c3c54643c6137b9 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 21 Dec 2016 12:29:52 -0800
Subject: [PATCH 2/2] Update current scope when visiting namespace elements
 Fixes #13098

---
 src/compiler/transformers/ts.ts                        | 2 +-
 tests/baselines/reference/metadataOfClassFromModule.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index f791025807a..775f60355d8 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -2731,7 +2731,7 @@ namespace ts {
             let blockLocation: TextRange;
             const body = node.body;
             if (body.kind === SyntaxKind.ModuleBlock) {
-                addRange(statements, visitNodes((<ModuleBlock>body).statements, namespaceElementVisitor, isStatement));
+                saveStateAndInvoke(body, body => addRange(statements, visitNodes((<ModuleBlock>body).statements, namespaceElementVisitor, isStatement)));
                 statementsLocation = (<ModuleBlock>body).statements;
                 blockLocation = body;
             }
diff --git a/tests/baselines/reference/metadataOfClassFromModule.js b/tests/baselines/reference/metadataOfClassFromModule.js
index 8d9f97489f2..8ef120600df 100644
--- a/tests/baselines/reference/metadataOfClassFromModule.js
+++ b/tests/baselines/reference/metadataOfClassFromModule.js
@@ -38,7 +38,7 @@ var MyModule;
     }());
     __decorate([
         inject,
-        __metadata("design:type", Object)
+        __metadata("design:type", Leg)
     ], Person.prototype, "leftLeg", void 0);
     MyModule.Person = Person;
 })(MyModule || (MyModule = {}));