From 8325565f0ac8783895b0f1b5a16273526326ae4a Mon Sep 17 00:00:00 2001
From: Richard Knoll <riknoll@microsoft.com>
Date: Tue, 5 Jul 2016 13:24:49 -0700
Subject: [PATCH 01/18] Add support for including dotted and .min.js files
 explicitly in include

---
 src/compiler/commandLineParser.ts   |   7 --
 src/compiler/core.ts                |  40 +++++-
 tests/cases/unittests/matchFiles.ts | 186 ++++++++++++++++++++++++++++
 3 files changed, 221 insertions(+), 12 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 7b2aedb5d3d..72fd5ff6fd7 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -689,9 +689,6 @@ namespace ts {
         return output;
     }
 
-    // Skip over any minified JavaScript files (ending in ".min.js")
-    // Skip over dotted files and folders as well
-    const ignoreFileNamePattern = /(\.min\.js$)|([\\/]\.[\w.])/;
     /**
       * Parse the contents of a config file (tsconfig.json).
       * @param json The contents of the config file to parse
@@ -1003,10 +1000,6 @@ namespace ts {
                     continue;
                 }
 
-                if (ignoreFileNamePattern.test(file)) {
-                    continue;
-                }
-
                 // We may have included a wildcard path with a lower priority
                 // extension due to the user-defined order of entries in the
                 // "include" array. If there is a lower priority extension in the
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index fe4731a1c91..3fda91303f9 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -927,6 +927,22 @@ namespace ts {
             return undefined;
         }
 
+        /**
+         * Regex for the * wildcard. Matches all characters except for directory seperators. When
+         * used for including files, also does not match the file extension .min.js
+         *
+         * Breakdown for the "files" version:
+         *  [^./]                   # matches everything up to the first . character (excluding directory seperators)
+         *  (\\.(?!min\\.js$))?     # matches . characters but not if they are part of the .min.js file extension
+         */
+        const singleAsteriskRegexFragment = usage === "files" ? "([^./]*(\\.(?!min\\.js$))?)*" : "[^/]*";
+
+        /**
+         * Regex for the ** wildcard. Matches any number of subdirectories. When used for including
+         * files or directories, does not match subdirectories that start with a . character
+         */
+        const doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?"
+
         let pattern = "";
         let hasWrittenSubpattern = false;
         spec: for (const spec of specs) {
@@ -947,13 +963,13 @@ namespace ts {
             components[0] = removeTrailingDirectorySeparator(components[0]);
 
             let optionalCount = 0;
-            for (const component of components) {
+            for (let component of components) {
                 if (component === "**") {
                     if (hasRecursiveDirectoryWildcard) {
                         continue spec;
                     }
 
-                    subpattern += "(/.+?)?";
+                    subpattern += doubleAsteriskRegexFragment;
                     hasRecursiveDirectoryWildcard = true;
                     hasWrittenComponent = true;
                 }
@@ -967,6 +983,20 @@ namespace ts {
                         subpattern += directorySeparator;
                     }
 
+                    if (usage !== "exclude") {
+                        // The * and ? wildcards should not match directories or files that start with . if they
+                        // appear first in a component. Dotted directories and files can be included explicitly
+                        // like so: **/.*/.*
+                        if (startsWith(component, "*")) {
+                            subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
+                            component = component.substr(1);
+                        }
+                        else if (startsWith(component, "?")) {
+                            subpattern += "[^./]";
+                            component = component.substr(1);
+                        }
+                    }
+
                     subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
                     hasWrittenComponent = true;
                 }
@@ -990,10 +1020,10 @@ namespace ts {
         }
 
         return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
-    }
 
-    function replaceWildcardCharacter(match: string) {
-        return match === "*" ? "[^/]*" : match === "?" ? "[^/]" : "\\" + match;
+        function replaceWildcardCharacter(match: string) {
+            return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;
+        }
     }
 
     export interface FileSystemEntries {
diff --git a/tests/cases/unittests/matchFiles.ts b/tests/cases/unittests/matchFiles.ts
index d68fb9b2a7f..e862cdc379e 100644
--- a/tests/cases/unittests/matchFiles.ts
+++ b/tests/cases/unittests/matchFiles.ts
@@ -24,6 +24,8 @@ namespace ts {
         "c:/dev/x/y/b.ts",
         "c:/dev/js/a.js",
         "c:/dev/js/b.js",
+        "c:/dev/js/d.min.js",
+        "c:/dev/js/ab.min.js",
         "c:/ext/ext.ts",
         "c:/ext/b/a..b.ts"
     ]);
@@ -76,6 +78,17 @@ namespace ts {
         "c:/dev/jspm_packages/a.ts"
     ]);
 
+    const caseInsensitiveDottedFoldersHost = new Utils.MockParseConfigHost(caseInsensitiveBasePath, /*useCaseSensitiveFileNames*/ false, [
+        "c:/dev/x/d.ts",
+        "c:/dev/x/y/d.ts",
+        "c:/dev/x/y/.e.ts",
+        "c:/dev/x/.y/a.ts",
+        "c:/dev/.z/.b.ts",
+        "c:/dev/.z/c.ts",
+        "c:/dev/w/.u/e.ts",
+        "c:/dev/g.min.js/.g/g.ts"
+    ]);
+
     describe("matchFiles", () => {
         describe("with literal file list", () => {
             it("without exclusions", () => {
@@ -727,6 +740,33 @@ namespace ts {
                 assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
                 assert.deepEqual(actual.errors, expected.errors);
             });
+            it("include explicitly listed .min.js files when allowJs=true", () => {
+                const json = {
+                    compilerOptions: {
+                        allowJs: true
+                    },
+                    include: [
+                        "js/*.min.js"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {
+                        allowJs: true
+                    },
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/js/ab.min.js",
+                        "c:/dev/js/d.min.js"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev/js": ts.WatchDirectoryFlags.None
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
             it("include paths outside of the project", () => {
                 const json = {
                     include: [
@@ -952,6 +992,35 @@ namespace ts {
                 assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
                 assert.deepEqual(actual.errors, expected.errors);
             });
+            it("exclude .min.js files using wildcards", () => {
+                const json = {
+                    compilerOptions: {
+                        allowJs: true
+                    },
+                    include: [
+                        "js/*.min.js"
+                    ],
+                    exclude: [
+                        "js/a*"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {
+                        allowJs: true
+                    },
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/js/d.min.js"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev/js": ts.WatchDirectoryFlags.None
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
             describe("with trailing recursive directory", () => {
                 it("in includes", () => {
                     const json = {
@@ -1146,5 +1215,122 @@ namespace ts {
                 });
             });
         });
+        describe("with files or folders that begin with a .", () => {
+            it("that are not explicitly included", () => {
+                const json = {
+                    include: [
+                        "x/**/*",
+                        "w/*/*"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/x/d.ts",
+                        "c:/dev/x/y/d.ts",
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev/x": ts.WatchDirectoryFlags.Recursive,
+                        "c:/dev/w": ts.WatchDirectoryFlags.Recursive
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveDottedFoldersHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            describe("that are explicitly included", () => {
+                it("without wildcards", () => {
+                    const json = {
+                        include: [
+                            "x/.y/a.ts",
+                            "c:/dev/.z/.b.ts"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [],
+                        fileNames: [
+                            "c:/dev/.z/.b.ts",
+                            "c:/dev/x/.y/a.ts"
+                        ],
+                        wildcardDirectories: {}
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveDottedFoldersHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+                it("with recursive wildcards that match directories", () => {
+                    const json = {
+                        include: [
+                            "**/.*/*"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [],
+                        fileNames: [
+                            "c:/dev/.z/c.ts",
+                            "c:/dev/g.min.js/.g/g.ts",
+                            "c:/dev/w/.u/e.ts",
+                            "c:/dev/x/.y/a.ts"
+                        ],
+                        wildcardDirectories: {
+                            "c:/dev": ts.WatchDirectoryFlags.Recursive
+                        }
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveDottedFoldersHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+                it("with recursive wildcards that match nothing", () => {
+                    const json = {
+                        include: [
+                            "x/**/.y/*",
+                            ".z/**/.*"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [],
+                        fileNames: [
+                            "c:/dev/.z/.b.ts",
+                            "c:/dev/x/.y/a.ts"
+                        ],
+                        wildcardDirectories: {
+                            "c:/dev/.z": ts.WatchDirectoryFlags.Recursive,
+                            "c:/dev/x": ts.WatchDirectoryFlags.Recursive
+                        }
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveDottedFoldersHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+                it("with wildcard excludes that implicitly exclude dotted files", () => {
+                    const json = {
+                        include: [
+                            "**/.*/*"
+                        ],
+                        exclude: [
+                            "**/*"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [],
+                        fileNames: [],
+                        wildcardDirectories: {}
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveDottedFoldersHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+            });
+        });
     });
 }
\ No newline at end of file

From 0966ebcffb51cda0e73657784a2aebaa9ca3f955 Mon Sep 17 00:00:00 2001
From: Richard Knoll <riknoll@microsoft.com>
Date: Tue, 5 Jul 2016 17:11:04 -0700
Subject: [PATCH 02/18] Removing startsWith reference and fixing linter error

---
 src/compiler/core.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 3fda91303f9..895a325cca6 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -941,7 +941,7 @@ namespace ts {
          * Regex for the ** wildcard. Matches any number of subdirectories. When used for including
          * files or directories, does not match subdirectories that start with a . character
          */
-        const doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?"
+        const doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?";
 
         let pattern = "";
         let hasWrittenSubpattern = false;
@@ -987,11 +987,11 @@ namespace ts {
                         // The * and ? wildcards should not match directories or files that start with . if they
                         // appear first in a component. Dotted directories and files can be included explicitly
                         // like so: **/.*/.*
-                        if (startsWith(component, "*")) {
+                        if (component.indexOf("*") === 0) {
                             subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
                             component = component.substr(1);
                         }
-                        else if (startsWith(component, "?")) {
+                        else if (component.indexOf("?") === 0) {
                             subpattern += "[^./]";
                             component = component.substr(1);
                         }

From e0aca418bc0ae395c84ab770c33a7c019ced27cc Mon Sep 17 00:00:00 2001
From: Richard Knoll <riknoll@microsoft.com>
Date: Tue, 12 Jul 2016 11:13:35 -0700
Subject: [PATCH 03/18] Responding to PR feedback

---
 src/compiler/core.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 895a325cca6..f913e6f9664 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -987,17 +987,17 @@ namespace ts {
                         // The * and ? wildcards should not match directories or files that start with . if they
                         // appear first in a component. Dotted directories and files can be included explicitly
                         // like so: **/.*/.*
-                        if (component.indexOf("*") === 0) {
+                        if (component.charCodeAt(0) === CharacterCodes.asterisk) {
                             subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
                             component = component.substr(1);
                         }
-                        else if (component.indexOf("?") === 0) {
+                        else if (component.charCodeAt(0) === CharacterCodes.question) {
                             subpattern += "[^./]";
                             component = component.substr(1);
                         }
                     }
 
-                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+                    subpattern += replaceWildcardCharacters(component, singleAsteriskRegexFragment);
                     hasWrittenComponent = true;
                 }
             }
@@ -1020,6 +1020,10 @@ namespace ts {
         }
 
         return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
+    }
+
+    function replaceWildcardCharacters(component: string, singleAsteriskRegexFragment: string) {
+        return component.replace(reservedCharacterPattern, replaceWildcardCharacter);
 
         function replaceWildcardCharacter(match: string) {
             return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;

From 574851f526d65d139ccc1d32f0b1c66634d47ed9 Mon Sep 17 00:00:00 2001
From: Richard Knoll <riknoll@microsoft.com>
Date: Wed, 13 Jul 2016 11:00:54 -0700
Subject: [PATCH 04/18] More PR feedback

---
 src/compiler/core.ts | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index dca1487e1fa..5157f3e0b04 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -922,20 +922,22 @@ namespace ts {
     const reservedCharacterPattern = /[^\w\s\/]/g;
     const wildcardCharCodes = [CharacterCodes.asterisk, CharacterCodes.question];
 
+    /**
+     * Matches any single directory segment unless it is the last segment and a .min.js file
+     * Breakdown:
+     *  [^./]                   # matches everything up to the first . character (excluding directory seperators)
+     *  (\\.(?!min\\.js$))?     # matches . characters but not if they are part of the .min.js file extension
+     */
+    const singleAsteriskRegexFragmentFiles = "([^./]*(\\.(?!min\\.js$))?)*";
+    const singleAsteriskRegexFragmentOther = "[^/]*";
+
     export function getRegularExpressionForWildcard(specs: string[], basePath: string, usage: "files" | "directories" | "exclude") {
         if (specs === undefined || specs.length === 0) {
             return undefined;
         }
 
-        /**
-         * Regex for the * wildcard. Matches all characters except for directory seperators. When
-         * used for including files, also does not match the file extension .min.js
-         *
-         * Breakdown for the "files" version:
-         *  [^./]                   # matches everything up to the first . character (excluding directory seperators)
-         *  (\\.(?!min\\.js$))?     # matches . characters but not if they are part of the .min.js file extension
-         */
-        const singleAsteriskRegexFragment = usage === "files" ? "([^./]*(\\.(?!min\\.js$))?)*" : "[^/]*";
+        const replaceWildcardCharacter =  usage === "files" ? replaceWildCardCharacterFiles : replaceWildCardCharacterOther;
+        const singleAsteriskRegexFragment = usage === "files" ? singleAsteriskRegexFragmentFiles : singleAsteriskRegexFragmentOther;
 
         /**
          * Regex for the ** wildcard. Matches any number of subdirectories. When used for including
@@ -997,7 +999,7 @@ namespace ts {
                         }
                     }
 
-                    subpattern += replaceWildcardCharacters(component, singleAsteriskRegexFragment);
+                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
                     hasWrittenComponent = true;
                 }
             }
@@ -1022,12 +1024,16 @@ namespace ts {
         return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
     }
 
-    function replaceWildcardCharacters(component: string, singleAsteriskRegexFragment: string) {
-        return component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+    function replaceWildCardCharacterFiles(match: string) {
+        return replaceWildcardCharacter(match, singleAsteriskRegexFragmentFiles);
+    }
 
-        function replaceWildcardCharacter(match: string) {
-            return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;
-        }
+    function replaceWildCardCharacterOther(match: string) {
+        return replaceWildcardCharacter(match, singleAsteriskRegexFragmentOther);
+    }
+
+    function replaceWildcardCharacter(match: string, singleAsteriskRegexFragment: string) {
+        return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;
     }
 
     export interface FileSystemEntries {

From f24341f719866af6b31f96e6eebafba1852ac80a Mon Sep 17 00:00:00 2001
From: Sudheesh Singanamalla <sudheesh1995@outlook.com>
Date: Fri, 22 Jul 2016 00:55:21 +0530
Subject: [PATCH 05/18] Remove dependency on tsd, Related to #9658 (#9724)

---
 Jakefile.js      |  9 ---------
 package.json     |  1 -
 scripts/tsd.json | 12 ------------
 3 files changed, 22 deletions(-)
 delete mode 100644 scripts/tsd.json

diff --git a/Jakefile.js b/Jakefile.js
index 1c22305cd86..3ccca833333 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -468,15 +468,6 @@ task("publish-nightly", ["configure-nightly", "LKG", "clean", "setDebugMode", "r
     exec(cmd);
 });
 
-var scriptsTsdJson = path.join(scriptsDirectory, "tsd.json");
-file(scriptsTsdJson);
-
-task("tsd-scripts", [scriptsTsdJson], function () {
-    var cmd = "tsd --config " + scriptsTsdJson + " install";
-    console.log(cmd);
-    exec(cmd);
-}, { async: true });
-
 var importDefinitelyTypedTestsDirectory = path.join(scriptsDirectory, "importDefinitelyTypedTests");
 var importDefinitelyTypedTestsJs = path.join(importDefinitelyTypedTestsDirectory, "importDefinitelyTypedTests.js");
 var importDefinitelyTypedTestsTs = path.join(importDefinitelyTypedTestsDirectory, "importDefinitelyTypedTests.ts");
diff --git a/package.json b/package.json
index efe3866b6db..5606a423a0e 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,6 @@
         "sorcery": "latest",
         "through2": "latest",
         "ts-node": "latest",
-        "tsd": "latest",
         "tslint": "next",
         "typescript": "next"
     },
diff --git a/scripts/tsd.json b/scripts/tsd.json
deleted file mode 100644
index c2fc88a0b0f..00000000000
--- a/scripts/tsd.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "version": "v4",
-  "repo": "borisyankov/DefinitelyTyped",
-  "ref": "master",
-  "path": "typings",
-  "bundle": "typings/tsd.d.ts",
-  "installed": {
-    "node/node.d.ts": {
-      "commit": "5f480287834a2615274eea31574b713e64decf17"
-    }
-  }
-}

From bd25c130caaa6c607e830f0f29784d1691308d87 Mon Sep 17 00:00:00 2001
From: Yui <yuit@users.noreply.github.com>
Date: Fri, 22 Jul 2016 07:15:12 -0700
Subject: [PATCH 06/18] Port PR 9745 to master (#9881)

* Add completion for quote property name in object literal expression

* Add fourslash tests for completion of quoted property in object literal expression

* Handle object-literal expression as an argument

Undo wip

Undo wip

Conflicts:
	src/services/services.ts

* Add tests and baseline for object literal expression for arguments
---
 src/services/services.ts                      | 49 ++++++++++++++++---
 ...nForQuotedPropertyInPropertyAssignment1.ts | 24 +++++++++
 ...nForQuotedPropertyInPropertyAssignment2.ts | 30 ++++++++++++
 ...nForQuotedPropertyInPropertyAssignment3.ts | 26 ++++++++++
 ...nForQuotedPropertyInPropertyAssignment4.ts | 24 +++++++++
 5 files changed, 147 insertions(+), 6 deletions(-)
 create mode 100644 tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts
 create mode 100644 tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts
 create mode 100644 tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts
 create mode 100644 tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts

diff --git a/src/services/services.ts b/src/services/services.ts
index 3124c78bd15..3b8be487aba 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -4296,6 +4296,7 @@ namespace ts {
                     kindModifiers: getSymbolModifiers(symbol),
                     sortText: "0",
                 };
+
             }
 
             function getCompletionEntriesFromSymbols(symbols: Symbol[], entries: CompletionEntry[], location: Node, performCharacterChecks: boolean): Map<string> {
@@ -4324,22 +4325,58 @@ namespace ts {
                     return undefined;
                 }
 
-                const argumentInfo = SignatureHelp.getContainingArgumentInfo(node, position, sourceFile);
-                if (argumentInfo) {
-                    // Get string literal completions from specialized signatures of the target
-                    return getStringLiteralCompletionEntriesFromCallExpression(argumentInfo);
+                if (node.parent.kind === SyntaxKind.PropertyAssignment && node.parent.parent.kind === SyntaxKind.ObjectLiteralExpression) {
+                    // Get quoted name of properties of the object literal expression
+                    // i.e. interface ConfigFiles {
+                    //          'jspm:dev': string
+                    //      }
+                    //      let files: ConfigFiles = {
+                    //          '/*completion position*/'
+                    //      }
+                    //
+                    //      function foo(c: ConfigFiles) {}
+                    //      foo({
+                    //          '/*completion position*/'
+                    //      });
+                    return getStringLiteralCompletionEntriesFromPropertyAssignment(<ObjectLiteralElement>node.parent);
                 }
                 else if (isElementAccessExpression(node.parent) && node.parent.argumentExpression === node) {
                     // Get all names of properties on the expression
+                    // i.e. interface A {
+                    //      'prop1': string
+                    // }
+                    // let a: A;
+                    // a['/*completion position*/']
                     return getStringLiteralCompletionEntriesFromElementAccess(node.parent);
                 }
                 else {
-                    // Otherwise, get the completions from the contextual type if one exists
+                    const argumentInfo = SignatureHelp.getContainingArgumentInfo(node, position, sourceFile);
+                    if (argumentInfo) {
+                        // Get string literal completions from specialized signatures of the target
+                        // i.e. declare function f(a: 'A');
+                        // f("/*completion position*/")
+                        return getStringLiteralCompletionEntriesFromCallExpression(argumentInfo, node);
+                    }
+
+                    // Get completion for string literal from string literal type
+                    // i.e. var x: "hi" | "hello" = "/*completion position*/"
                     return getStringLiteralCompletionEntriesFromContextualType(<StringLiteral>node);
                 }
             }
 
-            function getStringLiteralCompletionEntriesFromCallExpression(argumentInfo: SignatureHelp.ArgumentListInfo) {
+            function getStringLiteralCompletionEntriesFromPropertyAssignment(element: ObjectLiteralElement) {
+                const typeChecker = program.getTypeChecker();
+                const type = typeChecker.getContextualType((<ObjectLiteralExpression>element.parent));
+                const entries: CompletionEntry[] = [];
+                if (type) {
+                    getCompletionEntriesFromSymbols(type.getApparentProperties(), entries, element, /*performCharacterChecks*/false);
+                    if (entries.length) {
+                        return { isMemberCompletion: true, isNewIdentifierLocation: true, entries };
+                    }
+                }
+            }
+
+            function getStringLiteralCompletionEntriesFromCallExpression(argumentInfo: SignatureHelp.ArgumentListInfo, location: Node) {
                 const typeChecker = program.getTypeChecker();
                 const candidates: Signature[] = [];
                 const entries: CompletionEntry[] = [];
diff --git a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts
new file mode 100644
index 00000000000..7faebc1474b
--- /dev/null
+++ b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts'/>
+
+//// export interface Configfiles {
+////   jspm: string;
+////   'jspm:browser': string;
+////   'jspm:dev': string;
+////   'jspm:node': string;
+//// }
+
+//// let files: Configfiles;
+//// files = {
+////    /*0*/: '',
+////    '/*1*/': ''
+//// }
+
+goTo.marker('0');
+verify.completionListContains("jspm");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(1);
+
+goTo.marker('1');
+verify.completionListContains("jspm:dev");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(4);
diff --git a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts
new file mode 100644
index 00000000000..4ba88e7dd2a
--- /dev/null
+++ b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts
@@ -0,0 +1,30 @@
+/// <reference path='fourslash.ts'/>
+
+//// export interface Config {
+////    files: ConfigFiles
+//// }
+
+//// export interface ConfigFiles {
+////   jspm: string;
+////   'jspm:browser': string;
+////   'jspm:dev': string;
+////   'jspm:node': string;
+//// }
+
+//// let config: Config;
+//// config = {
+////    files: {
+////        /*0*/: '',
+////        '/*1*/': ''
+////    }
+//// }
+
+goTo.marker('0');
+verify.completionListContains("jspm");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(1);
+
+goTo.marker('1');
+verify.completionListContains("jspm:dev");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(4);
diff --git a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts
new file mode 100644
index 00000000000..238606520e3
--- /dev/null
+++ b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts
@@ -0,0 +1,26 @@
+/// <reference path='fourslash.ts'/>
+
+////  let configFiles1: {
+////      jspm: string;
+////      'jspm:browser': string;
+////  } = {
+////          /*0*/: "", 
+////  }
+
+////  let configFiles2: {
+////      jspm: string;
+////      'jspm:browser': string;
+////  } = {
+////         jspm: "",
+////         '/*1*/': "" 
+////  }
+
+goTo.marker('0');
+verify.completionListContains("jspm");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(1);
+
+goTo.marker('1');
+verify.completionListContains("jspm:browser");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(2);
diff --git a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts
new file mode 100644
index 00000000000..9855bb8c502
--- /dev/null
+++ b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts'/>
+
+//// export interface ConfigFiles {
+////   jspm: string;
+////   'jspm:browser': string;
+////   'jspm:dev': string;
+////   'jspm:node': string;
+//// }
+
+//// function foo(c: ConfigFiles) {}
+//// foo({
+////     j/*0*/: "",
+////     "/*1*/": "",
+//// })
+
+goTo.marker('0');
+verify.completionListContains("jspm");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(1);
+
+goTo.marker('1');
+verify.completionListContains("jspm:dev");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(4);

From f94025d855581f4fc94d7ca895fc2c227614205a Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 1 Jul 2016 13:34:15 -0700
Subject: [PATCH 07/18] Improve web tests

* Provide a favicon so chrome doesn't block waiting for one
* Provide accurate content type so chrome doesn't warn
---
 tests/webTestResults.html       |  13 +++++++------
 tests/webTestServer.ts          |  26 +++++++++++++++++---------
 tests/webhost/favicon-32x32.png | Bin 0 -> 800 bytes
 3 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 tests/webhost/favicon-32x32.png

diff --git a/tests/webTestResults.html b/tests/webTestResults.html
index 2993681934e..9c403248f94 100644
--- a/tests/webTestResults.html
+++ b/tests/webTestResults.html
@@ -3,22 +3,23 @@
   <meta charset="utf-8">
   <title>Mocha Tests</title>
   <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  <link rel="icon" href="./webhost/favicon-32x32.png"/>
 </head>
 <body>
-  <div id='setup'>   
+  <div id='setup'>
     <div>
-      <button id='selectCompilerBtn' onclick='location.href="http://localhost:8888/tests/webTestResults.html?grep=compiler"'>Select Compiler Tests</button>  
-      <button id='selectFourslashBtn' onclick='location.href="http://localhost:8888/tests/webTestResults.html?grep=fourslash"'>Select Fourslash Tests</button>  
+      <button id='selectCompilerBtn' onclick='location.href="http://localhost:8888/tests/webTestResults.html?grep=compiler"'>Select Compiler Tests</button>
+      <button id='selectFourslashBtn' onclick='location.href="http://localhost:8888/tests/webTestResults.html?grep=fourslash"'>Select Fourslash Tests</button>
     </div>
-    <button id='runTestBtn' onclick='runTests()'>Run Tests</button>  
+    <button id='runTestBtn' onclick='runTests()'>Run Tests</button>
   </div>
-  
+
   <div id="mocha"></div>
   <script src="http://ajax.aspnetcdn.com/ajax/jQuery/jquery-2.1.0.js"></script>
   <script src="../node_modules/mocha/mocha.js"></script>
   <script>mocha.setup('bdd')</script>
   <script src="../built/local/bundle.js"></script>
-  
+
   <script>
     // mocha is going to call this on every test result and make the results page unusable for a long
     // time after the tests are already done, doesn't seem necessary
diff --git a/tests/webTestServer.ts b/tests/webTestServer.ts
index 9d28b4592ff..b79c464ab4e 100644
--- a/tests/webTestServer.ts
+++ b/tests/webTestServer.ts
@@ -111,7 +111,7 @@ function writeFile(path: string, data: any, opts: { recursive: boolean }) {
 
 /// Request Handling ///
 
-function handleResolutionRequest(filePath: string, res: http.ServerResponse) {    
+function handleResolutionRequest(filePath: string, res: http.ServerResponse) {
     var resolvedPath = path.resolve(filePath, '');
     resolvedPath = resolvedPath.substring(resolvedPath.indexOf('tests'));
     resolvedPath = switchToForwardSlashes(resolvedPath);
@@ -202,14 +202,13 @@ function handleRequestOperation(req: http.ServerRequest, res: http.ServerRespons
             break;
         case RequestType.GetFile:
             fs.readFile(reqPath, function (err, file) {
-                var ext = reqPath.substr(reqPath.lastIndexOf('.'));
-                var contentType = 'binary';
-                if (ext === '.js') contentType = 'text/javascript'
-                else if (ext === '.css') contentType = 'text/javascript'
-                else if (ext === '.html') contentType = 'text/html'
-                err
-                ? send('fail', res, err.message, contentType)
-                : send('success', res, (<any>file), contentType);
+                const contentType = contentTypeForExtension(path.extname(reqPath));
+                if (err) {
+                    send('fail', res, err.message, contentType);
+                }
+                else {
+                    send('success', res, <any>file, contentType);
+                }
             });
             break;
         case RequestType.ResolveFile:
@@ -249,6 +248,15 @@ function handleRequestOperation(req: http.ServerRequest, res: http.ServerRespons
             send('unknown', res, null);
             break;
     }
+
+    function contentTypeForExtension(ext: string) {
+        switch (ext) {
+            case '.js': return 'text/javascript';
+            case '.css': return 'text/css';
+            case '.html': return 'text/html';
+            default: return 'binary';
+        }
+    }
 }
 
 console.log("Static file server running at\n  => http://localhost:" + port + "/\nCTRL + C to shutdown");
diff --git a/tests/webhost/favicon-32x32.png b/tests/webhost/favicon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..efbce163f929bbd4d551f93940a6d9187f9cca1c
GIT binary patch
literal 800
zcmV+*1K<3KP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0004)P)t-s0Cd3s
zbHM;}zyx-}9D~Rpg~=d>$rXRb0CK<vcfuZo$P#|V8-vKk;PK<|_~GyP<?;EH#pMBX
z!4Q1KVyW4$)a=yf^x*FI-tG6#<@2Y{>M@VaABD)^?)d-z|EA9A8G*;C(CYjB{$Q!t
z8iL2X+V9ut_0{P0*y{E6`u*zk`qt?6+3NO;z~h9x;r{;r-|hFi+U~vE@7wJ5`uzT3
zsn`Q`!W4hT7J$YghRMt0@`=CV6Mn|b<MSqo$_IGE2zkRDgvej0*gcid4SK|WxZePA
zz#W6gh`r(faK8<E#D2Np(dP8s?e|Td)CP9K0d>KV!{qSy`=ib2LYUDAcf%ux$;008
z@%a3r%;+eI${~iym&fMp^!h1^%LR7AHj&Pg#O3Pq`k2S&0(HUzbiqTI(c0_w)93UR
zfX0Ts;ot7}7=g#E((7ic+9im}x!LZ{<n!3-_Wl0;-0b$c+U|+I;unF(*6H=L*6j;=
z#IDopZ?N12cfwbr*3IPe-R$?&==HSL?Q5>v0(HR;e8mxc#Rhl724&}%0003)Nkl<Z
zILqylRZ~J?5QcX@Kt4rKu@LdKyD>Oo0CsnG7ns=H{%tS7qm0LUFMO_cW}n%acXx^Y
z`E#&PVIm@C=I?!--tbA3kyu6>WArB7m%_1TOI(=v1Z!eaa!RT#&7Lk)!I1%#%&hF3
zP?alHAuqq6u&5X)DJ(53uK+5ms+~2pb*e!1E=6f@1C33JVrT}cTRdK0Yn%9%f<?O-
z=;&nGRRwhSFtM~oChau?eUjMK4-5<r$sel-3p6|eV03JJLi{4|<P-o*&&&#KfyCVW
z0sy!dg|<LqX?bN8z}mXDz(jIma|_tsVJ*R<NG9sp1^hmt6*I86@AG;N4uK;RYYNA~
z6X&U|5;)Ud)cHl|RKZJq!~nXwwpeZ?(e0i6{=xtF^lXgm(@VhNcqJl|x;MSg_%2!F
e?N~isxcUH(8alIFAJ@(R0000<MNUMnLSTZ3slTWI

literal 0
HcmV?d00001


From 25525607d5332dcf612ea481c9f1d96d6d2be81e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 22 Jul 2016 13:38:45 -0700
Subject: [PATCH 08/18] Test that protected constructors are accessible

in static methods of subclasses
---
 .../classConstructorAccessibility2.errors.txt | 42 +++++++++-------
 .../classConstructorAccessibility2.js         | 49 ++++++++++++-------
 .../classConstructorAccessibility5.errors.txt | 17 +++++++
 .../classConstructorAccessibility5.js         | 38 ++++++++++++++
 .../classConstructorAccessibility2.ts         | 24 +++++----
 .../classConstructorAccessibility5.ts         | 10 ++++
 6 files changed, 135 insertions(+), 45 deletions(-)
 create mode 100644 tests/baselines/reference/classConstructorAccessibility5.errors.txt
 create mode 100644 tests/baselines/reference/classConstructorAccessibility5.js
 create mode 100644 tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility5.ts

diff --git a/tests/baselines/reference/classConstructorAccessibility2.errors.txt b/tests/baselines/reference/classConstructorAccessibility2.errors.txt
index 7bd784ac268..01f2e2ea869 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.errors.txt
+++ b/tests/baselines/reference/classConstructorAccessibility2.errors.txt
@@ -1,11 +1,12 @@
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(26,28): error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(29,24): error TS2675: Cannot extend a class 'BaseC'. Class constructor is marked as private.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(32,28): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(36,10): error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(37,10): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(28,28): error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(32,24): error TS2675: Cannot extend a class 'BaseC'. Class constructor is marked as private.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(35,28): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(36,35): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(40,10): error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(41,10): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
 
 
-==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts (5 errors) ====
+==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts (6 errors) ====
     
     class BaseA {
         public constructor(public x: number) { }
@@ -14,35 +15,41 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessib
     
     class BaseB {
         protected constructor(public x: number) { }
-        createInstance() { new BaseB(1); }
+        createInstance() { new BaseB(2); }
     }
     
     class BaseC {
-         private constructor(public x: number) { }
-         createInstance() { new BaseC(1); }
+        private constructor(public x: number) { }
+        createInstance() { new BaseC(3); }
+        static staticInstance() { new BaseC(4); }
     }
     
     class DerivedA extends BaseA {
         constructor(public x: number) { super(x); }
-        createInstance() { new DerivedA(1); }
-        createBaseInstance() { new BaseA(1); }
+        createInstance() { new DerivedA(5); }
+        createBaseInstance() { new BaseA(6); }
+        static staticBaseInstance() { new BaseA(7); }
     }
     
     class DerivedB extends BaseB {
         constructor(public x: number) { super(x); }
-        createInstance() { new DerivedB(1); }
-        createBaseInstance() { new BaseB(1); } // error
+        createInstance() { new DerivedB(7); }
+        createBaseInstance() { new BaseB(8); } // error
                                ~~~~~~~~~~~~
 !!! error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
+        static staticBaseInstance() { new BaseB(9); } // ok
     }
     
     class DerivedC extends BaseC { // error
                            ~~~~~
 !!! error TS2675: Cannot extend a class 'BaseC'. Class constructor is marked as private.
         constructor(public x: number) { super(x); }
-        createInstance() { new DerivedC(1); }
-        createBaseInstance() { new BaseC(1); } // error
-                               ~~~~~~~~~~~~
+        createInstance() { new DerivedC(9); }
+        createBaseInstance() { new BaseC(10); } // error
+                               ~~~~~~~~~~~~~
+!!! error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
+        static staticBaseInstance() { new BaseC(11); } // error
+                                      ~~~~~~~~~~~~~
 !!! error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
     }
     
@@ -56,4 +63,5 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessib
     
     var da = new DerivedA(1);
     var db = new DerivedB(1);
-    var dc = new DerivedC(1);
\ No newline at end of file
+    var dc = new DerivedC(1);
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/classConstructorAccessibility2.js b/tests/baselines/reference/classConstructorAccessibility2.js
index e19589ece45..97d0dd94538 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.js
+++ b/tests/baselines/reference/classConstructorAccessibility2.js
@@ -7,30 +7,34 @@ class BaseA {
 
 class BaseB {
     protected constructor(public x: number) { }
-    createInstance() { new BaseB(1); }
+    createInstance() { new BaseB(2); }
 }
 
 class BaseC {
-     private constructor(public x: number) { }
-     createInstance() { new BaseC(1); }
+    private constructor(public x: number) { }
+    createInstance() { new BaseC(3); }
+    static staticInstance() { new BaseC(4); }
 }
 
 class DerivedA extends BaseA {
     constructor(public x: number) { super(x); }
-    createInstance() { new DerivedA(1); }
-    createBaseInstance() { new BaseA(1); }
+    createInstance() { new DerivedA(5); }
+    createBaseInstance() { new BaseA(6); }
+    static staticBaseInstance() { new BaseA(7); }
 }
 
 class DerivedB extends BaseB {
     constructor(public x: number) { super(x); }
-    createInstance() { new DerivedB(1); }
-    createBaseInstance() { new BaseB(1); } // error
+    createInstance() { new DerivedB(7); }
+    createBaseInstance() { new BaseB(8); } // error
+    static staticBaseInstance() { new BaseB(9); } // ok
 }
 
 class DerivedC extends BaseC { // error
     constructor(public x: number) { super(x); }
-    createInstance() { new DerivedC(1); }
-    createBaseInstance() { new BaseC(1); } // error
+    createInstance() { new DerivedC(9); }
+    createBaseInstance() { new BaseC(10); } // error
+    static staticBaseInstance() { new BaseC(11); } // error
 }
 
 var ba = new BaseA(1);
@@ -39,7 +43,8 @@ var bc = new BaseC(1); // error
 
 var da = new DerivedA(1);
 var db = new DerivedB(1);
-var dc = new DerivedC(1);
+var dc = new DerivedC(1);
+
 
 //// [classConstructorAccessibility2.js]
 var __extends = (this && this.__extends) || function (d, b) {
@@ -58,14 +63,15 @@ var BaseB = (function () {
     function BaseB(x) {
         this.x = x;
     }
-    BaseB.prototype.createInstance = function () { new BaseB(1); };
+    BaseB.prototype.createInstance = function () { new BaseB(2); };
     return BaseB;
 }());
 var BaseC = (function () {
     function BaseC(x) {
         this.x = x;
     }
-    BaseC.prototype.createInstance = function () { new BaseC(1); };
+    BaseC.prototype.createInstance = function () { new BaseC(3); };
+    BaseC.staticInstance = function () { new BaseC(4); };
     return BaseC;
 }());
 var DerivedA = (function (_super) {
@@ -74,8 +80,9 @@ var DerivedA = (function (_super) {
         _super.call(this, x);
         this.x = x;
     }
-    DerivedA.prototype.createInstance = function () { new DerivedA(1); };
-    DerivedA.prototype.createBaseInstance = function () { new BaseA(1); };
+    DerivedA.prototype.createInstance = function () { new DerivedA(5); };
+    DerivedA.prototype.createBaseInstance = function () { new BaseA(6); };
+    DerivedA.staticBaseInstance = function () { new BaseA(7); };
     return DerivedA;
 }(BaseA));
 var DerivedB = (function (_super) {
@@ -84,8 +91,9 @@ var DerivedB = (function (_super) {
         _super.call(this, x);
         this.x = x;
     }
-    DerivedB.prototype.createInstance = function () { new DerivedB(1); };
-    DerivedB.prototype.createBaseInstance = function () { new BaseB(1); }; // error
+    DerivedB.prototype.createInstance = function () { new DerivedB(7); };
+    DerivedB.prototype.createBaseInstance = function () { new BaseB(8); }; // error
+    DerivedB.staticBaseInstance = function () { new BaseB(9); }; // ok
     return DerivedB;
 }(BaseB));
 var DerivedC = (function (_super) {
@@ -94,8 +102,9 @@ var DerivedC = (function (_super) {
         _super.call(this, x);
         this.x = x;
     }
-    DerivedC.prototype.createInstance = function () { new DerivedC(1); };
-    DerivedC.prototype.createBaseInstance = function () { new BaseC(1); }; // error
+    DerivedC.prototype.createInstance = function () { new DerivedC(9); };
+    DerivedC.prototype.createBaseInstance = function () { new BaseC(10); }; // error
+    DerivedC.staticBaseInstance = function () { new BaseC(11); }; // error
     return DerivedC;
 }(BaseC));
 var ba = new BaseA(1);
@@ -121,24 +130,28 @@ declare class BaseC {
     x: number;
     private constructor(x);
     createInstance(): void;
+    static staticInstance(): void;
 }
 declare class DerivedA extends BaseA {
     x: number;
     constructor(x: number);
     createInstance(): void;
     createBaseInstance(): void;
+    static staticBaseInstance(): void;
 }
 declare class DerivedB extends BaseB {
     x: number;
     constructor(x: number);
     createInstance(): void;
     createBaseInstance(): void;
+    static staticBaseInstance(): void;
 }
 declare class DerivedC extends BaseC {
     x: number;
     constructor(x: number);
     createInstance(): void;
     createBaseInstance(): void;
+    static staticBaseInstance(): void;
 }
 declare var ba: BaseA;
 declare var bb: any;
diff --git a/tests/baselines/reference/classConstructorAccessibility5.errors.txt b/tests/baselines/reference/classConstructorAccessibility5.errors.txt
new file mode 100644
index 00000000000..f372bd5c10a
--- /dev/null
+++ b/tests/baselines/reference/classConstructorAccessibility5.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility5.ts(9,21): error TS2674: Constructor of class 'Base' is protected and only accessible within the class declaration.
+
+
+==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility5.ts (1 errors) ====
+    class Base {
+        protected constructor() { }
+    }
+    class Derived extends Base {
+        static make() { new Base() } // ok
+    }
+    
+    class Unrelated {
+        static fake() { new Base() } // error
+                        ~~~~~~~~~~
+!!! error TS2674: Constructor of class 'Base' is protected and only accessible within the class declaration.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/classConstructorAccessibility5.js b/tests/baselines/reference/classConstructorAccessibility5.js
new file mode 100644
index 00000000000..ec9e9f83a8e
--- /dev/null
+++ b/tests/baselines/reference/classConstructorAccessibility5.js
@@ -0,0 +1,38 @@
+//// [classConstructorAccessibility5.ts]
+class Base {
+    protected constructor() { }
+}
+class Derived extends Base {
+    static make() { new Base() } // ok
+}
+
+class Unrelated {
+    static fake() { new Base() } // error
+}
+
+
+//// [classConstructorAccessibility5.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Base = (function () {
+    function Base() {
+    }
+    return Base;
+}());
+var Derived = (function (_super) {
+    __extends(Derived, _super);
+    function Derived() {
+        _super.apply(this, arguments);
+    }
+    Derived.make = function () { new Base(); }; // ok
+    return Derived;
+}(Base));
+var Unrelated = (function () {
+    function Unrelated() {
+    }
+    Unrelated.fake = function () { new Base(); }; // error
+    return Unrelated;
+}());
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts
index 2a961e2c067..c5d2e6da433 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts
@@ -7,30 +7,34 @@ class BaseA {
 
 class BaseB {
     protected constructor(public x: number) { }
-    createInstance() { new BaseB(1); }
+    createInstance() { new BaseB(2); }
 }
 
 class BaseC {
-     private constructor(public x: number) { }
-     createInstance() { new BaseC(1); }
+    private constructor(public x: number) { }
+    createInstance() { new BaseC(3); }
+    static staticInstance() { new BaseC(4); }
 }
 
 class DerivedA extends BaseA {
     constructor(public x: number) { super(x); }
-    createInstance() { new DerivedA(1); }
-    createBaseInstance() { new BaseA(1); }
+    createInstance() { new DerivedA(5); }
+    createBaseInstance() { new BaseA(6); }
+    static staticBaseInstance() { new BaseA(7); }
 }
 
 class DerivedB extends BaseB {
     constructor(public x: number) { super(x); }
-    createInstance() { new DerivedB(1); }
-    createBaseInstance() { new BaseB(1); } // error
+    createInstance() { new DerivedB(7); }
+    createBaseInstance() { new BaseB(8); } // error
+    static staticBaseInstance() { new BaseB(9); } // ok
 }
 
 class DerivedC extends BaseC { // error
     constructor(public x: number) { super(x); }
-    createInstance() { new DerivedC(1); }
-    createBaseInstance() { new BaseC(1); } // error
+    createInstance() { new DerivedC(9); }
+    createBaseInstance() { new BaseC(10); } // error
+    static staticBaseInstance() { new BaseC(11); } // error
 }
 
 var ba = new BaseA(1);
@@ -39,4 +43,4 @@ var bc = new BaseC(1); // error
 
 var da = new DerivedA(1);
 var db = new DerivedB(1);
-var dc = new DerivedC(1);
\ No newline at end of file
+var dc = new DerivedC(1);
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility5.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility5.ts
new file mode 100644
index 00000000000..ada5108a23a
--- /dev/null
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility5.ts
@@ -0,0 +1,10 @@
+class Base {
+    protected constructor() { }
+}
+class Derived extends Base {
+    static make() { new Base() } // ok
+}
+
+class Unrelated {
+    static fake() { new Base() } // error
+}

From 97ef839a03fc16ea1aa5a7242ed68ad26814443f Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 22 Jul 2016 13:48:43 -0700
Subject: [PATCH 09/18] Protected ctors are accessible in subclass static
 methods

Previously, it was an error to refer to a protected constructor from a
base class, even in a static method where the semantics work. Now it is
not an error in static methods.
---
 src/compiler/checker.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1cebd469388..ff248d75941 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11544,8 +11544,23 @@ namespace ts {
             const declaringClassDeclaration = <ClassLikeDeclaration>getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
             const declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(declaration.parent.symbol);
 
-            // A private or protected constructor can only be instantiated within it's own class
+            // A private or protected constructor can only be instantiated within its own class or a static method of a subclass
             if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                const containingFunction = getContainingFunction(node);
+                const containingClass = getContainingClass(node);
+                if (containingClass) {
+                    const containingType = getTypeOfNode(containingClass);
+                    const baseTypes = getBaseTypes(<InterfaceType>containingType);
+                    if (baseTypes.length) {
+                        const baseType = baseTypes[0];
+                        if (containingFunction &&
+                            containingFunction.flags & NodeFlags.Static &&
+                            flags & NodeFlags.Protected &&
+                            baseType.symbol === declaration.parent.symbol) {
+                            return true;
+                        }
+                    }
+                }
                 if (flags & NodeFlags.Private) {
                     error(node, Diagnostics.Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
                 }

From 4b2183927b601018c2dbf0c118fc166c690010f2 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 22 Jul 2016 13:56:50 -0700
Subject: [PATCH 10/18] Add src to absolute paths in browserify task

---
 Gulpfile.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gulpfile.ts b/Gulpfile.ts
index 57da2b62aa8..8797f6d2ee1 100644
--- a/Gulpfile.ts
+++ b/Gulpfile.ts
@@ -710,7 +710,7 @@ gulp.task("browserify", "Runs browserify on run.js to produce a file suitable fo
             const originalMap = file.sourceMap;
             const prebundledContent = file.contents.toString();
             // Make paths absolute to help sorcery deal with all the terrible paths being thrown around
-            originalMap.sources = originalMap.sources.map(s => path.resolve(s));
+            originalMap.sources = originalMap.sources.map(s => path.resolve("src", s));
             // intoStream (below) makes browserify think the input file is named this, so this is what it puts in the sourcemap
             originalMap.file = "built/local/_stream_0.js";
 

From a0406c777fa67aefb947d0b94878fa25b28e0b4f Mon Sep 17 00:00:00 2001
From: Yui <yuit@users.noreply.github.com>
Date: Fri, 22 Jul 2016 15:41:52 -0700
Subject: [PATCH 11/18] Port Fix 9894 to master (#9896)

* Add tests and baselines

* Addess PR: get the first non-ambient external module file

* Rename test file and update baseline

* Add tests and baselines

* Update baselines
---
 src/compiler/program.ts                            | 14 +++++++-------
 ...ortModuleAugmentationInDeclarationFile1.symbols |  8 ++++++++
 ...xportModuleAugmentationInDeclarationFile1.types |  8 ++++++++
 ...ModuleAugmentationInDeclarationFile2.errors.txt | 12 ++++++++++++
 ...rtExportModuleAugmentationInDeclarationFile2.js | 13 +++++++++++++
 ...ModuleAugmentationInDeclarationFile3.errors.txt | 13 +++++++++++++
 ...rtExportModuleAugmentationInDeclarationFile3.js | 14 ++++++++++++++
 ...rtExportModuleAugmentationInDeclarationFile1.ts |  5 +++++
 ...rtExportModuleAugmentationInDeclarationFile2.ts |  8 ++++++++
 ...rtExportModuleAugmentationInDeclarationFile3.ts |  8 ++++++++
 10 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100644 tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.symbols
 create mode 100644 tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.types
 create mode 100644 tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
 create mode 100644 tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
 create mode 100644 tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
 create mode 100644 tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
 create mode 100644 tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.ts
 create mode 100644 tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.ts
 create mode 100644 tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.ts

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 988714be2ab..8d59c2d46fe 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -2252,7 +2252,7 @@ namespace ts {
             const languageVersion = options.target || ScriptTarget.ES3;
             const outFile = options.outFile || options.out;
 
-            const firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined);
+            const firstNonAmbientExternalModuleSourceFile = forEach(files, f => isExternalModule(f) && !isDeclarationFile(f) ? f : undefined);
             if (options.isolatedModules) {
                 if (options.module === ModuleKind.None && languageVersion < ScriptTarget.ES6) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
@@ -2264,10 +2264,10 @@ namespace ts {
                     programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
                 }
             }
-            else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && options.module === ModuleKind.None) {
+            else if (firstNonAmbientExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && options.module === ModuleKind.None) {
                 // We cannot use createDiagnosticFromNode because nodes do not have parents yet
-                const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none));
+                const span = getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, firstNonAmbientExternalModuleSourceFile.externalModuleIndicator);
+                programDiagnostics.add(createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none));
             }
 
             // Cannot specify module gen that isn't amd or system with --out
@@ -2275,9 +2275,9 @@ namespace ts {
                 if (options.module && !(options.module === ModuleKind.AMD || options.module === ModuleKind.System)) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
                 }
-                else if (options.module === undefined && firstExternalModuleSourceFile) {
-                    const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                    programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system, options.out ? "out" : "outFile"));
+                else if (options.module === undefined && firstNonAmbientExternalModuleSourceFile) {
+                    const span = getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, firstNonAmbientExternalModuleSourceFile.externalModuleIndicator);
+                    programDiagnostics.add(createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system, options.out ? "out" : "outFile"));
                 }
             }
 
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.symbols b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.symbols
new file mode 100644
index 00000000000..d3d338e0d14
--- /dev/null
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/0.d.ts ===
+
+export = a;
+>a : Symbol(a, Decl(0.d.ts, 2, 11))
+
+declare var a: number;
+>a : Symbol(a, Decl(0.d.ts, 2, 11))
+
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.types b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.types
new file mode 100644
index 00000000000..c5e2c0b80f8
--- /dev/null
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.types
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/0.d.ts ===
+
+export = a;
+>a : number
+
+declare var a: number;
+>a : number
+
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
new file mode 100644
index 00000000000..bcf5d91c015
--- /dev/null
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/compiler/1.ts(2,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
+
+
+==== tests/cases/compiler/1.ts (1 errors) ====
+    
+    export var j = "hello"; // error
+    ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
+    
+==== tests/cases/compiler/0.d.ts (0 errors) ====
+    export = a;
+    declare var a: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
new file mode 100644
index 00000000000..b56988de44c
--- /dev/null
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
@@ -0,0 +1,13 @@
+//// [tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.ts] ////
+
+//// [1.ts]
+
+export var j = "hello"; // error
+
+//// [0.d.ts]
+export = a;
+declare var a: number;
+
+//// [1.js]
+"use strict";
+exports.j = "hello"; // error
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
new file mode 100644
index 00000000000..eb215693cd7
--- /dev/null
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/compiler/1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
+
+
+==== tests/cases/compiler/0.d.ts (0 errors) ====
+    
+    export = a;
+    declare var a: number;
+    
+==== tests/cases/compiler/1.ts (1 errors) ====
+    export var j = "hello";  // error
+    ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
new file mode 100644
index 00000000000..8c75af24034
--- /dev/null
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
@@ -0,0 +1,14 @@
+//// [tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.ts] ////
+
+//// [0.d.ts]
+
+export = a;
+declare var a: number;
+
+//// [1.ts]
+export var j = "hello";  // error
+
+
+//// [1.js]
+"use strict";
+exports.j = "hello"; // error
diff --git a/tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.ts b/tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.ts
new file mode 100644
index 00000000000..71ec411a4f5
--- /dev/null
+++ b/tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.ts
@@ -0,0 +1,5 @@
+// @module: none
+// @filename: 0.d.ts
+
+export = a;
+declare var a: number;
\ No newline at end of file
diff --git a/tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.ts b/tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.ts
new file mode 100644
index 00000000000..160f80dba97
--- /dev/null
+++ b/tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.ts
@@ -0,0 +1,8 @@
+// @module: none
+
+// @filename: 1.ts
+export var j = "hello"; // error
+
+// @filename: 0.d.ts
+export = a;
+declare var a: number;
\ No newline at end of file
diff --git a/tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.ts b/tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.ts
new file mode 100644
index 00000000000..e13933a13d0
--- /dev/null
+++ b/tests/cases/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.ts
@@ -0,0 +1,8 @@
+// @module: none
+
+// @filename: 0.d.ts
+export = a;
+declare var a: number;
+
+// @filename: 1.ts
+export var j = "hello";  // error

From 2169928f2b651d02f5eadada496c823e6bd9a310 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 22 Jul 2016 17:38:25 -0700
Subject: [PATCH 12/18] Protected constructors now accessible everywhere in
 subclasses

---
 src/compiler/checker.ts                                    | 7 ++-----
 .../reference/classConstructorAccessibility2.errors.txt    | 7 ++-----
 .../baselines/reference/classConstructorAccessibility2.js  | 4 ++--
 .../classConstructorAccessibility2.ts                      | 2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index ff248d75941..6da456afcbc 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11544,18 +11544,15 @@ namespace ts {
             const declaringClassDeclaration = <ClassLikeDeclaration>getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
             const declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(declaration.parent.symbol);
 
-            // A private or protected constructor can only be instantiated within its own class or a static method of a subclass
+            // A private or protected constructor can only be instantiated within its own class (or a subclass, for protected)
             if (!isNodeWithinClass(node, declaringClassDeclaration)) {
-                const containingFunction = getContainingFunction(node);
                 const containingClass = getContainingClass(node);
                 if (containingClass) {
                     const containingType = getTypeOfNode(containingClass);
                     const baseTypes = getBaseTypes(<InterfaceType>containingType);
                     if (baseTypes.length) {
                         const baseType = baseTypes[0];
-                        if (containingFunction &&
-                            containingFunction.flags & NodeFlags.Static &&
-                            flags & NodeFlags.Protected &&
+                        if (flags & NodeFlags.Protected &&
                             baseType.symbol === declaration.parent.symbol) {
                             return true;
                         }
diff --git a/tests/baselines/reference/classConstructorAccessibility2.errors.txt b/tests/baselines/reference/classConstructorAccessibility2.errors.txt
index 01f2e2ea869..337e9787e5e 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.errors.txt
+++ b/tests/baselines/reference/classConstructorAccessibility2.errors.txt
@@ -1,4 +1,3 @@
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(28,28): error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
 tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(32,24): error TS2675: Cannot extend a class 'BaseC'. Class constructor is marked as private.
 tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(35,28): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
 tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(36,35): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
@@ -6,7 +5,7 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessib
 tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(41,10): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
 
 
-==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts (6 errors) ====
+==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts (5 errors) ====
     
     class BaseA {
         public constructor(public x: number) { }
@@ -34,9 +33,7 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessib
     class DerivedB extends BaseB {
         constructor(public x: number) { super(x); }
         createInstance() { new DerivedB(7); }
-        createBaseInstance() { new BaseB(8); } // error
-                               ~~~~~~~~~~~~
-!!! error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
+        createBaseInstance() { new BaseB(8); } // ok
         static staticBaseInstance() { new BaseB(9); } // ok
     }
     
diff --git a/tests/baselines/reference/classConstructorAccessibility2.js b/tests/baselines/reference/classConstructorAccessibility2.js
index 97d0dd94538..03b7af3e716 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.js
+++ b/tests/baselines/reference/classConstructorAccessibility2.js
@@ -26,7 +26,7 @@ class DerivedA extends BaseA {
 class DerivedB extends BaseB {
     constructor(public x: number) { super(x); }
     createInstance() { new DerivedB(7); }
-    createBaseInstance() { new BaseB(8); } // error
+    createBaseInstance() { new BaseB(8); } // ok
     static staticBaseInstance() { new BaseB(9); } // ok
 }
 
@@ -92,7 +92,7 @@ var DerivedB = (function (_super) {
         this.x = x;
     }
     DerivedB.prototype.createInstance = function () { new DerivedB(7); };
-    DerivedB.prototype.createBaseInstance = function () { new BaseB(8); }; // error
+    DerivedB.prototype.createBaseInstance = function () { new BaseB(8); }; // ok
     DerivedB.staticBaseInstance = function () { new BaseB(9); }; // ok
     return DerivedB;
 }(BaseB));
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts
index c5d2e6da433..5e0ed2454df 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts
@@ -26,7 +26,7 @@ class DerivedA extends BaseA {
 class DerivedB extends BaseB {
     constructor(public x: number) { super(x); }
     createInstance() { new DerivedB(7); }
-    createBaseInstance() { new BaseB(8); } // error
+    createBaseInstance() { new BaseB(8); } // ok
     static staticBaseInstance() { new BaseB(9); } // ok
 }
 

From 7224f22975c1615ee2e29cdd03b14559b42a94c6 Mon Sep 17 00:00:00 2001
From: Yuichi Nukiyama <oscar.wilde84@hotmail.co.jp>
Date: Sat, 23 Jul 2016 15:05:36 +0900
Subject: [PATCH 13/18] throw error when paths option mapping empty array

fix
---
 src/compiler/diagnosticMessages.json                  |  8 ++++++--
 src/compiler/program.ts                               |  3 +++
 tests/baselines/reference/pathsValidation3.errors.txt |  6 ++++++
 tests/baselines/reference/pathsValidation3.js         |  5 +++++
 tests/cases/compiler/pathsValidation3.ts              | 11 +++++++++++
 5 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/pathsValidation3.errors.txt
 create mode 100644 tests/baselines/reference/pathsValidation3.js
 create mode 100644 tests/cases/compiler/pathsValidation3.ts

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 8ffb02a8974..23018f3ef11 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2336,6 +2336,10 @@
         "category": "Error",
         "code": 5065
     },
+    "Substitutions for pattern '{0}' shouldn't be an empty array.": {
+        "category": "Error",
+        "code": 5066
+    },
     "Concatenate and emit output to single file.": {
         "category": "Message",
         "code": 6001
@@ -2800,11 +2804,11 @@
         "category": "Error",
         "code": 6133
     },
-    "Report errors on unused locals.": {
+    "Report errors on unused locals.": {
         "category": "Message",
         "code": 6134
     },
-    "Report errors on unused parameters.": {
+    "Report errors on unused parameters.": {
         "category": "Message",
         "code": 6135
     },
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 8d59c2d46fe..4b9948c3ba0 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -2200,6 +2200,9 @@ namespace ts {
                         programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key));
                     }
                     if (isArray(options.paths[key])) {
+                        if (options.paths[key].length === 0) {
+                            programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitutions_for_pattern_0_shouldn_t_be_an_empty_array, key));
+                        }
                         for (const subst of options.paths[key]) {
                             const typeOfSubst = typeof subst;
                             if (typeOfSubst === "string") {
diff --git a/tests/baselines/reference/pathsValidation3.errors.txt b/tests/baselines/reference/pathsValidation3.errors.txt
new file mode 100644
index 00000000000..3bb85203e6e
--- /dev/null
+++ b/tests/baselines/reference/pathsValidation3.errors.txt
@@ -0,0 +1,6 @@
+error TS5066: Substitutions for pattern 'foo' shouldn't be an empty array.
+
+
+!!! error TS5066: Substitutions for pattern 'foo' shouldn't be an empty array.
+==== tests/cases/compiler/a.ts (0 errors) ====
+    let x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/pathsValidation3.js b/tests/baselines/reference/pathsValidation3.js
new file mode 100644
index 00000000000..bfffc647f63
--- /dev/null
+++ b/tests/baselines/reference/pathsValidation3.js
@@ -0,0 +1,5 @@
+//// [a.ts]
+let x = 1;
+
+//// [a.js]
+var x = 1;
diff --git a/tests/cases/compiler/pathsValidation3.ts b/tests/cases/compiler/pathsValidation3.ts
new file mode 100644
index 00000000000..8d677ed15b4
--- /dev/null
+++ b/tests/cases/compiler/pathsValidation3.ts
@@ -0,0 +1,11 @@
+// @filename: tsconfig.json
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "foo": []
+        }
+    }
+}
+// @filename: a.ts
+let x = 1;
\ No newline at end of file

From bf2783f0c55e840a31642e087c9e6cb3d2ab41f1 Mon Sep 17 00:00:00 2001
From: Yuichi Nukiyama <oscar.wilde84@hotmail.co.jp>
Date: Sat, 23 Jul 2016 15:50:21 +0900
Subject: [PATCH 14/18] to run CI

---
 tests/cases/compiler/pathsValidation3.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/cases/compiler/pathsValidation3.ts b/tests/cases/compiler/pathsValidation3.ts
index 8d677ed15b4..28db959a881 100644
--- a/tests/cases/compiler/pathsValidation3.ts
+++ b/tests/cases/compiler/pathsValidation3.ts
@@ -7,5 +7,6 @@
         }
     }
 }
+
 // @filename: a.ts
 let x = 1;
\ No newline at end of file

From 8cbbcd03f09984a45a3b04b66d4f6b078aaabe23 Mon Sep 17 00:00:00 2001
From: Anatoly Ressin <anatoly.ressin@icloud.com>
Date: Mon, 25 Jul 2016 22:35:15 +0300
Subject: [PATCH 15/18] Fixed broken singleAsteriskRegex. Fixes #9918 (#9920)

---
 src/compiler/core.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 18c6a98991d..dee8d9c8a96 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -938,7 +938,7 @@ namespace ts {
      *  [^./]                   # matches everything up to the first . character (excluding directory seperators)
      *  (\\.(?!min\\.js$))?     # matches . characters but not if they are part of the .min.js file extension
      */
-    const singleAsteriskRegexFragmentFiles = "([^./]*(\\.(?!min\\.js$))?)*";
+    const singleAsteriskRegexFragmentFiles = "([^./]|(\\.(?!min\\.js$))?)*";
     const singleAsteriskRegexFragmentOther = "[^/]*";
 
     export function getRegularExpressionForWildcard(specs: string[], basePath: string, usage: "files" | "directories" | "exclude") {

From 4ef4cf1bac0da81ffcc3a0773ef1c24eccaaeeec Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wwigham@gmail.com>
Date: Mon, 25 Jul 2016 12:36:18 -0700
Subject: [PATCH 16/18] Lock ts-node to 1.1.0 while perf issue is investigated
 (#9933)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5606a423a0e..770278d9976 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
         "run-sequence": "latest",
         "sorcery": "latest",
         "through2": "latest",
-        "ts-node": "latest",
+        "ts-node": "~1.1.0",
         "tslint": "next",
         "typescript": "next"
     },

From 1b1560861c05289271f30cf46dbd2e49c8b3d0b1 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 26 Jul 2016 10:13:30 -0700
Subject: [PATCH 17/18] In ts.performance.now, bind window.performance.now

Using an arrow function. Previously, it was set directly to
window.performance.now, which fails when used on Chrome.
---
 src/compiler/performance.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/performance.ts b/src/compiler/performance.ts
index 63f929c0a26..89db876ae5e 100644
--- a/src/compiler/performance.ts
+++ b/src/compiler/performance.ts
@@ -2,7 +2,7 @@
 namespace ts {
     declare const performance: { now?(): number } | undefined;
     /** Gets a timestamp with (at least) ms resolution */
-    export const timestamp = typeof performance !== "undefined" && performance.now ? performance.now : Date.now ? Date.now : () => +(new Date());
+    export const timestamp = typeof performance !== "undefined" && performance.now ? () => performance.now() : Date.now ? Date.now : () => +(new Date());
 }
 
 /*@internal*/
@@ -106,4 +106,4 @@ namespace ts.performance {
         measures = undefined;
         profilerEvent = undefined;
     }
-}
\ No newline at end of file
+}

From acb003adce741ed8767ff7b64b9fcfd11a4ca947 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wwigham@gmail.com>
Date: Tue, 26 Jul 2016 10:28:49 -0700
Subject: [PATCH 18/18] Add lint enforcing line endings (#9942)

---
 src/compiler/commandLineParser.ts        |   4 +-
 src/harness/unittests/tsconfigParsing.ts | 370 +++++++++++------------
 tslint.json                              |   1 +
 3 files changed, 188 insertions(+), 187 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 418584bd264..7e2c6eb8d33 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -139,12 +139,12 @@ namespace ts {
         {
             name: "noUnusedLocals",
             type: "boolean",
-            description: Diagnostics.Report_errors_on_unused_locals,
+            description: Diagnostics.Report_errors_on_unused_locals,
         },
         {
             name: "noUnusedParameters",
             type: "boolean",
-            description: Diagnostics.Report_errors_on_unused_parameters,
+            description: Diagnostics.Report_errors_on_unused_parameters,
         },
         {
             name: "noLib",
diff --git a/src/harness/unittests/tsconfigParsing.ts b/src/harness/unittests/tsconfigParsing.ts
index 736d567a33a..557379dff3b 100644
--- a/src/harness/unittests/tsconfigParsing.ts
+++ b/src/harness/unittests/tsconfigParsing.ts
@@ -1,185 +1,185 @@
-/// <reference path="..\harness.ts" />
-/// <reference path="..\..\compiler\commandLineParser.ts" />
-
-namespace ts {
-    describe("parseConfigFileTextToJson", () => {
-        function assertParseResult(jsonText: string, expectedConfigObject: { config?: any; error?: Diagnostic }) {
-            const parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
-            assert.equal(JSON.stringify(parsed), JSON.stringify(expectedConfigObject));
-        }
-
-        function assertParseError(jsonText: string) {
-             const parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
-             assert.isTrue(undefined === parsed.config);
-             assert.isTrue(undefined !== parsed.error);
-        }
-
-        function assertParseErrorWithExcludesKeyword(jsonText: string) {
-             const parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
-             const parsedCommand = ts.parseJsonConfigFileContent(parsed.config, ts.sys, "tests/cases/unittests");
-             assert.isTrue(parsedCommand.errors && parsedCommand.errors.length === 1 &&
-                parsedCommand.errors[0].code === ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude.code);
-        }
-
-        function assertParseFileList(jsonText: string, configFileName: string, basePath: string, allFileList: string[], expectedFileList: string[]) {
-            const json = JSON.parse(jsonText);
-            const host: ParseConfigHost = new Utils.MockParseConfigHost(basePath, true, allFileList);
-            const parsed = ts.parseJsonConfigFileContent(json, host, basePath, /*existingOptions*/ undefined, configFileName);
-            assert.isTrue(arrayIsEqualTo(parsed.fileNames.sort(), expectedFileList.sort()));
-        }
-
-        it("returns empty config for file with only whitespaces", () => {
-            assertParseResult("", { config : {} });
-            assertParseResult(" ", { config : {} });
-        });
-
-        it("returns empty config for file with comments only", () => {
-            assertParseResult("// Comment", { config: {} });
-            assertParseResult("/* Comment*/", { config: {} });
-        });
-
-        it("returns empty config when config is empty object", () => {
-            assertParseResult("{}", { config: {} });
-        });
-
-        it("returns config object without comments", () => {
-            assertParseResult(
-                `{ // Excluded files
-                    "exclude": [
-                        // Exclude d.ts
-                        "file.d.ts"
-                    ]
-                }`, { config: { exclude: ["file.d.ts"] } });
-
-            assertParseResult(
-                `{
-                    /* Excluded
-                         Files
-                    */
-                    "exclude": [
-                        /* multiline comments can be in the middle of a line */"file.d.ts"
-                    ]
-                }`, { config: { exclude: ["file.d.ts"] } });
-        });
-
-        it("keeps string content untouched", () => {
-            assertParseResult(
-                `{
-                    "exclude": [
-                        "xx//file.d.ts"
-                    ]
-                }`, { config: { exclude: ["xx//file.d.ts"] } });
-         assertParseResult(
-                `{
-                    "exclude": [
-                        "xx/*file.d.ts*/"
-                    ]
-                }`, { config: { exclude: ["xx/*file.d.ts*/"] } });
-        });
-
-        it("handles escaped characters in strings correctly", () => {
-            assertParseResult(
-                `{
-                    "exclude": [
-                        "xx\\"//files"
-                    ]
-                }`, { config: { exclude: ["xx\"//files"] } });
-
-            assertParseResult(
-                `{
-                    "exclude": [
-                        "xx\\\\" // end of line comment
-                    ]
-                }`, { config: { exclude: ["xx\\"] } });
-         });
-
-        it("returns object with error when json is invalid", () => {
-             assertParseError("invalid");
-        });
-
-        it("returns object when users correctly specify library", () => {
-            assertParseResult(
-                `{
-                    "compilerOptions": {
-                        "lib": ["es5"]
-                    }
-                }`, {
-                    config: { compilerOptions: { lib: ["es5"] } }
-                });
-
-            assertParseResult(
-                `{
-                    "compilerOptions": {
-                        "lib": ["es5", "es6"]
-                    }
-                }`, {
-                    config: { compilerOptions: { lib: ["es5", "es6"] } }
-                });
-        });
-
-        it("returns error when tsconfig have excludes", () => {
-            assertParseErrorWithExcludesKeyword(
-                `{
-                    "compilerOptions": {
-                        "lib": ["es5"]
-                    },
-                    "excludes": [
-                        "foge.ts"
-                    ]
-                }`);
-        });
-
-        it("ignore dotted files and folders", () => {
-            assertParseFileList(
-                `{}`,
-                "tsconfig.json",
-                "/apath",
-                ["/apath/test.ts", "/apath/.git/a.ts", "/apath/.b.ts", "/apath/..c.ts"],
-                ["/apath/test.ts"]
-            );
-        });
-
-        it("allow dotted files and folders when explicitly requested", () => {
-            assertParseFileList(
-                `{
-                    "files": ["/apath/.git/a.ts", "/apath/.b.ts", "/apath/..c.ts"]
-                }`,
-                "tsconfig.json",
-                "/apath",
-                ["/apath/test.ts", "/apath/.git/a.ts", "/apath/.b.ts", "/apath/..c.ts"],
-                ["/apath/.git/a.ts", "/apath/.b.ts", "/apath/..c.ts"]
-            );
-        });
-
-        it("always exclude outDir", () => {
-            const tsconfigWithoutExclude =
-            `{
-                "compilerOptions": {
-                    "outDir": "bin"
-                }
-            }`;
-            const tsconfigWithExclude =
-            `{
-                "compilerOptions": {
-                    "outDir": "bin"
-                },
-                "exclude": [ "obj" ]
-            }`;
-            const rootDir = "/";
-            const allFiles = ["/bin/a.ts", "/b.ts"];
-            const expectedFiles = ["/b.ts"];
-            assertParseFileList(tsconfigWithoutExclude, "tsconfig.json", rootDir, allFiles, expectedFiles);
-            assertParseFileList(tsconfigWithExclude, "tsconfig.json", rootDir, allFiles, expectedFiles);
-        });
-
-        it("implicitly exclude common package folders", () => {
-            assertParseFileList(
-                `{}`,
-                "tsconfig.json",
-                "/",
-                ["/node_modules/a.ts", "/bower_components/b.ts", "/jspm_packages/c.ts", "/d.ts", "/folder/e.ts"],
-                ["/d.ts", "/folder/e.ts"]
-            );
-        });
-    });
-}
+/// <reference path="..\harness.ts" />
+/// <reference path="..\..\compiler\commandLineParser.ts" />
+
+namespace ts {
+    describe("parseConfigFileTextToJson", () => {
+        function assertParseResult(jsonText: string, expectedConfigObject: { config?: any; error?: Diagnostic }) {
+            const parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
+            assert.equal(JSON.stringify(parsed), JSON.stringify(expectedConfigObject));
+        }
+
+        function assertParseError(jsonText: string) {
+             const parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
+             assert.isTrue(undefined === parsed.config);
+             assert.isTrue(undefined !== parsed.error);
+        }
+
+        function assertParseErrorWithExcludesKeyword(jsonText: string) {
+             const parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
+             const parsedCommand = ts.parseJsonConfigFileContent(parsed.config, ts.sys, "tests/cases/unittests");
+             assert.isTrue(parsedCommand.errors && parsedCommand.errors.length === 1 &&
+                parsedCommand.errors[0].code === ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude.code);
+        }
+
+        function assertParseFileList(jsonText: string, configFileName: string, basePath: string, allFileList: string[], expectedFileList: string[]) {
+            const json = JSON.parse(jsonText);
+            const host: ParseConfigHost = new Utils.MockParseConfigHost(basePath, true, allFileList);
+            const parsed = ts.parseJsonConfigFileContent(json, host, basePath, /*existingOptions*/ undefined, configFileName);
+            assert.isTrue(arrayIsEqualTo(parsed.fileNames.sort(), expectedFileList.sort()));
+        }
+
+        it("returns empty config for file with only whitespaces", () => {
+            assertParseResult("", { config : {} });
+            assertParseResult(" ", { config : {} });
+        });
+
+        it("returns empty config for file with comments only", () => {
+            assertParseResult("// Comment", { config: {} });
+            assertParseResult("/* Comment*/", { config: {} });
+        });
+
+        it("returns empty config when config is empty object", () => {
+            assertParseResult("{}", { config: {} });
+        });
+
+        it("returns config object without comments", () => {
+            assertParseResult(
+                `{ // Excluded files
+                    "exclude": [
+                        // Exclude d.ts
+                        "file.d.ts"
+                    ]
+                }`, { config: { exclude: ["file.d.ts"] } });
+
+            assertParseResult(
+                `{
+                    /* Excluded
+                         Files
+                    */
+                    "exclude": [
+                        /* multiline comments can be in the middle of a line */"file.d.ts"
+                    ]
+                }`, { config: { exclude: ["file.d.ts"] } });
+        });
+
+        it("keeps string content untouched", () => {
+            assertParseResult(
+                `{
+                    "exclude": [
+                        "xx//file.d.ts"
+                    ]
+                }`, { config: { exclude: ["xx//file.d.ts"] } });
+         assertParseResult(
+                `{
+                    "exclude": [
+                        "xx/*file.d.ts*/"
+                    ]
+                }`, { config: { exclude: ["xx/*file.d.ts*/"] } });
+        });
+
+        it("handles escaped characters in strings correctly", () => {
+            assertParseResult(
+                `{
+                    "exclude": [
+                        "xx\\"//files"
+                    ]
+                }`, { config: { exclude: ["xx\"//files"] } });
+
+            assertParseResult(
+                `{
+                    "exclude": [
+                        "xx\\\\" // end of line comment
+                    ]
+                }`, { config: { exclude: ["xx\\"] } });
+         });
+
+        it("returns object with error when json is invalid", () => {
+             assertParseError("invalid");
+        });
+
+        it("returns object when users correctly specify library", () => {
+            assertParseResult(
+                `{
+                    "compilerOptions": {
+                        "lib": ["es5"]
+                    }
+                }`, {
+                    config: { compilerOptions: { lib: ["es5"] } }
+                });
+
+            assertParseResult(
+                `{
+                    "compilerOptions": {
+                        "lib": ["es5", "es6"]
+                    }
+                }`, {
+                    config: { compilerOptions: { lib: ["es5", "es6"] } }
+                });
+        });
+
+        it("returns error when tsconfig have excludes", () => {
+            assertParseErrorWithExcludesKeyword(
+                `{
+                    "compilerOptions": {
+                        "lib": ["es5"]
+                    },
+                    "excludes": [
+                        "foge.ts"
+                    ]
+                }`);
+        });
+
+        it("ignore dotted files and folders", () => {
+            assertParseFileList(
+                `{}`,
+                "tsconfig.json",
+                "/apath",
+                ["/apath/test.ts", "/apath/.git/a.ts", "/apath/.b.ts", "/apath/..c.ts"],
+                ["/apath/test.ts"]
+            );
+        });
+
+        it("allow dotted files and folders when explicitly requested", () => {
+            assertParseFileList(
+                `{
+                    "files": ["/apath/.git/a.ts", "/apath/.b.ts", "/apath/..c.ts"]
+                }`,
+                "tsconfig.json",
+                "/apath",
+                ["/apath/test.ts", "/apath/.git/a.ts", "/apath/.b.ts", "/apath/..c.ts"],
+                ["/apath/.git/a.ts", "/apath/.b.ts", "/apath/..c.ts"]
+            );
+        });
+
+        it("always exclude outDir", () => {
+            const tsconfigWithoutExclude =
+            `{
+                "compilerOptions": {
+                    "outDir": "bin"
+                }
+            }`;
+            const tsconfigWithExclude =
+            `{
+                "compilerOptions": {
+                    "outDir": "bin"
+                },
+                "exclude": [ "obj" ]
+            }`;
+            const rootDir = "/";
+            const allFiles = ["/bin/a.ts", "/b.ts"];
+            const expectedFiles = ["/b.ts"];
+            assertParseFileList(tsconfigWithoutExclude, "tsconfig.json", rootDir, allFiles, expectedFiles);
+            assertParseFileList(tsconfigWithExclude, "tsconfig.json", rootDir, allFiles, expectedFiles);
+        });
+
+        it("implicitly exclude common package folders", () => {
+            assertParseFileList(
+                `{}`,
+                "tsconfig.json",
+                "/",
+                ["/node_modules/a.ts", "/bower_components/b.ts", "/jspm_packages/c.ts", "/d.ts", "/folder/e.ts"],
+                ["/d.ts", "/folder/e.ts"]
+            );
+        });
+    });
+}
diff --git a/tslint.json b/tslint.json
index ee116c6fcb0..c8fd777d3d6 100644
--- a/tslint.json
+++ b/tslint.json
@@ -7,6 +7,7 @@
         "indent": [true,
             "spaces"
         ],
+        "linebreak-style": [true, "CRLF"],
         "one-line": [true,
             "check-open-brace",
             "check-whitespace"