Skip to content

Commit 61a12a0

Browse files
VISTALLVISTALL
committed
fix debugger
1 parent 08c8054 commit 61a12a0

2 files changed

Lines changed: 113 additions & 129 deletions

File tree

‎dotnet-debugger-impl/src/main/java/consulo/dotnet/debugger/impl/breakpoint/DotNetBreakpointEngine.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import consulo.language.psi.PsiElement;
3939
import consulo.language.psi.PsiFile;
4040
import consulo.language.psi.PsiManager;
41+
import consulo.localize.LocalizeValue;
4142
import consulo.util.lang.ref.SimpleReference;
4243
import consulo.virtualFileSystem.VirtualFile;
4344
import consulo.virtualFileSystem.VirtualFileManager;
@@ -89,7 +90,7 @@ public void evaluated(@Nonnull XValue result) {
8990
}
9091

9192
@Override
92-
public void errorOccurred(@Nonnull String errorMessage) {
93+
public void errorOccurred(@Nonnull LocalizeValue errorMessage) {
9394
}
9495
}, XDebuggerUtil.getInstance().createPositionByElement(elementAt));
9596
return valueRef.get();

‎dotnet-debugger-impl/src/main/java/consulo/dotnet/debugger/impl/nodes/valueRender/DotNetValueTextRendererProxy.java‎

Lines changed: 111 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -18,139 +18,122 @@
1818

1919
import consulo.colorScheme.TextAttributesKey;
2020
import consulo.execution.debug.frame.presentation.XValuePresentation;
21-
21+
import consulo.localize.LocalizeValue;
2222
import jakarta.annotation.Nonnull;
2323
import jakarta.annotation.Nullable;
2424

2525
/**
2626
* @author VISTALL
2727
* @since 22-Oct-17
2828
*/
29-
public class DotNetValueTextRendererProxy implements XValuePresentation.XValueTextRenderer
30-
{
31-
enum Type
32-
{
33-
value,
34-
stringValue,
35-
numericValue,
36-
charValue,
37-
keywordValue,
38-
comment,
39-
specialSymbol,
40-
error
41-
}
42-
43-
private Type myType;
44-
private String myValue;
45-
46-
public void renderBack(@Nonnull XValuePresentation.XValueTextRenderer renderer)
47-
{
48-
// not rendered
49-
if(myType == null)
50-
{
51-
return;
52-
}
53-
54-
switch(myType)
55-
{
56-
case value:
57-
renderer.renderValue(myValue);
58-
break;
59-
case stringValue:
60-
renderer.renderStringValue(myValue);
61-
break;
62-
case numericValue:
63-
renderer.renderNumericValue(myValue);
64-
break;
65-
case charValue:
66-
renderer.renderCharValue(myValue);
67-
break;
68-
case keywordValue:
69-
renderer.renderKeywordValue(myValue);
70-
break;
71-
case comment:
72-
renderer.renderComment(myValue);
73-
break;
74-
case specialSymbol:
75-
renderer.renderSpecialSymbol(myValue);
76-
break;
77-
case error:
78-
renderer.renderError(myValue);
79-
break;
80-
}
81-
}
82-
83-
private void set(Type type, String value)
84-
{
85-
assert myValue == null;
86-
87-
myType = type;
88-
myValue = value;
89-
}
90-
91-
@Override
92-
public void renderValue(@Nonnull String value)
93-
{
94-
set(Type.value, value);
95-
}
96-
97-
@Override
98-
public void renderStringValue(@Nonnull String value)
99-
{
100-
set(Type.stringValue, value);
101-
}
102-
103-
@Override
104-
public void renderNumericValue(@Nonnull String value)
105-
{
106-
set(Type.numericValue, value);
107-
}
108-
109-
@Override
110-
public void renderCharValue(@Nonnull String value)
111-
{
112-
set(Type.charValue, value);
113-
}
114-
115-
@Override
116-
public void renderKeywordValue(@Nonnull String value)
117-
{
118-
set(Type.keywordValue, value);
119-
}
120-
121-
@Override
122-
public void renderValue(@Nonnull String value, @Nonnull TextAttributesKey key)
123-
{
124-
throw new UnsupportedOperationException();
125-
}
126-
127-
@Override
128-
public void renderStringValue(@Nonnull String value, @Nullable String additionalSpecialCharsToHighlight, int maxLength)
129-
{
130-
throw new UnsupportedOperationException();
131-
}
132-
133-
@Override
134-
public void renderStringValue(@Nonnull String value, @Nullable String additionalSpecialCharsToHighlight, char quoteChar, int maxLength)
135-
{
136-
throw new UnsupportedOperationException();
137-
}
138-
139-
@Override
140-
public void renderComment(@Nonnull String comment)
141-
{
142-
set(Type.comment, comment);
143-
}
144-
145-
@Override
146-
public void renderSpecialSymbol(@Nonnull String symbol)
147-
{
148-
set(Type.specialSymbol, symbol);
149-
}
150-
151-
@Override
152-
public void renderError(@Nonnull String error)
153-
{
154-
set(Type.error, error);
155-
}
29+
public class DotNetValueTextRendererProxy implements XValuePresentation.XValueTextRenderer {
30+
enum Type {
31+
value,
32+
stringValue,
33+
numericValue,
34+
charValue,
35+
keywordValue,
36+
comment,
37+
specialSymbol,
38+
error
39+
}
40+
41+
private Type myType;
42+
private Object myValue;
43+
44+
public void renderBack(@Nonnull XValuePresentation.XValueTextRenderer renderer) {
45+
// not rendered
46+
if (myType == null) {
47+
return;
48+
}
49+
50+
switch (myType) {
51+
case value:
52+
renderer.renderValue((String) myValue);
53+
break;
54+
case stringValue:
55+
renderer.renderStringValue((String) myValue);
56+
break;
57+
case numericValue:
58+
renderer.renderNumericValue((String) myValue);
59+
break;
60+
case charValue:
61+
renderer.renderCharValue((String) myValue);
62+
break;
63+
case keywordValue:
64+
renderer.renderKeywordValue((String) myValue);
65+
break;
66+
case comment:
67+
renderer.renderComment((String) myValue);
68+
break;
69+
case specialSymbol:
70+
renderer.renderSpecialSymbol((String) myValue);
71+
break;
72+
case error:
73+
renderer.renderError((LocalizeValue) myValue);
74+
break;
75+
}
76+
}
77+
78+
private void set(Type type, Object value) {
79+
assert myValue == null;
80+
81+
myType = type;
82+
myValue = value;
83+
}
84+
85+
@Override
86+
public void renderValue(@Nonnull String value) {
87+
set(Type.value, value);
88+
}
89+
90+
@Override
91+
public void renderStringValue(@Nonnull String value) {
92+
set(Type.stringValue, value);
93+
}
94+
95+
@Override
96+
public void renderNumericValue(@Nonnull String value) {
97+
set(Type.numericValue, value);
98+
}
99+
100+
@Override
101+
public void renderCharValue(@Nonnull String value) {
102+
set(Type.charValue, value);
103+
}
104+
105+
@Override
106+
public void renderKeywordValue(@Nonnull String value) {
107+
set(Type.keywordValue, value);
108+
}
109+
110+
@Override
111+
public void renderValue(@Nonnull String value, @Nonnull TextAttributesKey key) {
112+
throw new UnsupportedOperationException();
113+
}
114+
115+
@Override
116+
public void renderStringValue(@Nonnull String value, @Nullable String additionalSpecialCharsToHighlight, int maxLength) {
117+
throw new UnsupportedOperationException();
118+
}
119+
120+
@Override
121+
public void renderStringValue(@Nonnull String value, @Nullable String additionalSpecialCharsToHighlight, char quoteChar, int maxLength) {
122+
throw new UnsupportedOperationException();
123+
}
124+
125+
@Override
126+
public void renderComment(@Nonnull String comment) {
127+
set(Type.comment, comment);
128+
}
129+
130+
@Override
131+
public void renderSpecialSymbol(@Nonnull String symbol) {
132+
set(Type.specialSymbol, symbol);
133+
}
134+
135+
@Override
136+
public void renderError(@Nonnull LocalizeValue error) {
137+
set(Type.error, error);
138+
}
156139
}

0 commit comments

Comments
 (0)