MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

CIDR:Debugger: correctly escaping and displaying values and expressions

Browse Source
This commit is contained in:
Anton Makeev
2011-03-22 18:26:37 +01:00
parent 71903becc2
commit 45a110cacd
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+13 -5
View File
@@ -493,6 +493,15 @@ public class StringUtil {
@NotNull String str,
@Nullable String additionalChars,
@NotNull @NonNls StringBuilder buffer) {
return escapeStringCharacters(length, str, additionalChars, true, buffer);
}
@NotNull
public static StringBuilder escapeStringCharacters(int length,
@NotNull String str,
@Nullable String additionalChars,
boolean escapeSlash,
@NotNull @NonNls StringBuilder buffer) {
for (int idx = 0; idx < length; idx++) {
char ch = str.charAt(idx);
switch (ch) {
@@ -516,12 +525,11 @@ public class StringUtil {
buffer.append("\\r");
break;
case '\\':
buffer.append("\\\\");
break;
default:
if (additionalChars != null && additionalChars.indexOf(ch) > -1) {
if (escapeSlash && ch == '\\') {
buffer.append("\\\\");
}
else if (additionalChars != null && additionalChars.indexOf(ch) > -1) {
buffer.append("\\").append(ch);
}
else if (Character.isISOControl(ch)) {
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
+2 -3
View File
@@ -76,8 +76,7 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
}
public void setPresentation(@NonNls final String name, @Nullable final Icon icon, @NonNls @Nullable final String type, @NonNls @NotNull final String separator,
@NonNls @NotNull final String value,
final boolean hasChildren) {
@NonNls @NotNull final String value, final boolean hasChildren) {
DebuggerUIUtil.invokeOnEventDispatch(new Runnable() {
public void run() {
setIcon(icon);
@@ -116,7 +115,7 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
final StringBuilder builder = StringBuilderSpinAllocator.alloc();
String value;
try {
StringUtil.escapeStringCharacters(myValue.length(), myValue, null, builder);
StringUtil.escapeStringCharacters(myValue.length(), myValue, null, false, builder);
value = builder.toString();
}
finally {