diff options
author | Tor Norbye <tnorbye@google.com> | 2013-06-21 16:58:30 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2013-06-21 16:58:30 -0700 |
commit | c6218e46d5d2017e987ecdbd99b318a95c42abc0 (patch) | |
tree | 85106b3c757a794fb274159cebe07c8d979740a5 /java/debugger | |
parent | 0e154c74931b6ff5ad6e0ec512b32e30df3cb068 (diff) | |
download | idea-c6218e46d5d2017e987ecdbd99b318a95c42abc0.tar.gz |
Snapshot d8891a7de15cebb78b6ce5711e50e531b42c0baf from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: Ida9d1b0a2341112b9ebcf67bf560c8f62f0afdc6
Diffstat (limited to 'java/debugger')
-rw-r--r-- | java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java | 50 | ||||
-rw-r--r-- | java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java | 2 |
2 files changed, 7 insertions, 45 deletions
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java index 9ca1bd12f697..76f1b7982319 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java @@ -36,7 +36,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; @@ -45,16 +44,12 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.java.stubs.index.JavaFullClassNameIndex; import com.intellij.psi.jsp.JspFile; -import com.intellij.psi.search.EverythingGlobalScope; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.ui.classFilter.ClassFilter; -import com.intellij.util.Function; import com.intellij.util.Processor; import com.intellij.util.StringBuilderSpinAllocator; -import com.intellij.util.containers.ContainerUtil; import com.intellij.xdebugger.XDebuggerUtil; import com.sun.jdi.*; import com.sun.jdi.event.LocatableEvent; @@ -208,37 +203,6 @@ public class LineBreakpoint extends BreakpointWithHighlighter { return true; } } - if (LOG.isDebugEnabled()) { - final GlobalSearchScope scope = debugProcess.getSearchScope(); - final boolean contains = scope.contains(breakpointFile); - final Project project = getProject(); - final List<VirtualFile> files = ContainerUtil.map( - JavaFullClassNameIndex.getInstance().get(className.hashCode(), project, scope), new Function<PsiClass, VirtualFile>() { - @Override - public VirtualFile fun(PsiClass aClass) { - return aClass.getContainingFile().getVirtualFile(); - } - }); - final List<VirtualFile> allFiles = ContainerUtil.map( - JavaFullClassNameIndex.getInstance().get(className.hashCode(), project, new EverythingGlobalScope(project)), new Function<PsiClass, VirtualFile>() { - @Override - public VirtualFile fun(PsiClass aClass) { - return aClass.getContainingFile().getVirtualFile(); - } - }); - final VirtualFile contentRoot = fileIndex.getContentRootForFile(breakpointFile); - final Module module = fileIndex.getModuleForFile(breakpointFile); - - LOG.debug("Did not find '" + - className + "' in " + scope + - "; contains=" + contains + - "; contentRoot=" + contentRoot + - "; module = " + module + - "; all files in index are: " + files+ - "; all possible files are: " + allFiles - ); - } - return false; } } @@ -254,7 +218,7 @@ public class LineBreakpoint extends BreakpointWithHighlighter { public Collection<VirtualFile> compute() { final PsiClass[] classes = JavaPsiFacade.getInstance(myProject).findClasses(topLevelClassName, scope); if (LOG.isDebugEnabled()) { - LOG.debug("Found "+ classes.length + " classes " + topLevelClassName + " in scope "+scope); + LOG.debug("Found "+ classes.length + " classes " + topLevelClassName + " in scope"); } if (classes.length == 0) { return null; @@ -277,14 +241,12 @@ public class LineBreakpoint extends BreakpointWithHighlighter { LOG.debug(msg.toString()); } - if (psiFile == null) { - return null; - } - final VirtualFile vFile = psiFile.getVirtualFile(); - if (vFile == null || !fileIndex.isInSourceContent(vFile)) { - return null; // this will switch off the check if at least one class is from libraries + if (psiFile != null) { + final VirtualFile vFile = psiFile.getVirtualFile(); + if (vFile != null && fileIndex.isInSourceContent(vFile)) { + list.add(vFile); + } } - list.add(vFile); } return list; } diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java index 9fcc7d7a7d8d..1dc06107b090 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java @@ -130,7 +130,7 @@ public abstract class DebuggerUtils { } } - public static final int MAX_DISPLAY_LABEL_LENGTH = 1024 * 5; + public static final int MAX_DISPLAY_LABEL_LENGTH = 1024/*kb*/ *1024 /*bytes*/ / 2; // 1 Mb string public static String convertToPresentationString(String str) { if (str.length() > MAX_DISPLAY_LABEL_LENGTH) { |