Fix order of cells inserted

Author: DonJayamanne

src/datascience-ui/native-editor/redux/reducers/creation.ts

@@ -32,14 +32,6 @@ export namespace Creation {
         return cellVM;
     }
 
-    function findFirstCodeCellAbove(cellVMs: ICellViewModel[], start: number): string | undefined {
-        for (let index = start; index >= 0; index -= 1) {
-            if (cellVMs[index].cell.data.cell_type === 'code') {
-                return cellVMs[index].cell.id;
-            }
-        }
-    }
-
     export function addAndFocusCell(arg: NativeEditorReducerArg<IAddCellAction>): IMainState {
         queueIncomingActionWithPayload(arg, CommonActionType.ADD_NEW_CELL, { newCellId: arg.payload.data.newCellId });
         queueIncomingActionWithPayload(arg, CommonActionType.FOCUS_CELL, { cellId: arg.payload.data.newCellId, cursorPos: CursorPos.Current });
@@ -84,7 +76,7 @@ export namespace Creation {
         };
 
         // Send a messsage that we inserted a cell
-        Transfer.postModelInsert(arg, position, newVM.cell, findFirstCodeCellAbove(newList, position));
+        Transfer.postModelInsert(arg, position, newVM.cell, arg.payload.data.cellId);
 
         return result;
     }
@@ -96,10 +88,11 @@ export namespace Creation {
         // Find the position where we want to insert
         let position = arg.prevState.cellVMs.findIndex(c => c.cell.id === arg.payload.data.cellId);
         if (position >= 0) {
-            newList.splice(position + 1, 0, newVM);
+            position += 1;
+            newList.splice(position, 0, newVM);
         } else {
             newList.push(newVM);
-            position = newList.length - 2;
+            position = newList.length;
         }
 
         const result = {
@@ -109,7 +102,7 @@ export namespace Creation {
         };
 
         // Send a messsage that we inserted a cell
-        Transfer.postModelInsert(arg, arg.prevState.cellVMs.length, newVM.cell, findFirstCodeCellAbove(newList, position));
+        Transfer.postModelInsert(arg, position, newVM.cell, arg.payload.data.cellId);
 
         return result;
     }