@@ -0,0 +1 @@
+Initial collapse / expand state broken by native liveshare work / gather
@@ -4,6 +4,8 @@ import { CellSlice } from '@msrvida/python-program-analysis/lib/cellslice';
 import { ExecutionLogSlicer } from '@msrvida/python-program-analysis/lib/log-slicer';
 
 import { inject, injectable } from 'inversify';
+// tslint:disable-next-line: no-require-imports
+import cloneDeep = require('lodash/cloneDeep');
 import { IApplicationShell, ICommandManager } from '../../common/application/types';
 import { traceInfo } from '../../common/logger';
 import { IConfigurationService, IDisposableRegistry } from '../../common/types';
@@ -52,15 +54,18 @@ export class GatherExecution implements IGatherExecution, INotebookExecutionLogg
         if (this.enabled) {
             // Don't log if vscCell.data.source is an empty string. Original Jupyter extension also does this.
             if (vscCell.data.source !== '') {
+                // First make a copy of this cell, as we are going to modify it
+                const cloneCell: IVscCell = cloneDeep(vscCell);
+
                 // Strip first line marker. We can't do this at JupyterServer.executeCodeObservable because it messes up hashing
                 const cellMatcher = new CellMatcher(this.configService.getSettings().datascience);
-                vscCell.data.source = cellMatcher.stripFirstMarker(concatMultilineString(vscCell.data.source));
+                cloneCell.data.source = cellMatcher.stripFirstMarker(concatMultilineString(vscCell.data.source));
 
                 // Convert IVscCell to IGatherCell
-                const cell = convertVscToGatherCell(vscCell) as LabCell;
+                const cell = convertVscToGatherCell(cloneCell) as LabCell;
 
                 // Call internal logging method
-                if (!vscCell.data.source.startsWith(internalUseCellKey)) {
+                if (!cloneCell.data.source.startsWith(internalUseCellKey)) {
                     this._executionSlicer.logExecution(cell);
                 }
             }
 
@@ -10,7 +10,7 @@ import * as uuid from 'uuid/v4';
 
 import { createDeferred, Deferred } from '../../client/common/utils/async';
 import { CellMatcher } from '../../client/datascience/cellMatcher';
-import { generateMarkdownFromCodeLines } from '../../client/datascience/common';
+import { concatMultilineString, generateMarkdownFromCodeLines } from '../../client/datascience/common';
 import { Identifiers } from '../../client/datascience/constants';
 import {
     IInteractiveWindowMapping,
@@ -949,7 +949,7 @@ export class MainStateController implements IMessageHandler {
             newVMs[index] = cloneDeep(newVMs[index]);
 
             // Check to see if our code still matches for the cell (in liveshare it might be updated from the other side)
-            if (newVMs[index].cell.data.source !== cell.data.source) {
+            if (concatMultilineString(newVMs[index].cell.data.source) !== concatMultilineString(cell.data.source)) {
                 const newText = extractInputText(cell, getSettings());
                 newVMs[index].inputBlockText = newText;
             }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Initial collapse / expand state broken by native liveshare work / gather`