From c467b87b08cc355cb40d1364e320f7149454cbe5 Mon Sep 17 00:00:00 2001
From: CyrusNajmabadi <cyrusn@microsoft.com>
Date: Fri, 20 Jan 2017 13:36:35 -0800
Subject: [PATCH] Be resilient to not having a containing type for a backing
 field.

---
 .../AbstractReplacePropertyWithMethodsService.cs   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Features/Core/Portable/ReplacePropertyWithMethods/AbstractReplacePropertyWithMethodsService.cs b/src/Features/Core/Portable/ReplacePropertyWithMethods/AbstractReplacePropertyWithMethodsService.cs
index faa31857c73..789801efd8c 100644
--- a/src/Features/Core/Portable/ReplacePropertyWithMethods/AbstractReplacePropertyWithMethodsService.cs
+++ b/src/Features/Core/Portable/ReplacePropertyWithMethods/AbstractReplacePropertyWithMethodsService.cs
@@ -24,11 +24,17 @@ internal abstract class AbstractReplacePropertyWithMethodsService<TIdentifierNam
 
         protected static SyntaxNode GetFieldReference(SyntaxGenerator generator, IFieldSymbol propertyBackingField)
         {
-            var through = propertyBackingField.IsStatic
-                ? generator.TypeExpression(propertyBackingField.ContainingType)
-                : generator.ThisExpression();
+            var memberName = generator.IdentifierName(propertyBackingField.Name);
+            if (propertyBackingField.IsStatic)
+            {
+                return propertyBackingField.ContainingType == null
+                    ? memberName
+                    : generator.MemberAccessExpression(
+                        generator.TypeExpression(propertyBackingField.ContainingType),
+                        memberName);
+            }
 
-            return generator.MemberAccessExpression(through, propertyBackingField.Name);
+            return generator.MemberAccessExpression(generator.ThisExpression(), memberName);
         }
 
         public async Task ReplaceReferenceAsync(
-- 
GitLab