Skip to content

Commit

Permalink
solve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dudikeleti committed May 29, 2024
1 parent e9998c0 commit 28f8595
Show file tree
Hide file tree
Showing 48 changed files with 401 additions and 303 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ private MethodScopeMembers CreateScopeMembers()
scope.AddMember(new ScopeMember("NestedObjectLocal", TestObject.Nested.GetType(), TestObject.Nested, ScopeMemberKind.Local));
scope.AddMember(new ScopeMember("NullLocal", TestObject.Nested.GetType(), TestObject.Null, ScopeMemberKind.Local));
scope.AddMember(new ScopeMember("BooleanValue", TestObject.BooleanValue.GetType(), TestObject.BooleanValue, ScopeMemberKind.Local));
scope.AddMember(new ScopeMember("NullableNotNullValueLocal", typeof(Guid?), TestObject.NullableNotNullValue, ScopeMemberKind.Local));
scope.AddMember(new ScopeMember("NullableNotNullValueLocal", typeof(Guid?), TestObject.NullableNotNullValue, ScopeMemberKind.Local));
scope.AddMember(new ScopeMember("NullableNullValueLocal", typeof(Guid?), TestObject.NullableNullValue, ScopeMemberKind.Local));

// Add arguments
Expand Down Expand Up @@ -334,8 +334,8 @@ internal struct TestStruct
public NestedObject ParentAsChildNested;

public NestedObject Null;
public bool BooleanValue;

public bool BooleanValue;

public Guid? NullableNullValue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@ Expressions:
var DictionaryLocal = (Dictionary<string, string>)scopeMemberArray[4].Value;
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[7].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var IntArg = (int)scopeMemberArray[9].Value;
var DoubleArg = (double)scopeMemberArray[10].Value;
var StringArg = (string)scopeMemberArray[11].Value;
var CollectionArg = (List<string>)scopeMemberArray[12].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[13].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = (this.NullableNullValue == null)
? "null"
: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@ Expressions:
var DictionaryLocal = (Dictionary<string, string>)scopeMemberArray[4].Value;
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[7].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var IntArg = (int)scopeMemberArray[9].Value;
var DoubleArg = (double)scopeMemberArray[10].Value;
var StringArg = (string)scopeMemberArray[11].Value;
var CollectionArg = (List<string>)scopeMemberArray[12].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[13].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = (this.NullableNotNullValue == null)
? "null"
: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ Expressions:
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;

return "UndefinedValue";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ Expressions:
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;

return "UndefinedValue";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Expressions:
{
string loopItem;
IEnumerator<string> enumerator;
int index;
StringBuilder itemValues;
var this = (DebuggerExpressionLanguageTests.TestStruct)scopeMember.Value;
var @return = (string)scopeMember.Value;
var @duration = (TimeSpan)scopeMember.Value;
Expand All @@ -26,53 +28,56 @@ Expressions:
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var $dd_el_result =
{
enumerator = this.Collection.GetEnumerator();
var index = 0;
var itemValues = new StringBuilder();
itemValues.Append("[");
while (true)
{
if (enumerator.MoveNext())
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = (this.Collection == null)
? "null"
: {
enumerator = this.Collection.GetEnumerator();
index = 0;
itemValues = new StringBuilder();
itemValues.Append("[");
while (true)
{
string loopItem;

if (index < 3)
if (enumerator.MoveNext())
{
if (index > 0)
string loopItem;

if (index < 3)
{
return itemValues.Append(", ");
}
if (index > 0)
{
return itemValues.Append(", ");
}

loopItem = enumerator.Current;
itemValues.Append(ProbeExpressionParser<string>.DumpObject(
loopItem,
typeof(string),
"",
1));
index++;
loopItem = enumerator.Current;
itemValues.Append(ProbeExpressionParser<string>.DumpObject(
loopItem,
typeof(string),
"",
1));
index++;
}
else
{
itemValues.Append(", ...");
break;
}
}
else
{
itemValues.Append(", ...");
break;
}
}
else
{
break;
}
}
itemValues.Append("]");
itemValues.Append("]");

return itemValues.ToString();
};
return itemValues.ToString();
};

return $dd_el_result;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ Expressions:
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = CollectionLocal.Count.ToString();

return $dd_el_result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ Expressions:
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = (string)CollectionLocal[0];

return $dd_el_result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ Expressions:
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = (string)CollectionLocal[100];

return $dd_el_result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ Expressions:
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = (string)DictionaryLocal["hello"];

return $dd_el_result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ Expressions:
var DictionaryLocal = (Dictionary<string, string>)scopeMemberArray[4].Value;
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[7].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var IntArg = (int)scopeMemberArray[9].Value;
var DoubleArg = (double)scopeMemberArray[10].Value;
var StringArg = (string)scopeMemberArray[11].Value;
var CollectionArg = (List<string>)scopeMemberArray[12].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[13].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = (string)DictionaryLocal["not exist"];

return $dd_el_result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ Expressions:
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = @duration.ToString();

return $dd_el_result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ Expression: (
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = !BooleanValue;

return $dd_el_result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ Expression: (
var NestedObjectLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[5].Value;
var NullLocal = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[6].Value;
var BooleanValue = (bool)scopeMemberArray[7].Value;
var IntArg = (int)scopeMemberArray[8].Value;
var DoubleArg = (double)scopeMemberArray[9].Value;
var StringArg = (string)scopeMemberArray[10].Value;
var CollectionArg = (List<string>)scopeMemberArray[11].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[12].Value;
var NullableNotNullValueLocal = (Guid?)scopeMemberArray[8].Value;
var NullableNullValueLocal = (Guid?)scopeMemberArray[9].Value;
var IntArg = (int)scopeMemberArray[10].Value;
var DoubleArg = (double)scopeMemberArray[11].Value;
var StringArg = (string)scopeMemberArray[12].Value;
var CollectionArg = (List<string>)scopeMemberArray[13].Value;
var NestedObjectArg = (DebuggerExpressionLanguageTests.TestStruct.NestedObject)scopeMemberArray[14].Value;
var $dd_el_result = StringLocal == null;

return $dd_el_result;
Expand Down
Loading

0 comments on commit 28f8595

Please sign in to comment.