Merge branch 'main' into fix/enum-computed-keys

Author: kairosci

src/compiler/checker.ts

@@ -24893,7 +24893,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
     function discriminateTypeByDiscriminableItems(target: UnionType, discriminators: (readonly [() => Type, __String])[], related: (source: Type, target: Type) => boolean | Ternary) {
         const types = target.types;
-        const include: Ternary[] = types.map(t => t.flags & TypeFlags.Primitive ? Ternary.False : Ternary.True);
+        const include: Ternary[] = types.map(t => t.flags & TypeFlags.Primitive || getReducedType(t).flags & TypeFlags.Never ? Ternary.False : Ternary.True);
         for (const [getDiscriminatingType, propertyName] of discriminators) {
             // If the remaining target types include at least one with a matching discriminant, eliminate those that
             // have non-matching discriminants. This ensures that we ignore erroneous discriminators and gradually

src/compiler/program.ts

@@ -4484,7 +4484,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
                 createDeprecatedDiagnostic("charset");
             }
             if (options.out) {
-                createDeprecatedDiagnostic("out", /*value*/ undefined, "outFile");
+                createDeprecatedDiagnostic("out");
             }
             if (options.importsNotUsedAsValues) {
                 createDeprecatedDiagnostic("importsNotUsedAsValues", /*value*/ undefined, "verbatimModuleSyntax");
@@ -4510,6 +4510,9 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
             if (options.allowSyntheticDefaultImports === false) {
                 createDeprecatedDiagnostic("allowSyntheticDefaultImports", "false", /*useInstead*/ undefined, /*related*/ undefined);
             }
+            if (options.outFile) {
+                createDeprecatedDiagnostic("outFile");
+            }
             if (options.module === ModuleKind.None || options.module === ModuleKind.AMD || options.module === ModuleKind.UMD || options.module === ModuleKind.System) {
                 createDeprecatedDiagnostic("module", ModuleKind[options.module], /*useInstead*/ undefined, /*related*/ undefined);
             }

src/harness/harnessUtils.ts

@@ -15,19 +15,15 @@ export function evalFile(fileContents: string, fileName: string, nodeContext?: a
     }
 }
 
-/** Splits the given string on \r\n, or on only \n if that fails, or on only \r if *that* fails. */
+const newlineRegex = /\r?\n/;
+
+/**
+ * Splits the given string on the two reasonable line terminators (\r\n or \n).
+ * Does NOT split on `\r` alone, \u2028, or \u2029.
+ */
 export function splitContentByNewlines(content: string): string[] {
     // Split up the input file by line
-    // Note: IE JS engine incorrectly handles consecutive delimiters here when using RegExp split, so
-    // we have to use string-based splitting instead and try to figure out the delimiting chars
-    let lines = content.split("\r\n");
-    if (lines.length === 1) {
-        lines = content.split("\n");
-
-        if (lines.length === 1) {
-            lines = content.split("\r");
-        }
-    }
+    const lines = content.split(newlineRegex);
     return lines;
 }
 

tests/baselines/reference/2dArrays.js

@@ -5,12 +5,12 @@ class Cell {
 }
 
 class Ship {
-    isSunk: boolean;
+    isSunk: boolean = false;
 }
 
 class Board {
-    ships: Ship[];
-    cells: Cell[];
+    ships: Ship[] = [];
+    cells: Cell[] = [];
 
     private allShipsSunk() {
         return this.ships.every(function (val) { return val.isSunk; });
@@ -25,11 +25,14 @@ var Cell = /** @class */ (function () {
 }());
 var Ship = /** @class */ (function () {
     function Ship() {
+        this.isSunk = false;
     }
     return Ship;
 }());
 var Board = /** @class */ (function () {
     function Board() {
+        this.ships = [];
+        this.cells = [];
     }
     Board.prototype.allShipsSunk = function () {
         return this.ships.every(function (val) { return val.isSunk; });

tests/baselines/reference/2dArrays.symbols

@@ -8,23 +8,23 @@ class Cell {
 class Ship {
 >Ship : Symbol(Ship, Decl(2dArrays.ts, 1, 1))
 
-    isSunk: boolean;
+    isSunk: boolean = false;
 >isSunk : Symbol(Ship.isSunk, Decl(2dArrays.ts, 3, 12))
 }
 
 class Board {
 >Board : Symbol(Board, Decl(2dArrays.ts, 5, 1))
 
-    ships: Ship[];
+    ships: Ship[] = [];
 >ships : Symbol(Board.ships, Decl(2dArrays.ts, 7, 13))
 >Ship : Symbol(Ship, Decl(2dArrays.ts, 1, 1))
 
-    cells: Cell[];
->cells : Symbol(Board.cells, Decl(2dArrays.ts, 8, 18))
+    cells: Cell[] = [];
+>cells : Symbol(Board.cells, Decl(2dArrays.ts, 8, 23))
 >Cell : Symbol(Cell, Decl(2dArrays.ts, 0, 0))
 
     private allShipsSunk() {
->allShipsSunk : Symbol(Board.allShipsSunk, Decl(2dArrays.ts, 9, 18))
+>allShipsSunk : Symbol(Board.allShipsSunk, Decl(2dArrays.ts, 9, 23))
 
         return this.ships.every(function (val) { return val.isSunk; });
 >this.ships.every : Symbol(Array.every, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))

tests/baselines/reference/2dArrays.types

@@ -10,22 +10,28 @@ class Ship {
 >Ship : Ship
 >     : ^^^^
 
-    isSunk: boolean;
+    isSunk: boolean = false;
 >isSunk : boolean
 >       : ^^^^^^^
+>false : false
+>      : ^^^^^
 }
 
 class Board {
 >Board : Board
 >      : ^^^^^
 
-    ships: Ship[];
+    ships: Ship[] = [];
 >ships : Ship[]
 >      : ^^^^^^
+>[] : undefined[]
+>   : ^^^^^^^^^^^
 
-    cells: Cell[];
+    cells: Cell[] = [];
 >cells : Cell[]
 >      : ^^^^^^
+>[] : undefined[]
+>   : ^^^^^^^^^^^
 
     private allShipsSunk() {
 >allShipsSunk : () => boolean

tests/baselines/reference/APISample_Watch.js

@@ -51,7 +51,7 @@ function watchMain() {
     // You can technically override any given hook on the host, though you probably don't need to.
     // Note that we're assuming `origCreateProgram` and `origPostProgramCreate` doesn't use `this` at all.
     const origCreateProgram = host.createProgram;
-    host.createProgram = (rootNames: ReadonlyArray<string>, options, host, oldProgram) => {
+    host.createProgram = (rootNames: ReadonlyArray<string> | undefined, options, host, oldProgram) => {
         console.log("** We're about to create the program! **");
         return origCreateProgram(rootNames, options, host, oldProgram);
     }

tests/baselines/reference/abstractPropertyBasics.js

@@ -19,7 +19,7 @@ class C extends B {
     set prop(v) { }
     raw = "edge";
     readonly ro = "readonly please";
-    readonlyProp: string; // don't have to give a value, in fact
+    readonlyProp!: string;
     m() { }
 }
 

tests/baselines/reference/abstractPropertyBasics.symbols

@@ -53,9 +53,9 @@ class C extends B {
     readonly ro = "readonly please";
 >ro : Symbol(C.ro, Decl(abstractPropertyBasics.ts, 16, 17))
 
-    readonlyProp: string; // don't have to give a value, in fact
+    readonlyProp!: string;
 >readonlyProp : Symbol(C.readonlyProp, Decl(abstractPropertyBasics.ts, 17, 36))
 
     m() { }
->m : Symbol(C.m, Decl(abstractPropertyBasics.ts, 18, 25))
+>m : Symbol(C.m, Decl(abstractPropertyBasics.ts, 18, 26))
 }

tests/baselines/reference/abstractPropertyBasics.types

@@ -74,7 +74,7 @@ class C extends B {
 >"readonly please" : "readonly please"
 >                  : ^^^^^^^^^^^^^^^^^
 
-    readonlyProp: string; // don't have to give a value, in fact
+    readonlyProp!: string;
 >readonlyProp : string
 >             : ^^^^^^