From 948fc209a09df2609eb5c216217d627cb739fead Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Sun, 30 Nov 2014 23:51:38 -0800
Subject: [PATCH] Tests for modules

---
 src/services/services.ts                      |  1 +
 .../fourslash/quickInfoDisplayPartsModules.ts | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 tests/cases/fourslash/quickInfoDisplayPartsModules.ts

diff --git a/src/services/services.ts b/src/services/services.ts
index c768ffa6055..5422b7de15d 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2764,6 +2764,7 @@ module ts {
                 if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement;
                 if (flags & SymbolFlags.EnumMember) return ScriptElementKind.variableElement;
                 if (flags & SymbolFlags.Import) return ScriptElementKind.alias;
+                if (flags & SymbolFlags.Module) return ScriptElementKind.moduleElement;
             }
 
             return result;
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsModules.ts b/tests/cases/fourslash/quickInfoDisplayPartsModules.ts
new file mode 100644
index 00000000000..c86bce474ff
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoDisplayPartsModules.ts
@@ -0,0 +1,63 @@
+/// <reference path='fourslash.ts'/>
+
+////module /*1*/m {
+////    var /*2*/moduleElemWithoutExport = 10;
+////    export var /*3*/moduleElemWithExport = 10;
+////}
+////var /*4*/a = /*5*/m;
+////var /*6*/b: typeof /*7*/m;
+////module /*8*/m1./*9*/m2 {
+////    var /*10*/moduleElemWithoutExport = 10;
+////    export var /*11*/moduleElemWithExport = 10;
+////}
+////var /*12*/x = /*13*/m1./*14*/m2;
+////var /*15*/y: typeof /*16*/m1./*17*/m2;
+
+var marker = 0;
+function goToMarker() {
+    marker++;
+    goTo.marker(marker.toString());
+}
+
+function verifyModule(name: string, optionalParentName?: string) {
+    goToMarker();
+    var moduleNameDisplay = [{ text: name, kind: "moduleName" }];
+    if (optionalParentName) {
+        moduleNameDisplay = [{ text: optionalParentName, kind: "moduleName" }, { text: ".", kind: "punctuation" }].concat(moduleNameDisplay);
+    }
+    verify.verifyQuickInfoDisplayParts("module", optionalParentName ? "export" : "", { start: test.markerByName(marker.toString()).position, length: name.length },
+        [{ text: "module", kind: "keyword" }, { text: " ", kind: "space" }].concat(moduleNameDisplay),
+        []);
+}
+
+function verifyVar(name: string, optionalFullName?: ts.SymbolDisplayPart[], typeDisplay: ts.SymbolDisplayPart[]= [{ text: "number", kind: "keyword" }]) {
+    goToMarker();
+    verify.verifyQuickInfoDisplayParts("var", optionalFullName ? "export" : "", { start: test.markerByName(marker.toString()).position, length: name.length },
+        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+            { text: " ", kind: "space" }].concat(optionalFullName || [{ text: name, kind: "localName" }]).concat(
+            { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }).concat(typeDisplay),
+        []);
+}
+
+verifyModule("m");
+verifyVar("moduleElemWithoutExport");
+verifyVar("moduleElemWithExport", [{ text: "m", kind: "moduleName" }, { text: ".", kind: "punctuation" }, { text: "moduleElemWithExport", kind: "localName" }]);
+
+verifyVar("a", /*optionalFullName*/ undefined, [{ text: "typeof", kind: "keyword" }, { text: " ", kind: "space" }, { text: "m", kind: "moduleName" }]);
+verifyModule("m");
+verifyVar("b", /*optionalFullName*/ undefined, [{ text: "typeof", kind: "keyword" }, { text: " ", kind: "space" }, { text: "m", kind: "moduleName" }]);
+verifyModule("m");
+
+verifyModule("m1");
+verifyModule("m2", "m1");
+verifyVar("moduleElemWithoutExport");
+verifyVar("moduleElemWithExport", [{ text: "m1", kind: "moduleName" }, { text: ".", kind: "punctuation" },
+    { text: "m2", kind: "moduleName" }, { text: ".", kind: "punctuation" }, { text: "moduleElemWithExport", kind: "localName" }]);
+verifyVar("x", /*optionalFullName*/ undefined, [{ text: "typeof", kind: "keyword" }, { text: " ", kind: "space" },
+    { text: "m1", kind: "moduleName" }, { text: ".", kind: "punctuation" }, { text: "m2", kind: "moduleName" }]);
+verifyModule("m1");
+verifyModule("m2", "m1");
+verifyVar("y", /*optionalFullName*/ undefined, [{ text: "typeof", kind: "keyword" }, { text: " ", kind: "space" },
+    { text: "m1", kind: "moduleName" }, { text: ".", kind: "punctuation" }, { text: "m2", kind: "moduleName" }]);
+verifyModule("m1");
+verifyModule("m2", "m1");