aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzzhongwei2012-12-26 08:51:07 (EST)
committerzzhongwei2012-12-26 08:51:07 (EST)
commit77b171aae7536e6b381f88d2f71296ef438a25b2 (patch)
tree820564d5cdc762647fa274b4b922d5d2d93038cc
parentab55401927fb903e8c1d298ff3fc385901c6079e (diff)
downloadorg.eclipse.pdt-77b171aae7536e6b381f88d2f71296ef438a25b2.zip
org.eclipse.pdt-77b171aae7536e6b381f88d2f71296ef438a25b2.tar.gz
org.eclipse.pdt-77b171aae7536e6b381f88d2f71296ef438a25b2.tar.bz2
397161: all the paths are doubled when using xdebug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=397161
-rw-r--r--plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpStackFrame.java2
-rw-r--r--plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/presentation/XDebugModelPresentation.java9
2 files changed, 6 insertions, 5 deletions
diff --git a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpStackFrame.java b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpStackFrame.java
index 3c580e2..dbdb5a3 100644
--- a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpStackFrame.java
+++ b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpStackFrame.java
@@ -71,7 +71,7 @@ public class DBGpStackFrame extends DBGpElement implements IStackFrame {
// fileName = null;
fileName = qualifiedFile;
}
- name = fileName + "." + function + " : lineno " + lineNo;
+ name = fileName + "." + function + "() : lineno " + lineNo;
}
/*
diff --git a/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/presentation/XDebugModelPresentation.java b/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/presentation/XDebugModelPresentation.java
index 78ad736..aeee975 100644
--- a/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/presentation/XDebugModelPresentation.java
+++ b/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/presentation/XDebugModelPresentation.java
@@ -41,11 +41,12 @@ public class XDebugModelPresentation extends PHPModelPresentation implements
String frameName = frame.getName();
if (frameName != null && frameName.length() > 0) {
buffer.append(frame.getName());
- buffer.append("() "); //$NON-NLS-1$
+ // buffer.append("() "); //$NON-NLS-1$
+ } else {
+ buffer.append(((DBGpStackFrame) frame).getSourceName());
+ buffer.append(PHPDebugUIMessages.MPresentation_ATLine_1
+ + (frame.getLineNumber()));
}
- buffer.append(((DBGpStackFrame) frame).getSourceName());
- buffer.append(PHPDebugUIMessages.MPresentation_ATLine_1
- + (frame.getLineNumber()));
return buffer.toString();
} catch (DebugException e) {