style fixes

TheLartians · TheLartians · commit e8ea8f3786f3 · 2019-09-26T17:44:53.000+02:00
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -5503,7 +5503,8 @@ export class LuaTransformer {
 
     protected checkForLuaLibType(type: ts.Type): void {
         if (type.symbol) {
-            switch (this.checker.getFullyQualifiedName(type.symbol)) {
+            const name = this.checker.getFullyQualifiedName(type.symbol);
+            switch (name) {
                 case "Map":
                     this.importLuaLibFeature(LuaLibFeature.Map);
                     return;
@@ -5516,42 +5517,9 @@ export class LuaTransformer {
                 case "WeakSet":
                     this.importLuaLibFeature(LuaLibFeature.WeakSet);
                     return;
-                case "Error":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "ErrorConstructor":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "RangeError":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "RangeErrorConstructor":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "ReferenceError":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "ReferenceErrorConstructor":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "SyntaxError":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "SyntaxErrorConstructor":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "TypeError":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "TypeErrorConstructor":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "URIError":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
-                case "URIErrorConstructor":
-                    this.importLuaLibFeature(LuaLibFeature.Error);
-                    return;
+            }
+            if (tsHelper.isBuiltInErrorTypeName(name)) {
+                this.importLuaLibFeature(LuaLibFeature.Error);
             }
         }
     }
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -33,6 +33,21 @@ const defaultArrayCallMethodNames = new Set<string>([
     "flatMap",
 ]);
 
+const builtinErrorTypeNames = new Set([
+    "Error",
+    "ErrorConstructor",
+    "RangeError",
+    "RangeErrorConstructor",
+    "ReferenceError",
+    "ReferenceErrorConstructor",
+    "SyntaxError",
+    "SyntaxErrorConstructor",
+    "TypeError",
+    "TypeErrorConstructor",
+    "URIError",
+    "URIErrorConstructor",
+]);
+
 export function getExtendedTypeNode(
     node: ts.ClassLikeDeclarationBase,
     checker: ts.TypeChecker
@@ -1041,3 +1056,7 @@ export function formatPathToLuaPath(filePath: string): string {
     }
     return filePath.replace(/\.\//g, "").replace(/\//g, ".");
 }
+
+export function isBuiltInErrorTypeName(name: string): boolean {
+    return builtinErrorTypeNames.has(name);
+}
diff --git a/src/lualib/Error.ts b/src/lualib/Error.ts
@@ -6,6 +6,11 @@ type TSTLCapturedErrorStack = Array<{
     currentline: number;
 }>;
 
+interface ErrorType<T> extends Function {
+    name: string;
+    new (...args: any[]): T;
+}
+
 function __TS__GetErrorStack(constructor: Function): TSTLCapturedErrorStack {
     const functionFrames = [];
     let level = 1;
@@ -49,7 +54,7 @@ function __TS__GetErrorString(this: void, error: Error): string {
     return error.message !== "" ? `${error.name}: ${error.message}` : error.name;
 }
 
-function __TS__InitErrorClass(Type: any, name?: string): any {
+function __TS__InitErrorClass<T>(Type: ErrorType<T>, name?: string): any {
     if (name) {
         Type.name = name;
     }
diff --git a/test/unit/error.spec.ts b/test/unit/error.spec.ts
@@ -296,14 +296,10 @@ test("throw and catch custom error object", () => {
     `.expectToMatchJsResult();
 });
 
-test.each(["Error", "RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError", "MyError"])(
+test.each(["Error", "RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError"])(
     "throw builtin Errors as classes",
     errorType => {
         util.testFunction`
-            class MyError extends Error {
-                name: "MyError"
-            }
-
             try {
                 throw new ${errorType}("message")
             } catch (error) {
@@ -348,7 +344,7 @@ test("subclass Error", () => {
             throw new MyError();
         } catch (error) {
             if (error instanceof Error) {
-                return error.name;
+                return \'\$error\';
             } else {
                 throw TypeError();
             }
