Merge remote-tracking branch 'upstream/master' into loadJsFromModules

microsoft · billti · Jun 28, 2016 · Feb 13, 2016 · Feb 14, 2016 · Feb 14, 2016
commit 75d84dcf61985e664312d5e747c1951f68283e56
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2760,13 +2760,17 @@
         "category": "Message",
         "code": 6130
     },    
+    "Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'.": {
+        "category": "Error",
+        "code": 6131
+    },
     "The maximum dependency depth to search under node_modules and load JavaScript files": {
         "category": "Message",
-        "code": 6131
+        "code": 6132
     },
     "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'": {
         "category": "Message",
-        "code": 6132
+        "code": 6133
     },
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1771,10 +1771,6 @@ namespace ts {
                     reportFileNamesDifferOnlyInCasingError(fileName, file.fileName, refFile, refPos, refEnd);
                 }
 
-                if (file) {
-                    file.wasReferenced = file.wasReferenced || isReference;
-                }
-
                 // If this was a file found by a node_modules search, set the nodeModuleSearchDistance to parent distance + 1.
                 if (isFileFromNodeSearch) {
                     const newDistance = (refFile && refFile.nodeModuleSearchDistance) === undefined ? 1 : refFile.nodeModuleSearchDistance + 1;

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1601,8 +1601,6 @@ namespace ts {
         /* @internal */ commonJsModuleIndicator: Node;
         // The number of times node_modules was searched to locate the package containing this file
         /* @internal */ nodeModuleSearchDistance?: number;
-        // True if the file was a root file in a compilation or a /// reference targets
-        /* @internal */ wasReferenced?: boolean;
 
         /* @internal */ identifiers: Map<string>;
         /* @internal */ nodeCount: number;