Looking up the stack frame's associated source file from source containers directly to improve searching perf and bugs

com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ISourceLookUpProvider.java

@@ -18,6 +18,15 @@ public interface ISourceLookUpProvider extends IProvider {
 
     String[] getFullyQualifiedName(String uri, int[] lines, int[] columns) throws DebugException;
 
+    /**
+     * Given a fully qualified class name and source file path, search the associated disk source file.
+     *
+     * @param fullyQualifiedName
+     *                  the fully qualified class name (e.g. com.microsoft.java.debug.core.adapter.ISourceLookUpProvider).
+     * @param sourcePath
+     *                  the qualified source file path (e.g. com\microsoft\java\debug\core\adapter\ISourceLookupProvider.java).
+     * @return the associated source file uri.
+     */
     String getSourceFileURI(String fullyQualifiedName, String sourcePath);
 
     String getSourceContents(String uri);

com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java

@@ -11,6 +11,7 @@
 
 package com.microsoft.java.debug.core.adapter.handler;
 
+import java.io.File;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -123,7 +124,7 @@ private Types.Source convertDebuggerSourceToClient(Location location, IDebugAdap
         } catch (AbsentInformationException e) {
             String enclosingType = AdapterUtils.parseEnclosingType(fullyQualifiedName);
             sourceName = enclosingType.substring(enclosingType.lastIndexOf('.') + 1) + ".java";
-            relativeSourcePath = enclosingType.replace('.', '/') + ".java";
+            relativeSourcePath = enclosingType.replace('.', File.separatorChar) + ".java";
         }
 
         final String finalRelativeSourcePath = relativeSourcePath;

com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtSourceLookUpProvider.java

@@ -20,31 +20,22 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.eclipse.core.resources.IResource;
+import org.eclipse.debug.core.sourcelookup.ISourceContainer;
 import org.eclipse.jdt.core.IBuffer;
 import org.eclipse.jdt.core.IClassFile;
 import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.ITypeRoot;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.dom.AST;
 import org.eclipse.jdt.core.dom.ASTParser;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.core.search.SearchParticipant;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.SearchRequestor;
 import org.eclipse.jdt.internal.debug.core.breakpoints.ValidBreakpointLocationLocator;
 
 import com.microsoft.java.debug.core.Configuration;
@@ -58,6 +49,7 @@ public class JdtSourceLookUpProvider implements ISourceLookUpProvider {
     private static final Logger logger = Logger.getLogger(Configuration.LOGGER_NAME);
     private static final String JDT_SCHEME = "jdt";
     private static final String PATH_SEPARATOR = "/";
+    private ISourceContainer[] sourceContainers = null;
 
     private HashMap<String, Object> options = new HashMap<String, Object>();
 
@@ -67,6 +59,10 @@ public void initialize(IDebugSession debugSession, Map<String, Object> props) {
             throw new IllegalArgumentException("argument is null");
         }
         options.putAll(props);
+        // During initialization, trigger a background job to load the source containers to improve the perf.
+        new Thread(() -> {
+            getSourceContainers();
+        }).start();
     }
 
     @Override
@@ -164,17 +160,32 @@ public String[] getFullyQualifiedName(String uri, int[] lines, int[] columns) th
 
     @Override
     public String getSourceFileURI(String fullyQualifiedName, String sourcePath) {
-        if (fullyQualifiedName == null) {
-            throw new IllegalArgumentException("fullyQualifiedName is null");
+        if (sourcePath == null) {
+            return null;
         }
-        // Jdt Search Engine doesn't support searching anonymous class or local type directly.
-        // But because the inner class and anonymous class have the same java file as the enclosing type,
-        // search their enclosing type instead.
-        if (fullyQualifiedName.indexOf("$") >= 0) {
-            return searchDeclarationFileByFqn(AdapterUtils.parseEnclosingType(fullyQualifiedName));
-        } else {
-            return searchDeclarationFileByFqn(fullyQualifiedName);
+
+        Object sourceElement = JdtUtils.findSourceElement(sourcePath, getSourceContainers());
+        if (sourceElement instanceof IResource) {
+            return getFileURI((IResource) sourceElement);
+        } else if (sourceElement instanceof IClassFile) {
+            try {
+                IClassFile file = (IClassFile) sourceElement;
+                if (file.getBuffer() != null) {
+                    return getFileURI(file);
+                }
+            } catch (JavaModelException e) {
+                // do nothing.
+            }
+        }
+        return null;
+    }
+
+    private synchronized ISourceContainer[] getSourceContainers() {
+        if (sourceContainers == null) {
+            sourceContainers = JdtUtils.getSourceContainers((String) options.get(Constants.PROJECTNAME));
         }
+
+        return sourceContainers;
     }
 
     @Override
@@ -204,50 +215,6 @@ private String getContents(IClassFile cf) {
         return source;
     }
 
-    private String searchDeclarationFileByFqn(String fullyQualifiedName) {
-        String projectName = (String) options.get(Constants.PROJECTNAME);
-        IJavaProject project = JdtUtils.getJavaProject(projectName);
-        IJavaSearchScope searchScope = createSearchScope(project);
-        SearchPattern pattern = SearchPattern.createPattern(
-                fullyQualifiedName,
-                IJavaSearchConstants.TYPE,
-                IJavaSearchConstants.DECLARATIONS,
-                SearchPattern.R_EXACT_MATCH);
-
-        ArrayList<String> uris = new ArrayList<String>();
-
-        SearchRequestor requestor = new SearchRequestor() {
-            @Override
-            public void acceptSearchMatch(SearchMatch match) {
-                Object element = match.getElement();
-                if (element instanceof IType) {
-                    IType type = (IType) element;
-                    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()));
-                    }
-                }
-            }
-        };
-        SearchEngine searchEngine = new SearchEngine();
-        try {
-            searchEngine.search(pattern, new SearchParticipant[] {
-                    SearchEngine.getDefaultSearchParticipant()
-                }, searchScope, requestor, null /* progress monitor */);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, String.format("Search engine failed: %s", e.toString()), e);
-        }
-        return uris.size() == 0 ? null : uris.get(0);
-    }
-
     private static String getFileURI(IClassFile classFile) {
         String packageName = classFile.getParent().getElementName();
         String jarName = classFile.getParent().getParent().getElementName();
@@ -288,14 +255,6 @@ private static IClassFile resolveClassFile(String uriString) {
         return null;
     }
 
-    private static IJavaSearchScope createSearchScope(IJavaProject project) {
-        if (project == null) {
-            return SearchEngine.createWorkspaceScope();
-        }
-        return SearchEngine.createJavaSearchScope(new IJavaProject[] {project},
-                IJavaSearchScope.SOURCES | IJavaSearchScope.APPLICATION_LIBRARIES | IJavaSearchScope.SYSTEM_LIBRARIES);
-    }
-
     private static String readFile(String filePath, Charset cs) {
         StringBuilder builder = new StringBuilder();
         try (BufferedReader bufferReader =
@@ -314,4 +273,5 @@ private static String readFile(String filePath, Charset cs) {
         }
         return builder.toString();
     }
+
 }