Merge branch 'master' into report-multiple-overload-errors

Author: sandersn

.dockerignore

@@ -0,0 +1,48 @@
+node_modules
+.node_modules
+built/*
+test-args.txt
+~*.docx
+\#*\#
+.\#*
+src/harness/*.js
+src/compiler/diagnosticInformationMap.generated.ts
+src/compiler/diagnosticMessages.generated.json
+src/parser/diagnosticInformationMap.generated.ts
+src/parser/diagnosticMessages.generated.json
+rwc-report.html
+*.swp
+build.json
+*.actual
+*.config
+scripts/debug.bat
+scripts/run.bat
+scripts/word2md.js
+scripts/buildProtocol.js
+scripts/ior.js
+scripts/authors.js
+scripts/configurePrerelease.js
+scripts/open-user-pr.js
+scripts/open-cherry-pick-pr.js
+scripts/processDiagnosticMessages.d.ts
+scripts/processDiagnosticMessages.js
+scripts/produceLKG.js
+scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
+scripts/generateLocalizedDiagnosticMessages.js
+scripts/*.js.map
+scripts/typings/
+coverage/
+internal/
+**/.DS_Store
+.settings
+**/.vs
+.idea
+yarn.lock
+yarn-error.log
+.parallelperf.*
+.failed-tests
+TEST-results.xml
+package-lock.json
+tests
+.vscode
+.git

.npmignore

@@ -29,3 +29,5 @@ package-lock.json
 yarn.lock
 CONTRIBUTING.md
 TEST-results.xml
+.dockerignore
+Dockerfile

Dockerfile

@@ -0,0 +1,7 @@
+# We use this dockerfile to build a packed tarfile which we import in our `docker` tests
+FROM node:current
+COPY . /typescript
+WORKDIR /typescript
+RUN npm install
+RUN npm i -g gulp-cli
+RUN gulp configure-insiders && gulp LKG && gulp clean && npm pack .

scripts/open-cherry-pick-pr.ts

@@ -36,9 +36,10 @@ async function main() {
 Component commits:
 ${logText.trim()}`
     const logpath = path.join(__dirname, "../", "logmessage.txt");
+    const mergebase = runSequence([["git", ["merge-base", "origin/master", currentSha]]]).trim();
     runSequence([
         ["git", ["checkout", "-b", "temp-branch"]],
-        ["git", ["reset", "origin/master", "--soft"]]
+        ["git", ["reset", mergebase, "--soft"]]
     ]);
     fs.writeFileSync(logpath, logText);
     runSequence([

src/compiler/checker.ts

@@ -147,6 +147,12 @@ namespace ts {
             category: Diagnostics.Basic_Options,
             description: Diagnostics.Enable_incremental_compilation,
         },
+        {
+            name: "locale",
+            type: "string",
+            category: Diagnostics.Advanced_Options,
+            description: Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
+        },
     ];
 
     /* @internal */
@@ -698,12 +704,6 @@ namespace ts {
             category: Diagnostics.Advanced_Options,
             description: Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files
         },
-        {
-            name: "locale",
-            type: "string",
-            category: Diagnostics.Advanced_Options,
-            description: Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
-        },
         {
             name: "newLine",
             type: createMapFromTemplate({
@@ -1171,7 +1171,7 @@ namespace ts {
     export interface ParsedBuildCommand {
         buildOptions: BuildOptions;
         projects: string[];
-        errors: ReadonlyArray<Diagnostic>;
+        errors: Diagnostic[];
     }
 
     /*@internal*/

src/compiler/commandLineParser.ts

@@ -2975,6 +2975,10 @@
         "category": "Error",
         "code": 4104
     },
+    "Private or protected member '{0}' cannot be accessed on a type parameter.": {
+        "category": "Error",
+        "code": 4105
+    },
 
     "The current host does not support the '{0}' option.": {
         "category": "Error",

src/compiler/diagnosticMessages.json

@@ -725,7 +725,8 @@ namespace ts {
             fileExists: f => host.fileExists(f),
             directoryExists: host.directoryExists && (f => host.directoryExists!(f)),
             useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),
-            getProgramBuildInfo: returnUndefined
+            getProgramBuildInfo: returnUndefined,
+            getSourceFileFromReference: returnUndefined,
         };
         emitFiles(
             notImplementedResolver,

src/compiler/emitter.ts

@@ -1487,8 +1487,8 @@ namespace ts {
     }
 
     /**
-     * LSHost may load a module from a global cache of typings.
-     * This is the minumum code needed to expose that functionality; the rest is in LSHost.
+     * A host may load a module from a global cache of typings.
+     * This is the minumum code needed to expose that functionality; the rest is in the host.
      */
     /* @internal */
     export function loadModuleFromGlobalCache(moduleName: string, projectName: string | undefined, compilerOptions: CompilerOptions, host: ModuleResolutionHost, globalCache: string): ResolvedModuleWithFailedLookupLocations {

src/compiler/moduleNameResolver.ts

@@ -1442,7 +1442,8 @@ namespace ts {
                 },
                 ...(host.directoryExists ? { directoryExists: f => host.directoryExists!(f) } : {}),
                 useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),
-                getProgramBuildInfo: () => program.getProgramBuildInfo && program.getProgramBuildInfo()
+                getProgramBuildInfo: () => program.getProgramBuildInfo && program.getProgramBuildInfo(),
+                getSourceFileFromReference: (file, ref) => program.getSourceFileFromReference(file, ref),
             };
         }
 
@@ -2127,7 +2128,7 @@ namespace ts {
         }
 
         /** This should have similar behavior to 'processSourceFile' without diagnostics or mutation. */
-        function getSourceFileFromReference(referencingFile: SourceFile, ref: FileReference): SourceFile | undefined {
+        function getSourceFileFromReference(referencingFile: SourceFile | UnparsedSource, ref: FileReference): SourceFile | undefined {
             return getSourceFileFromReferenceWorker(resolveTripleslashReference(ref.fileName, referencingFile.fileName), fileName => filesByName.get(toPath(fileName)) || undefined);
         }