changed static methods and lambda-properties to take a context parameter by default (#322)

tomblind · web-flow · commit 91b02cef89a4 · 2019-01-09T12:05:06.000-07:00
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -401,16 +401,14 @@ export class TSHelper {
             return thisParameter.type && thisParameter.type.kind === ts.SyntaxKind.VoidKeyword
                 ? ContextType.Void : ContextType.NonVoid;
         }
-        if ((ts.isMethodDeclaration(signatureDeclaration) || ts.isMethodSignature(signatureDeclaration))
-            && !(ts.getCombinedModifierFlags(signatureDeclaration) & ts.ModifierFlags.Static)) {
-            // Non-static method
+        if (ts.isMethodDeclaration(signatureDeclaration) || ts.isMethodSignature(signatureDeclaration)) {
+            // Method
             return ContextType.NonVoid;
         }
-        if ((ts.isPropertySignature(signatureDeclaration.parent)
-             || ts.isPropertyDeclaration(signatureDeclaration.parent)
-             || ts.isPropertyAssignment(signatureDeclaration.parent))
-            && !(ts.getCombinedModifierFlags(signatureDeclaration.parent) & ts.ModifierFlags.Static)) {
-            // Non-static lambda property
+        if (ts.isPropertySignature(signatureDeclaration.parent)
+            || ts.isPropertyDeclaration(signatureDeclaration.parent)
+            || ts.isPropertyAssignment(signatureDeclaration.parent)) {
+            // Lambda property
             return ContextType.NonVoid;
         }
         if (ts.isBinaryExpression(signatureDeclaration.parent)) {
diff --git a/test/translation/lua/namespaceMerge.lua b/test/translation/lua/namespaceMerge.lua
@@ -9,10 +9,10 @@ end
 end
 function MergedClass.constructor(self)
 end
-function MergedClass.staticMethodA()
+function MergedClass.staticMethodA(self)
 end
-function MergedClass.staticMethodB()
-    self.staticMethodA();
+function MergedClass.staticMethodB(self)
+    self:staticMethodA();
 end
 function MergedClass.methodA(self)
 end
@@ -29,5 +29,5 @@ end
 local mergedClass = MergedClass.new(true);
 mergedClass:methodB();
 mergedClass:propertyFunc();
-MergedClass.staticMethodB();
+MergedClass:staticMethodB();
 MergedClass.namespaceFunc();
diff --git a/test/unit/assignments.spec.ts b/test/unit/assignments.spec.ts
