From d2180009238d001c151516a95828d3f020874416 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 12 Feb 2019 16:07:20 -0800 Subject: [PATCH 1/4] Use built local on CI and not LKG --- Jakefile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jakefile.js b/Jakefile.js index c6b1cde9d4e2b..18f4aa56f8d92 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -24,7 +24,7 @@ const host = process.env.TYPESCRIPT_HOST || process.env.host || "node"; const defaultTestTimeout = 40000; const useBuilt = - process.env.USE_BUILT === "true" ? true : + (process.env.USE_BUILT === "true" || process.env.CI === "true") ? true : process.env.LKG === "true" ? false : false; From 8ba4d19eff1e6b9fff3bab035c9beb11413c546d Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 12 Feb 2019 16:15:29 -0800 Subject: [PATCH 2/4] Adjust function to remove need for assertions --- src/compiler/core.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index c5505ec373669..d85a845b6f3a6 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -1396,9 +1396,10 @@ namespace ts { export function assign(t: T, ...args: (T | undefined)[]) { for (const arg of args) { - for (const p in arg!) { - if (hasProperty(arg!, p)) { - t![p] = arg![p]; // TODO: GH#23368 + if (arg === undefined) continue; + for (const p in arg) { + if (hasProperty(arg, p)) { + t[p] = arg[p]; // TODO: GH#23368 } } } From 05e9e1dafcecdc0208052fee75dfc22d9204eab0 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 12 Feb 2019 17:03:57 -0800 Subject: [PATCH 3/4] Accept baseline diff to go back to local based baseline --- tests/baselines/reference/api/tsserverlibrary.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 36c246c999f23..70fccdf87c1a3 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -8347,7 +8347,7 @@ declare namespace ts.server { excludedFiles: ReadonlyArray; private typeAcquisition; updateGraph(): boolean; - getExcludedFiles(): ReadonlyArray; + getExcludedFiles(): readonly NormalizedPath[]; getTypeAcquisition(): TypeAcquisition; setTypeAcquisition(newTypeAcquisition: TypeAcquisition): void; } From 815fea8d33fc2821e8aad829af96388c29da88dd Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 12 Feb 2019 17:35:18 -0800 Subject: [PATCH 4/4] Remove comment --- 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 d85a845b6f3a6..4bd4801ce8f64 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -1399,7 +1399,7 @@ namespace ts { if (arg === undefined) continue; for (const p in arg) { if (hasProperty(arg, p)) { - t[p] = arg[p]; // TODO: GH#23368 + t[p] = arg[p]; } } }