Merge branch 'master' into linter

lolleko · web-flow · commit 018d25efb8f6 · 2018-03-24T14:57:34.000+01:00
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -1277,17 +1277,13 @@ export class LuaTranspiler {
         if (constructor) {
             // Add constructor plus initialisation of instance fields
             result += this.transpileConstructor(constructor, className, instanceFields);
-        } else {
-            // No constructor, make one to set all instance fields if there are any
-            if (instanceFields.length > 0) {
-                // Create empty constructor and add instance fields
-                result += this.transpileConstructor(ts.createConstructor([],
-                                                                         [],
-                                                                         [],
-                                                                         ts.createBlock([], true)),
-                                                    className,
-                                                    instanceFields);
-            }
+        } else if (!isExtension) {
+            // Generate a constructor if none was defined
+            result += this.transpileConstructor(
+                ts.createConstructor([], [], [], ts.createBlock([], true)),
+                className,
+                instanceFields
+            );
         }
 
         // Transpile methods
diff --git a/test/translation/builder.spec.ts b/test/translation/builder.spec.ts
@@ -42,10 +42,8 @@ export class FileTests {
     @TestCases(files)
     @Test("Transformation Tests")
     public transformationTests(tsFile: string, luaFile:string) {
-        Expect(
-            BufferToTestString(fileContents[luaFile]))
-        .toEqual(
-            util.transpileString(BufferToTestString(fileContents[tsFile])));
+        Expect(util.transpileString(BufferToTestString(fileContents[tsFile])))
+        .toEqual(BufferToTestString(fileContents[luaFile]));
     }
 
 }
diff --git a/test/translation/lua/class.lua b/test/translation/lua/class.lua
@@ -5,4 +5,6 @@ function ClassB.new(construct, ...)
     local instance = setmetatable({}, ClassB)
     if construct and ClassB.constructor then ClassB.constructor(instance, ...) end
     return instance
-end
+end
+function ClassB.constructor(self)
+end
diff --git a/test/translation/lua/classDefaultConstructor.lua b/test/translation/lua/classDefaultConstructor.lua
@@ -0,0 +1,9 @@
+MyClass = MyClass or {}
+MyClass.__index = MyClass
+function MyClass.new(construct, ...)
+    local instance = setmetatable({}, MyClass)
+    if construct and MyClass.constructor then MyClass.constructor(instance, ...) end
+    return instance
+end
+function MyClass.constructor(self)
+end
diff --git a/test/translation/lua/classInstanceCall4.lua b/test/translation/lua/classInstanceCall4.lua
@@ -6,4 +6,6 @@ function ClassB.new(construct, ...)
     if construct and ClassB.constructor then ClassB.constructor(instance, ...) end
     return instance
 end
+function ClassB.constructor(self)
+end
 local x = ClassB.new(true):myFunc()
diff --git a/test/translation/lua/classPureAbstract.lua b/test/translation/lua/classPureAbstract.lua
@@ -4,4 +4,6 @@ function ClassB.new(construct, ...)
     local instance = setmetatable({}, ClassB)
     if construct and ClassB.constructor then ClassB.constructor(instance, ...) end
     return instance
+end
+function ClassB.constructor(self)
 end
diff --git a/test/translation/lua/modulesClassExport.lua b/test/translation/lua/modulesClassExport.lua
@@ -7,4 +7,6 @@ function TestClass.new(construct, ...)
     if construct and TestClass.constructor then TestClass.constructor(instance, ...) end
     return instance
 end
+function TestClass.constructor(self)
+end
 return exports
diff --git a/test/translation/lua/modulesClassWithMemberExport.lua b/test/translation/lua/modulesClassWithMemberExport.lua
@@ -7,6 +7,8 @@ function TestClass.new(construct, ...)
     if construct and TestClass.constructor then TestClass.constructor(instance, ...) end
     return instance
 end
+function TestClass.constructor(self)
+end
 function TestClass.memberFunc(self)
 end
 return exports
diff --git a/test/translation/ts/classDefaultConstructor.ts b/test/translation/ts/classDefaultConstructor.ts
@@ -0,0 +1 @@
+class MyClass {}

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,8 @@ export class FileTests {`
`42`	`42`	`@TestCases(files)`
`43`	`43`	`@Test("Transformation Tests")`
`44`	`44`	`public transformationTests(tsFile: string, luaFile:string) {`
`45`		`- Expect(`
`46`		`- BufferToTestString(fileContents[luaFile]))`
`47`		`- .toEqual(`
`48`		`- util.transpileString(BufferToTestString(fileContents[tsFile])));`
	`45`	`+ Expect(util.transpileString(BufferToTestString(fileContents[tsFile])))`
	`46`	`+ .toEqual(BufferToTestString(fileContents[luaFile]));`
`49`	`47`	`}`
`50`	`48`
`51`	`49`	`}`