From 7d65a8d5dfdaa21e074a0a10362aed47091d163b Mon Sep 17 00:00:00 2001 From: Duncan Uszkay Date: Mon, 16 Mar 2020 18:01:14 -0400 Subject: [PATCH 1/5] Change assert to a ! to allow for "" --- src/program.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/program.ts b/src/program.ts index 6612ae778c..17335c0432 100644 --- a/src/program.ts +++ b/src/program.ts @@ -1044,7 +1044,9 @@ export class Program extends DiagnosticEmitter { // TODO: for (let [alias, name] of globalAliases) { for (let _keys = Map_keys(globalAliases), i = 0, k = _keys.length; i < k; ++i) { let alias = unchecked(_keys[i]); - let name = assert(globalAliases.get(alias)); + let name = globalAliases.get(alias); + assert(isString(name)); + name = name! if (!name.length) continue; // explicitly disabled let firstChar = name.charCodeAt(0); if (firstChar >= CharCode._0 && firstChar <= CharCode._9) { From 4cb5f3d03263548a37902cda9f9b8e8bd027a27c Mon Sep 17 00:00:00 2001 From: Duncan Uszkay Date: Tue, 17 Mar 2020 12:25:04 -0400 Subject: [PATCH 2/5] Remove assertion, use ! instead --- src/program.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/program.ts b/src/program.ts index 17335c0432..5a0c99075c 100644 --- a/src/program.ts +++ b/src/program.ts @@ -1044,9 +1044,7 @@ export class Program extends DiagnosticEmitter { // TODO: for (let [alias, name] of globalAliases) { for (let _keys = Map_keys(globalAliases), i = 0, k = _keys.length; i < k; ++i) { let alias = unchecked(_keys[i]); - let name = globalAliases.get(alias); - assert(isString(name)); - name = name! + let name = changetype(globalAliases.get(alias))! if (!name.length) continue; // explicitly disabled let firstChar = name.charCodeAt(0); if (firstChar >= CharCode._0 && firstChar <= CharCode._9) { From e8ef003255025732fc4117b13184354b70372029 Mon Sep 17 00:00:00 2001 From: Duncan Uszkay Date: Thu, 19 Mar 2020 19:42:57 -0400 Subject: [PATCH 3/5] add nullity check --- src/program.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/program.ts b/src/program.ts index 5a0c99075c..fe5aed6ec8 100644 --- a/src/program.ts +++ b/src/program.ts @@ -1045,6 +1045,7 @@ export class Program extends DiagnosticEmitter { for (let _keys = Map_keys(globalAliases), i = 0, k = _keys.length; i < k; ++i) { let alias = unchecked(_keys[i]); let name = changetype(globalAliases.get(alias))! + assert(name != null); if (!name.length) continue; // explicitly disabled let firstChar = name.charCodeAt(0); if (firstChar >= CharCode._0 && firstChar <= CharCode._9) { From 04429302881d1f056d7050c17b370f9f986adfca Mon Sep 17 00:00:00 2001 From: Duncan Uszkay Date: Thu, 19 Mar 2020 20:13:52 -0400 Subject: [PATCH 4/5] remove ! --- src/program.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/program.ts b/src/program.ts index fe5aed6ec8..b3b62fbb04 100644 --- a/src/program.ts +++ b/src/program.ts @@ -1044,7 +1044,7 @@ export class Program extends DiagnosticEmitter { // TODO: for (let [alias, name] of globalAliases) { for (let _keys = Map_keys(globalAliases), i = 0, k = _keys.length; i < k; ++i) { let alias = unchecked(_keys[i]); - let name = changetype(globalAliases.get(alias))! + let name = changetype(globalAliases.get(alias)) assert(name != null); if (!name.length) continue; // explicitly disabled let firstChar = name.charCodeAt(0); From 6cf7b7dde4d1fb59e69a38ee4925ecab8e1a2e74 Mon Sep 17 00:00:00 2001 From: Duncan Uszkay Date: Thu, 19 Mar 2020 20:15:49 -0400 Subject: [PATCH 5/5] added semicolon --- src/program.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/program.ts b/src/program.ts index b3b62fbb04..1c15bc54ff 100644 --- a/src/program.ts +++ b/src/program.ts @@ -1044,7 +1044,7 @@ export class Program extends DiagnosticEmitter { // TODO: for (let [alias, name] of globalAliases) { for (let _keys = Map_keys(globalAliases), i = 0, k = _keys.length; i < k; ++i) { let alias = unchecked(_keys[i]); - let name = changetype(globalAliases.get(alias)) + let name = changetype(globalAliases.get(alias)); assert(name != null); if (!name.length) continue; // explicitly disabled let firstChar = name.charCodeAt(0);