allowing all strings to be thrown, not just literals (#244)

tomblind · Perryvw · commit e08753a450fd · 2018-10-16T20:33:10.000+02:00
* allowing all strings to be thrown, not just literals; also fixed formatting

* added semi-colon to throw
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -294,7 +294,7 @@ export abstract class LuaTranspiler {
             case ts.SyntaxKind.TryStatement:
                 return this.transpileTry(node as ts.TryStatement);
             case ts.SyntaxKind.ThrowStatement:
-                return this.transpileThrow(node as ts.ThrowStatement);
+                return this.indent + this.transpileThrow(node as ts.ThrowStatement) + ";\n";
             case ts.SyntaxKind.ContinueStatement:
                 return this.transpileContinue(node as ts.ContinueStatement);
             case ts.SyntaxKind.TypeAliasDeclaration:
@@ -683,8 +683,9 @@ export abstract class LuaTranspiler {
     }
 
     public transpileThrow(node: ts.ThrowStatement): string {
-        if (ts.isStringLiteral(node.expression)) {
-            return `error("${node.expression.text}")`;
+        const type = this.checker.getTypeAtLocation(node.expression);
+        if (tsHelper.isStringType(type)) {
+            return `error(${this.transpileExpression(node.expression)})`;
         } else {
             throw TSTLErrors.InvalidThrowExpression(node.expression);
         }
diff --git a/test/unit/error.spec.ts b/test/unit/error.spec.ts
@@ -12,7 +12,7 @@ export class LuaErrorTests {
             `throw "Some Error"`
         );
         // Assert
-        Expect(lua).toBe(`error("Some Error")`);
+        Expect(lua).toBe(`error("Some Error");`);
     }
 
     @Test("throwError")

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export class LuaErrorTests {`
`12`	`12`	`throw "Some Error"`
`13`	`13`	`);`
`14`	`14`	`// Assert`
`15`		- Expect(lua).toBe(`error("Some Error")`);
	`15`	+ Expect(lua).toBe(`error("Some Error");`);
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`@Test("throwError")`