Fixed string concat and added tests for it

lolleko · lolleko · commit c36222fb7231 · 2018-02-22T16:32:28.000+01:00
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -558,8 +558,11 @@ export class LuaTranspiler {
             case ts.SyntaxKind.PlusToken:
                 // Replace string + with ..
                 const typeLeft = this.checker.getTypeAtLocation(node.left);
+                const typeRight = this.checker.getTypeAtLocation(node.right);
                 if (typeLeft.flags & ts.TypeFlags.String || ts.isStringLiteral(node.left))
                     return lhs + ".." + rhs;
+                if (typeRight.flags & ts.TypeFlags.String || ts.isStringLiteral(node.right))
+                    return lhs + ".." + rhs;
             default:
                 result = lhs + this.transpileOperator(node.operatorToken) + rhs;
         }
diff --git a/test/integration/lua/string.spec.ts b/test/integration/lua/string.spec.ts
@@ -42,10 +42,30 @@ export class StringTests {
         Expect(result).toBe(inp.replace(searchValue, replaceValue));
     }
 
+    @TestCase(["", ""], "")
+    @TestCase(["hello", "test"], "hellotest")
+    @TestCase(["hello", "test", "bye"], "hellotestbye")
+    @TestCase(["hello", 42], "hello42")
+    @TestCase([42, "hello"], "42hello")
+    @Test("string.concat[+]")
+    public concat(inp: any[], expected: string) {
+        // Transpile
+        let lua = util.transpileString(
+            `return '${inp.join("' + '")}'`,
+            util.dummyTypes.String
+        );
+
+        // Execute
+        let result = util.executeLua(lua);
+
+        // Assert
+        Expect(result).toBe(expected);
+    }
+
     @TestCase("hello test", new RegExp("123", "g"), "")
     @IgnoreTest()
     @Test("string.replace[Regex]")
-    public replaceRegex<T>(inp: string, searchValue: string, replaceValue: string) {
+    public replaceRegex(inp: string, searchValue: string, replaceValue: string) {
         // Transpile
         let lua = util.transpileString(
             `return "${inp}".replace("${searchValue}", "${replaceValue}")`,
@@ -63,7 +83,7 @@ export class StringTests {
     @TestCase("hello test", "t")
     @TestCase("hello test", "h")
     @Test("string.indexOf")
-    public indexOf<T>(inp: string, searchValue: string) {
+    public indexOf(inp: string, searchValue: string) {
         // Transpile
         let lua = util.transpileString(
             `return "${inp}".indexOf("${searchValue}")`,
@@ -82,7 +102,7 @@ export class StringTests {
     @TestCase("hello test", 1, 2)
     @TestCase("hello test", 1, 5)
     @Test("string.substring")
-    public substring<T>(inp: string, start: number, end?: number) {
+    public substring(inp: string, start: number, end?: number) {
         // Transpile
         let paramStr = end ? `${start}, ${end}` : `${start}`;
         let lua = util.transpileString(
