CSHARP-5348: Add PopContext to Bson*Context where missing

Author: obligaron

src/MongoDB.Bson/IO/BsonBinaryWriter.cs

@@ -290,7 +290,7 @@ public override void WriteEndArray()
             _bsonStream.WriteByte(0);
             BackpatchSize(); // size of document
 
-            _context = _context.ParentContext;
+            _context = _context.PopContext();
             State = GetNextState();
         }
 
@@ -313,7 +313,7 @@ public override void WriteEndDocument()
             _bsonStream.WriteByte(0);
             BackpatchSize(); // size of document
 
-            _context = _context.ParentContext;
+            _context = _context.PopContext();
             if (_context == null)
             {
                 State = BsonWriterState.Done;
@@ -323,7 +323,7 @@ public override void WriteEndDocument()
                 if (_context.ContextType == ContextType.JavaScriptWithScope)
                 {
                     BackpatchSize(); // size of the JavaScript with scope value
-                    _context = _context.ParentContext;
+                    _context = _context.PopContext();
                 }
                 State = GetNextState();
             }

src/MongoDB.Bson/IO/BsonBinaryWriterContext.cs

@@ -55,5 +55,10 @@ internal int Index
             get { return _index; }
             set { _index = value; }
         }
+
+        internal BsonBinaryWriterContext PopContext()
+        {
+            return _parentContext;
+        }
     }
 }

src/MongoDB.Bson/IO/BsonDocumentWriter.cs

@@ -195,7 +195,7 @@ public override void WriteEndArray()
 
             base.WriteEndArray();
             var array = _context.Array;
-            _context = _context.ParentContext;
+            _context = _context.PopContext();
             WriteValue(array);
             State = GetNextState();
         }
@@ -219,15 +219,15 @@ public override void WriteEndDocument()
             if (_context.ContextType == ContextType.ScopeDocument)
             {
                 var scope = _context.Document;
-                _context = _context.ParentContext;
+                _context = _context.PopContext();
                 var code = _context.Code;
-                _context = _context.ParentContext;
+                _context = _context.PopContext();
                 WriteValue(new BsonJavaScriptWithScope(code, scope));
             }
             else
             {
                 var document = _context.Document;
-                _context = _context.ParentContext;
+                _context = _context.PopContext();
                 if (_context != null)
                 {
                     WriteValue(document);

src/MongoDB.Bson/IO/BsonDocumentWriterContext.cs

@@ -87,5 +87,10 @@ internal string Code
         {
             get { return _code; }
         }
+
+        internal BsonDocumentWriterContext PopContext()
+        {
+            return _parentContext;
+        }
     }
 }

src/MongoDB.Bson/IO/JsonWriter.cs

@@ -312,7 +312,7 @@ public override void WriteEndArray()
             base.WriteEndArray();
             _textWriter.Write("]");
 
-            _context = _context.ParentContext;
+            _context = _context.PopContext();
             State = GetNextState();
         }
 
@@ -344,12 +344,12 @@ public override void WriteEndDocument()
 
             if (_context.ContextType == ContextType.ScopeDocument)
             {
-                _context = _context.ParentContext;
+                _context = _context.PopContext();
                 WriteEndDocument();
             }
             else
             {
-                _context = _context.ParentContext;
+                _context = _context.PopContext();
             }
 
             if (_context == null)

src/MongoDB.Bson/IO/JsonWriterContext.cs

@@ -52,5 +52,10 @@ internal bool HasElements
             get { return _hasElements; }
             set { _hasElements = value; }
         }
+
+        internal JsonWriterContext PopContext()
+        {
+            return _parentContext;
+        }
     }
 }