From ce10c3ac3f23fb8027140e1204eaa90702888f0f Mon Sep 17 00:00:00 2001
From: Alex Ma <alma1@microsoft.com>
Date: Fri, 20 Dec 2019 15:16:56 -0800
Subject: [PATCH] Added check for the last null row (#8764)

---
 .../editData/browser/gridParentComponent.ts   | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts b/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts
index 6b3e2be69c..b92ebcef52 100644
--- a/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts
+++ b/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts
@@ -391,22 +391,24 @@ export abstract class GridParentComponent {
 		}
 
 		let rowIndex = grid.getCellFromEvent(event).row;
+		if (rowIndex !== grid.getDataLength() - 1) {
+			let actionContext: IGridInfo = {
+				batchIndex: batchId,
+				resultSetNumber: resultId,
+				selection: selection,
+				gridIndex: index,
+				rowIndex: rowIndex
+			};
 
-		let actionContext: IGridInfo = {
-			batchIndex: batchId,
-			resultSetNumber: resultId,
-			selection: selection,
-			gridIndex: index,
-			rowIndex: rowIndex
-		};
+			let anchor = { x: event.pageX + 1, y: event.pageY };
 
-		let anchor = { x: event.pageX + 1, y: event.pageY };
-		this.contextMenuService.showContextMenu({
-			getAnchor: () => anchor,
-			getActions: () => this.actionProvider.getGridActions(),
-			getKeyBinding: (action) => this._keybindingFor(action),
-			getActionsContext: () => (actionContext)
-		});
+			this.contextMenuService.showContextMenu({
+				getAnchor: () => anchor,
+				getActions: () => this.actionProvider.getGridActions(),
+				getKeyBinding: (action) => this._keybindingFor(action),
+				getActionsContext: () => (actionContext)
+			});
+		}
 	}
 
 	/**