Handle static properties correctly in access -> invocation transform.

sq · Aug 10, 2012 · 0fe867c · 0fe867c
1 parent 0e49b62
commit 0fe867c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/JSIL/Transforms/ConvertPropertyAccessesToInvocations.cs b/JSIL/Transforms/ConvertPropertyAccessesToInvocations.cs
@@ -46,7 +46,13 @@ private JSExpression ConstructInvocation (
             );
 
             JSInvocationExpressionBase invocation;
-            if (needsExplicitThis)
+            if (pa.Property.Property.IsStatic)
+                invocation = JSInvocationExpression.InvokeStatic(
+                    pa.OriginalMethod.Reference.DeclaringType, 
+                    pa.OriginalMethod, 
+                    arguments
+                );
+            else if (needsExplicitThis)
                 invocation = JSInvocationExpression.InvokeBaseMethod(
                     pa.OriginalMethod.Reference.DeclaringType,
                     pa.OriginalMethod, pa.ThisReference,

diff --git a/Tests/MetadataTests.cs b/Tests/MetadataTests.cs
@@ -243,7 +243,10 @@ public void RenameProperty () {
 
             Assert.IsFalse(generatedJs.Contains("Program.Property"));
             Assert.IsFalse(generatedJs.Contains("$thisType.Property"));
-            Assert.IsTrue(generatedJs.Contains("$thisType.RenamedProperty"));
+            Assert.IsTrue(
+                generatedJs.Contains("$thisType.RenamedProperty") ||
+                generatedJs.Contains("$thisType.get_RenamedProperty")
+            );
         }
 
         [Test]