VSCodeDebugProtocolPlugin: fixed issue where entries in the call stac…

…k that didn't have a source location (such as internal runtime functions) resulted in null reference errors (closes #47)
Moonshine-IDE · Nov 28, 2017 · fb8f381 · fb8f381
1 parent 182bf6f
commit fb8f381
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/...oonshineDESKTOPevolved/src/actionScripts/plugins/vscodeDebug/VSCodeDebugProtocolPlugin.as b/...oonshineDESKTOPevolved/src/actionScripts/plugins/vscodeDebug/VSCodeDebugProtocolPlugin.as
@@ -551,6 +551,12 @@ package actionScripts.plugins.vscodeDebug
 
 		private function parseSource(response:Object):Source
 		{
+			if(!response)
+			{
+				//the stack trace sometimes includes functions internal to the
+				//runtime that don't have a source. That's perfectly fine!
+				return null;
+			}
 			var vo:Source = new Source();
 			vo.name = response.name as String;
 			vo.path = response.path as String;
@@ -570,6 +576,12 @@ package actionScripts.plugins.vscodeDebug
 
 		private function gotoStackFrame(stackFrame:StackFrame):void
 		{
+			if(!stackFrame.source)
+			{
+				//nothing to open! sometimes the stack trace includes functions
+				//internal to the runtime that cannot be viewed as source.
+				return;
+			}
 			var filePath:String = stackFrame.source.path;
 			var line:int = stackFrame.line - 1;
 			var character:int = stackFrame.column;

diff --git a/...ineDESKTOPevolved/src/actionScripts/plugins/vscodeDebug/view/VSCodeDebugProtocolView.mxml b/...ineDESKTOPevolved/src/actionScripts/plugins/vscodeDebug/view/VSCodeDebugProtocolView.mxml
@@ -38,7 +38,7 @@
 		import mx.collections.IHierarchicalData;
 		import mx.events.AdvancedDataGridEvent;
 		import mx.events.ListEvent;
-		
+
 		import actionScripts.locator.IDEModel;
 		import actionScripts.plugins.vscodeDebug.events.LoadVariablesEvent;
 		import actionScripts.plugins.vscodeDebug.events.StackFrameEvent;
@@ -76,10 +76,24 @@
 			return "";
 		}
 
+		private function lineLabelFunction(item:StackFrame, column:DataGridColumn = null):String
+		{
+			if(item.source)
+			{
+				return item.line.toString();
+			}
+			return "";
+		}
+
 		private function nameDataTipFunction(item:StackFrame):String
 		{
-			return item.name + " (" + item.line + "," + item.column + ")\n" +
-				item.source.path;
+			var result:String = item.name;
+			if(item.source)
+			{
+				result += " (" + item.line + "," + item.column + ")";
+				result += "\n" + item.source.path;
+			}
+			return result;
 		}
 
 		private function variablesTree_itemOpenHandler(event:AdvancedDataGridEvent):void
@@ -96,7 +110,6 @@
 			var stackFrame:StackFrame = StackFrame(event.itemRenderer.data);
 			this.dispatchEvent(new StackFrameEvent(StackFrameEvent.GOTO_STACK_FRAME, stackFrame));
 		}
-		
 		]]></mx:Script>
 
 	<mx:Style>
@@ -196,7 +209,7 @@
 		<mx:columns>
 			<mx:DataGridColumn headerText="Stack Frame" dataField="name"
 				dataTipField="source" dataTipFunction="{nameDataTipFunction}" showDataTips="true"/>
-			<mx:DataGridColumn headerText="Line" dataField="line" width="50"/>
+			<mx:DataGridColumn headerText="Line" labelFunction="{lineLabelFunction}" width="50"/>
 		</mx:columns>
 	</mx:DataGrid>
 </mx:VBox>