Show grey Unknown Source node in call stack ui view for stackframe without attached source (microsoft#29)

testforstephen · web-flow · commit b4bb19034ceb · 2017-09-19T16:37:04.000+08:00
Signed-off-by: Jinbo Wang &lt;jinbwan@microsoft.com&gt;
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java
@@ -123,7 +123,11 @@ private Types.Source convertDebuggerSourceToClient(Location location, IDebugAdap
         } else {
             // If the source lookup engine cannot find the source file, then lookup it in the source directories specified by user.
             String absoluteSourcepath = AdapterUtils.sourceLookup(context.getSourcePaths(), relativeSourcePath);
-            return new Types.Source(sourceName, absoluteSourcepath, 0);
+            if (absoluteSourcepath != null) {
+                return new Types.Source(sourceName, absoluteSourcepath, 0);
+            } else {
+                return null;
+            }
         }
     }
 }
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtSourceLookUpProvider.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtSourceLookUpProvider.java
@@ -227,7 +227,18 @@ public void acceptSearchMatch(SearchMatch match) {
                     Object element = match.getElement();
                     if (element instanceof IType) {
                         IType type = (IType) element;
-                        uris.add(type.isBinary() ? getFileURI(type.getClassFile()) : getFileURI(type.getResource()));
+                        if (type.isBinary()) {
+                            try {
+                                // let the search engine to ignore those class files without attached source.
+                                if (type.getSource() != null) {
+                                    uris.add(getFileURI(type.getClassFile()));
+                                }
+                            } catch (JavaModelException e) {
+                                // ignore
+                            }
+                        } else {
+                            uris.add(getFileURI(type.getResource()));
+                        }
                     }
                 }
             };

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,11 @@ private Types.Source convertDebuggerSourceToClient(Location location, IDebugAdap`
`123`	`123`	`} else {`
`124`	`124`	`// If the source lookup engine cannot find the source file, then lookup it in the source directories specified by user.`
`125`	`125`	`String absoluteSourcepath = AdapterUtils.sourceLookup(context.getSourcePaths(), relativeSourcePath);`
`126`		`- return new Types.Source(sourceName, absoluteSourcepath, 0);`
	`126`	`+ if (absoluteSourcepath != null) {`
	`127`	`+ return new Types.Source(sourceName, absoluteSourcepath, 0);`
	`128`	`+ } else {`
	`129`	`+ return null;`
	`130`	`+ }`
`127`	`131`	`}`
`128`	`132`	`}`
`129`	`133`	`}`