conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
sink.TopLevelDeclarations.Add(new Bpl.Axiom(ctor.tok, q, "Inductive seq rank"));
=======
sink.TopLevelDeclarations.Add(new Bpl.Axiom(ctor.tok, q));
>>>>>>>
sink.TopLevelDeclarations.Add(new Bpl.Axiom(ctor.tok, q, "Inductive seq rank"));
<<<<<<<
=======
// Add:
// function $IsA#Dt(d: DatatypeType): bool {
// Dt.Ctor0?(d) || Dt.Ctor1?(d) || ...
// }
var cases_dBv = new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, "d", predef.DatatypeType), true);
var cases_resType = new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
var cases_fn = new Bpl.Function(dt.tok, "$IsA#" + dt.FullSanitizedName, new List<Variable> { cases_dBv }, cases_resType);
if (InsertChecksums)
{
InsertChecksum(dt, cases_fn);
}
sink.TopLevelDeclarations.Add(cases_fn);
// and here comes the actual axiom:
>>>>>>>
<<<<<<<
Bpl.Expr ly; var lyVar = BplBoundVar("ly", predef.LayerType, out ly); vars.Add(lyVar);
Bpl.Expr d0; var d0Var = BplBoundVar("d0", predef.DatatypeType, out d0); vars.Add(d0Var);
Bpl.Expr d1; var d1Var = BplBoundVar("d1", predef.DatatypeType, out d1); vars.Add(d1Var);
=======
sink.TopLevelDeclarations.Add(fn);
}
// axiom (forall d0, d1: DatatypeType :: { $Eq#Dt(d0, d1) } $Eq#Dt(d0, d1) <==>
// (d0.Nil? ==> d1.Nil?) &&
// (d0.Cons? ==> d1.Cons? && d0.head == d1.head && $Eq#0#Dt(k-1, d0.tail, d1.tail));
{
var d0Var = new Bpl.BoundVariable(dt.tok, new Bpl.TypedIdent(dt.tok, "d0", predef.DatatypeType));
var d0 = new Bpl.IdentifierExpr(dt.tok, d0Var);
var d1Var = new Bpl.BoundVariable(dt.tok, new Bpl.TypedIdent(dt.tok, "d1", predef.DatatypeType));
var d1 = new Bpl.IdentifierExpr(dt.tok, d1Var);
var eqDt = FunctionCall(dt.tok, "$Eq#" + dt.FullSanitizedName, Bpl.Type.Bool, d0, d1);
var body = Bpl.Expr.Iff(eqDt, BplAnd(CoPrefixEquality(dt.tok, codecl, d0, d1, null, 0)));
var tr = new Bpl.Trigger(dt.tok, true, new List<Bpl.Expr> { eqDt });
var ax = new Bpl.ForallExpr(dt.tok, new List<Variable> { d0Var, d1Var }, tr, body);
sink.TopLevelDeclarations.Add(new Bpl.Axiom(dt.tok, ax));
}
// axiom (forall d0, d1: DatatypeType :: { $Eq#2#Dt(d0, d1) } $Eq#2#Dt(d0, d1) <==>
// (d0.Nil? ==> d1.Nil?) &&
// (d0.Cons? ==> d1.Cons? && d0.head == d1.head && $Eq#Dt(k-1, d0.tail, d1.tail));
{
var d0Var = new Bpl.BoundVariable(dt.tok, new Bpl.TypedIdent(dt.tok, "d0", predef.DatatypeType));
var d0 = new Bpl.IdentifierExpr(dt.tok, d0Var);
var d1Var = new Bpl.BoundVariable(dt.tok, new Bpl.TypedIdent(dt.tok, "d1", predef.DatatypeType));
var d1 = new Bpl.IdentifierExpr(dt.tok, d1Var);
var eqDt = FunctionCall(dt.tok, "$Eq#2#" + dt.FullSanitizedName, Bpl.Type.Bool, d0, d1);
var body = Bpl.Expr.Iff(eqDt, BplAnd(CoPrefixEquality(dt.tok, codecl, d0, d1, null, 1)));
var tr = new Bpl.Trigger(dt.tok, true, new List<Bpl.Expr> { eqDt });
var ax = new Bpl.ForallExpr(dt.tok, new List<Variable> { d0Var, d1Var }, tr, body);
sink.TopLevelDeclarations.Add(new Bpl.Axiom(dt.tok, ax));
}
// Here is level 0 (aka limited):
// function $Eq#0#Dt(d0, d1: DatatypeType): bool
{
var d0Var = new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, "d0", predef.DatatypeType), true);
var d1Var = new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, "d1", predef.DatatypeType), true);
var resType = new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
var fn = new Bpl.Function(dt.tok, "$Eq#0#" + dt.FullSanitizedName, new List<Variable> { d0Var, d1Var }, resType,
"equality (limited version) for codatatype " + dt.FullName);
>>>>>>>
Bpl.Expr ly; var lyVar = BplBoundVar("ly", predef.LayerType, out ly); vars.Add(lyVar);
Bpl.Expr d0; var d0Var = BplBoundVar("d0", predef.DatatypeType, out d0); vars.Add(d0Var);
Bpl.Expr d1; var d1Var = BplBoundVar("d1", predef.DatatypeType, out d1); vars.Add(d1Var);
<<<<<<<
Bpl.StmtList stmts;
=======
Bpl.StmtList stmts;
>>>>>>>
Bpl.StmtList stmts;
<<<<<<<
var g = prevEtran.TrExpr(rhs);
GetObjFieldDetails(s0.Lhs.Resolved, prevEtran, out xObj, out xField);
var xHeapOF = ReadHeap(s.Tok, etran.HeapExpr, xObj, xField);
Type lhsType;
if (lhs is FieldSelectExpr) {
lhsType = ((FieldSelectExpr)lhs).Type;
} else {
lhsType = null;
=======
bool usedInversion = false;
if (Fi != null) {
var j = new BoundVar(i.tok, i.Name + "#inv", Fi.Type);
var jj = Expression.CreateIdentExpr(j);
var jList = new List<BoundVar>() { j };
var vals = InvertExpression(i, j, s.Range, Fi);
#if DEBUG_PRINT
Console.WriteLine("DEBUG: Trying to invert:");
Console.WriteLine("DEBUG: " + Printer.ExprToString(s.Range) + " && " + j.Name + " == " + Printer.ExprToString(Fi));
if (vals == null) {
Console.WriteLine("DEBUG: Can't");
} else {
Console.WriteLine("DEBUG: The inverse is the disjunction of the following:");
foreach (var val in vals) {
Console.WriteLine("DEBUG: " + Printer.ExprToString(val.Range) + " && " + Printer.ExprToString(val.FInverse) + " == " + i.Name);
}
}
#endif
if (vals != null) {
foreach (var val in vals) {
qq = TrForall_NewValueAssumption(s.Tok, jList, val.Range, lhsBuilder(jj), Substitute(rhs, i, val.FInverse), true, etran, prevEtran);
updater.Add(new Bpl.AssumeCmd(s.Tok, qq));
}
usedInversion = true;
}
>>>>>>>
bool usedInversion = false;
if (Fi != null) {
var j = new BoundVar(i.tok, i.Name + "#inv", Fi.Type);
var jj = Expression.CreateIdentExpr(j);
var jList = new List<BoundVar>() { j };
var vals = InvertExpression(i, j, s.Range, Fi);
#if DEBUG_PRINT
Console.WriteLine("DEBUG: Trying to invert:");
Console.WriteLine("DEBUG: " + Printer.ExprToString(s.Range) + " && " + j.Name + " == " + Printer.ExprToString(Fi));
if (vals == null) {
Console.WriteLine("DEBUG: Can't");
} else {
Console.WriteLine("DEBUG: The inverse is the disjunction of the following:");
foreach (var val in vals) {
Console.WriteLine("DEBUG: " + Printer.ExprToString(val.Range) + " && " + Printer.ExprToString(val.FInverse) + " == " + i.Name);
}
}
#endif
if (vals != null) {
foreach (var val in vals) {
qq = TrForall_NewValueAssumption(s.Tok, jList, val.Range, lhsBuilder(jj), Substitute(rhs, i, val.FInverse), true, etran, prevEtran);
updater.Add(new Bpl.AssumeCmd(s.Tok, qq));
}
usedInversion = true;
}
<<<<<<<
var e = GetLit(expr);
if (e == null) {
e = expr;
}
return e;
=======
return GetLit(expr) ?? expr;
>>>>>>>
return GetLit(expr) ?? expr; |
<<<<<<<
case "assume": t.kind = 33; break;
case "calc": t.kind = 34; break;
case "case": t.kind = 35; break;
case "then": t.kind = 36; break;
case "else": t.kind = 37; break;
case "as": t.kind = 38; break;
case "decreases": t.kind = 39; break;
case "invariant": t.kind = 40; break;
case "function": t.kind = 41; break;
case "predicate": t.kind = 42; break;
case "inductive": t.kind = 43; break;
case "lemma": t.kind = 44; break;
case "copredicate": t.kind = 45; break;
case "modifies": t.kind = 46; break;
case "reads": t.kind = 47; break;
case "requires": t.kind = 48; break;
case "include": t.kind = 63; break;
case "abstract": t.kind = 64; break;
case "ghost": t.kind = 65; break;
case "static": t.kind = 66; break;
case "protected": t.kind = 67; break;
case "extern": t.kind = 68; break;
case "module": t.kind = 69; break;
case "refines": t.kind = 70; break;
case "import": t.kind = 71; break;
case "opened": t.kind = 72; break;
case "export": t.kind = 74; break;
case "provides": t.kind = 75; break;
case "reveals": t.kind = 76; break;
case "extends": t.kind = 77; break;
case "class": t.kind = 78; break;
case "trait": t.kind = 79; break;
case "datatype": t.kind = 80; break;
case "codatatype": t.kind = 81; break;
case "var": t.kind = 82; break;
case "newtype": t.kind = 83; break;
case "type": t.kind = 84; break;
case "new": t.kind = 85; break;
case "iterator": t.kind = 86; break;
case "yields": t.kind = 87; break;
case "returns": t.kind = 88; break;
case "method": t.kind = 89; break;
case "colemma": t.kind = 90; break;
case "comethod": t.kind = 91; break;
case "twostate": t.kind = 92; break;
=======
case "assume": t.kind = 32; break;
case "calc": t.kind = 33; break;
case "case": t.kind = 34; break;
case "then": t.kind = 35; break;
case "else": t.kind = 36; break;
case "as": t.kind = 37; break;
case "decreases": t.kind = 38; break;
case "invariant": t.kind = 39; break;
case "function": t.kind = 40; break;
case "predicate": t.kind = 41; break;
case "inductive": t.kind = 42; break;
case "twostate": t.kind = 43; break;
case "lemma": t.kind = 44; break;
case "copredicate": t.kind = 45; break;
case "modifies": t.kind = 46; break;
case "reads": t.kind = 47; break;
case "requires": t.kind = 48; break;
case "include": t.kind = 63; break;
case "abstract": t.kind = 64; break;
case "ghost": t.kind = 65; break;
case "static": t.kind = 66; break;
case "protected": t.kind = 67; break;
case "extern": t.kind = 68; break;
case "module": t.kind = 69; break;
case "exclusively": t.kind = 70; break;
case "refines": t.kind = 71; break;
case "import": t.kind = 72; break;
case "opened": t.kind = 73; break;
case "default": t.kind = 75; break;
case "export": t.kind = 76; break;
case "extends": t.kind = 77; break;
case "class": t.kind = 79; break;
case "trait": t.kind = 80; break;
case "datatype": t.kind = 81; break;
case "codatatype": t.kind = 82; break;
case "var": t.kind = 83; break;
case "newtype": t.kind = 84; break;
case "type": t.kind = 85; break;
case "new": t.kind = 86; break;
case "iterator": t.kind = 87; break;
case "yields": t.kind = 88; break;
case "returns": t.kind = 89; break;
case "method": t.kind = 90; break;
case "colemma": t.kind = 91; break;
case "comethod": t.kind = 92; break;
>>>>>>>
case "assume": t.kind = 33; break;
case "calc": t.kind = 34; break;
case "case": t.kind = 35; break;
case "then": t.kind = 36; break;
case "else": t.kind = 37; break;
case "as": t.kind = 38; break;
case "decreases": t.kind = 39; break;
case "invariant": t.kind = 40; break;
case "function": t.kind = 41; break;
case "predicate": t.kind = 42; break;
case "inductive": t.kind = 43; break;
case "twostate": t.kind = 44; break;
case "lemma": t.kind = 45; break;
case "copredicate": t.kind = 46; break;
case "modifies": t.kind = 47; break;
case "reads": t.kind = 48; break;
case "requires": t.kind = 49; break;
case "include": t.kind = 64; break;
case "abstract": t.kind = 65; break;
case "ghost": t.kind = 66; break;
case "static": t.kind = 67; break;
case "protected": t.kind = 68; break;
case "extern": t.kind = 69; break;
case "module": t.kind = 70; break;
case "refines": t.kind = 71; break;
case "import": t.kind = 72; break;
case "opened": t.kind = 73; break;
case "export": t.kind = 75; break;
case "provides": t.kind = 76; break;
case "reveals": t.kind = 77; break;
case "extends": t.kind = 78; break;
case "class": t.kind = 79; break;
case "trait": t.kind = 80; break;
case "datatype": t.kind = 81; break;
case "codatatype": t.kind = 82; break;
case "var": t.kind = 83; break;
case "newtype": t.kind = 84; break;
case "type": t.kind = 85; break;
case "new": t.kind = 86; break;
case "iterator": t.kind = 87; break;
case "yields": t.kind = 88; break;
case "returns": t.kind = 89; break;
case "method": t.kind = 90; break;
case "colemma": t.kind = 91; break;
case "comethod": t.kind = 92; break;
<<<<<<<
t.kind = 61; break;}
=======
t.kind = 61; break;}
case 51:
{t.kind = 62; break;}
>>>>>>>
t.kind = 62; break;}
<<<<<<<
=======
case 75:
{t.kind = 78; break;}
>>>>>>>
<<<<<<<
recEnd = pos; recKind = 73;
if (ch == '>') {AddCh(); goto case 38;}
=======
recEnd = pos; recKind = 74;
if (ch == '>') {AddCh(); goto case 37;}
>>>>>>>
recEnd = pos; recKind = 74;
if (ch == '>') {AddCh(); goto case 38;}
<<<<<<<
recEnd = pos; recKind = 55;
if (ch == '=') {AddCh(); goto case 108;}
else {t.kind = 55; break;}
case 103:
recEnd = pos; recKind = 56;
if (ch == '=') {AddCh(); goto case 78;}
else {t.kind = 56; break;}
=======
recEnd = pos; recKind = 55;
if (ch == '=') {AddCh(); goto case 108;}
else {t.kind = 55; break;}
case 103:
recEnd = pos; recKind = 56;
if (ch == '=') {AddCh(); goto case 79;}
else {t.kind = 56; break;}
>>>>>>>
recEnd = pos; recKind = 56;
if (ch == '=') {AddCh(); goto case 108;}
else {t.kind = 56; break;}
case 103:
recEnd = pos; recKind = 57;
if (ch == '=') {AddCh(); goto case 78;}
else {t.kind = 57; break;}
<<<<<<<
recEnd = pos; recKind = 144;
if (ch == '.') {AddCh(); goto case 52;}
else {t.kind = 144; break;}
=======
recEnd = pos; recKind = 146;
if (ch == '.') {AddCh(); goto case 51;}
else {t.kind = 146; break;}
>>>>>>>
recEnd = pos; recKind = 146;
if (ch == '.') {AddCh(); goto case 52;}
else {t.kind = 146; break;}
<<<<<<<
recEnd = pos; recKind = 57;
if (ch == '>') {AddCh(); goto case 83;}
else {t.kind = 57; break;}
=======
recEnd = pos; recKind = 57;
if (ch == '>') {AddCh(); goto case 84;}
else {t.kind = 57; break;}
>>>>>>>
recEnd = pos; recKind = 58;
if (ch == '>') {AddCh(); goto case 83;}
else {t.kind = 58; break;} |
<<<<<<<
ResolveAttributes(f.Attributes, f, new ResolveOpts(f, false));
=======
ResolveAttributes(f.Attributes, new ResolveOpts(f, false));
// take care of the warnShadowing attribute
bool warnShadowingOption = DafnyOptions.O.WarnShadowing; // save the original warnShadowing value
bool warnShadowing = false;
if (Attributes.ContainsBool(f.Attributes, "warnShadowing", ref warnShadowing)) {
DafnyOptions.O.WarnShadowing = warnShadowing; // set the value according to the attribute
}
>>>>>>>
ResolveAttributes(f.Attributes, f, new ResolveOpts(f, false));
// take care of the warnShadowing attribute
bool warnShadowingOption = DafnyOptions.O.WarnShadowing; // save the original warnShadowing value
bool warnShadowing = false;
if (Attributes.ContainsBool(f.Attributes, "warnShadowing", ref warnShadowing)) {
DafnyOptions.O.WarnShadowing = warnShadowing; // set the value according to the attribute
} |
<<<<<<<
if (outParams.Count != 0) { // don't create an empty havoc statement
=======
if (outParams.Count != 0)
{ // don't create an empty havoc statement
>>>>>>>
if (outParams.Count != 0) { // don't create an empty havoc statement
{ // don't create an empty havoc statement
<<<<<<<
if (newLocals.Count != 0) {
=======
if (newLocals.Count != 0)
{
>>>>>>>
if (newLocals.Count != 0) {
{
<<<<<<<
if (newLocals.Count != 0) {
=======
if (newLocals.Count != 0)
{
>>>>>>>
if (newLocals.Count != 0) {
{
<<<<<<<
if (newLocals.Count != 0) {
=======
if (newLocals.Count != 0)
{
>>>>>>>
if (newLocals.Count != 0) {
{
<<<<<<<
if (bvs.Count != 0) {
=======
if (bvs.Count != 0)
{
>>>>>>>
if (bvs.Count != 0) {
{ |
<<<<<<<
[assembly: AssemblyFileVersion("1.1.20528.0")]
[assembly: AssemblyInformationalVersion("1.1.0-beta1-20528-000")]
[assembly: AssemblyMetadata("Servicing", "true")]
=======
[assembly: AssemblyFileVersion("1.1.20604.0")]
[assembly: AssemblyInformationalVersion("1.1.0-beta2-20604-000")]
>>>>>>>
[assembly: AssemblyFileVersion("1.1.20604.0")]
[assembly: AssemblyInformationalVersion("1.1.0-beta2-20604-000")]
[assembly: AssemblyMetadata("Servicing", "true")] |
<<<<<<<
protected override Task ApplyResponseChallenge()
=======
private bool IsHostRelative(string path)
{
if (string.IsNullOrEmpty(path))
{
return false;
}
if (path.Length == 1)
{
return path[0] == '/';
}
return path[0] == '/' && path[1] != '/' && path[1] != '\\';
}
protected override async Task ApplyResponseChallenge()
>>>>>>>
private bool IsHostRelative(string path)
{
if (string.IsNullOrEmpty(path))
{
return false;
}
if (path.Length == 1)
{
return path[0] == '/';
}
return path[0] == '/' && path[1] != '/' && path[1] != '\\';
}
protected override Task ApplyResponseChallenge() |
<<<<<<<
var dataProtecter = app.CreateDataProtector(
typeof(OAuthAuthorizationServerMiddleware).Namespace,
=======
var dataProtecter = app.CreateDataProtecter(
typeof(OAuthBearerAuthenticationMiddleware).Namespace,
>>>>>>>
var dataProtecter = app.CreateDataProtector(
typeof(OAuthBearerAuthenticationMiddleware).Namespace, |
<<<<<<<
[Fact]
public void TryRemoveIfLockIdMatch_NullLockId()
{
ProviderConfiguration pc = Utility.GetDefaultConfigUtility();
using (RedisServer redisServer = new RedisServer())
{
RedisConnectionWrapper redisConn = GetRedisConnectionWrapperWithUniqueSession();
// Inserting data into redis server
ChangeTrackingSessionStateItemCollection data = new ChangeTrackingSessionStateItemCollection(new RedisUtility(pc));
data["key"] = "value";
redisConn.Set(data, 900);
object lockId;
ISessionStateItemCollection dataFromRedis;
int sessionTimeout;
Assert.True(redisConn.TryCheckWriteLockAndGetData(out lockId, out dataFromRedis, out sessionTimeout));
Assert.Equal(null, lockId);
Assert.Equal(1, dataFromRedis.Count);
redisConn.TryRemoveAndReleaseLock(null);
// Get actual connection and get data from redis
IDatabase actualConnection = GetRealRedisConnection(redisConn);
Assert.False(actualConnection.KeyExists(redisConn.Keys.DataKey));
// check lock removed from redis
Assert.False(actualConnection.KeyExists(redisConn.Keys.LockKey));
DisposeRedisConnectionWrapper(redisConn);
}
}
[Fact]
public void TryUpdateIfLockIdMatch_LockIdNull()
{
ProviderConfiguration pc = Utility.GetDefaultConfigUtility();
using (RedisServer redisServer = new RedisServer())
{
RedisConnectionWrapper redisConn = GetRedisConnectionWrapperWithUniqueSession();
// Inserting data into redis server
ChangeTrackingSessionStateItemCollection data = new ChangeTrackingSessionStateItemCollection(new RedisUtility(pc));
data["key1"] = "value1";
redisConn.Set(data, 900);
DateTime lockTime = DateTime.Now;
object lockId;
ISessionStateItemCollection dataFromRedis;
int sessionTimeout;
Assert.True(redisConn.TryCheckWriteLockAndGetData(out lockId, out dataFromRedis, out sessionTimeout));
Assert.Equal(null, lockId);
Assert.Equal(1, dataFromRedis.Count);
// update session data without lock id (to support lock free session)
dataFromRedis["key1"] = "value1-updated";
redisConn.TryUpdateAndReleaseLock(null, dataFromRedis, 900);
// Get actual connection and get data from redis
IDatabase actualConnection = GetRealRedisConnection(redisConn);
HashEntry[] sessionDataFromRedis = actualConnection.HashGetAll(redisConn.Keys.DataKey);
Assert.Equal(1, sessionDataFromRedis.Length);
ChangeTrackingSessionStateItemCollection sessionDataFromRedisAsCollection = new ChangeTrackingSessionStateItemCollection(new RedisUtility(pc));
foreach (HashEntry entry in sessionDataFromRedis)
{
sessionDataFromRedisAsCollection[entry.Name] = RedisUtility.GetObjectFromBytes(entry.Value).ToString();
}
Assert.Equal("value1-updated", sessionDataFromRedisAsCollection["key1"]);
// check lock removed and remove data from redis
actualConnection.KeyDelete(redisConn.Keys.DataKey);
Assert.False(actualConnection.KeyExists(redisConn.Keys.LockKey));
DisposeRedisConnectionWrapper(redisConn);
}
}
[Fact]
public void TestingForceReconnect()
{
ProviderConfiguration pc = Utility.GetDefaultConfigUtility();
using (RedisServer redisServer = new RedisServer())
{
RedisSharedConnection.ReconnectFrequency = TimeSpan.FromMilliseconds(5);
RedisConnectionWrapper redisConn = GetRedisConnectionWrapperWithUniqueSession();
DateTimeOffset first_lastReconnectTime = RedisSharedConnection.lastReconnectTime;
// Inserting data into redis server
ChangeTrackingSessionStateItemCollection data = new ChangeTrackingSessionStateItemCollection(new RedisUtility(pc));
data["key"] = "value";
redisConn.Set(data, 900);
Assert.Equal(first_lastReconnectTime, RedisSharedConnection.lastReconnectTime);
System.Threading.Thread.Sleep(6);
//This should cause RedisConnectionException
redisServer.Restart();
redisConn.UpdateExpiryTime(900);
// This proves that force reconnect happened
Assert.NotEqual(first_lastReconnectTime, RedisSharedConnection.lastReconnectTime);
DisposeRedisConnectionWrapper(redisConn);
}
}
=======
>>>>>>>
[Fact]
public void TryRemoveIfLockIdMatch_NullLockId()
{
ProviderConfiguration pc = Utility.GetDefaultConfigUtility();
using (RedisServer redisServer = new RedisServer())
{
RedisConnectionWrapper redisConn = GetRedisConnectionWrapperWithUniqueSession();
// Inserting data into redis server
ChangeTrackingSessionStateItemCollection data = new ChangeTrackingSessionStateItemCollection(new RedisUtility(pc));
data["key"] = "value";
redisConn.Set(data, 900);
object lockId;
ISessionStateItemCollection dataFromRedis;
int sessionTimeout;
Assert.True(redisConn.TryCheckWriteLockAndGetData(out lockId, out dataFromRedis, out sessionTimeout));
Assert.Equal(null, lockId);
Assert.Equal(1, dataFromRedis.Count);
redisConn.TryRemoveAndReleaseLock(null);
// Get actual connection and get data from redis
IDatabase actualConnection = GetRealRedisConnection(redisConn);
Assert.False(actualConnection.KeyExists(redisConn.Keys.DataKey));
// check lock removed from redis
Assert.False(actualConnection.KeyExists(redisConn.Keys.LockKey));
DisposeRedisConnectionWrapper(redisConn);
}
}
[Fact]
public void TryUpdateIfLockIdMatch_LockIdNull()
{
ProviderConfiguration pc = Utility.GetDefaultConfigUtility();
using (RedisServer redisServer = new RedisServer())
{
RedisConnectionWrapper redisConn = GetRedisConnectionWrapperWithUniqueSession();
// Inserting data into redis server
ChangeTrackingSessionStateItemCollection data = new ChangeTrackingSessionStateItemCollection(new RedisUtility(pc));
data["key1"] = "value1";
redisConn.Set(data, 900);
DateTime lockTime = DateTime.Now;
object lockId;
ISessionStateItemCollection dataFromRedis;
int sessionTimeout;
Assert.True(redisConn.TryCheckWriteLockAndGetData(out lockId, out dataFromRedis, out sessionTimeout));
Assert.Equal(null, lockId);
Assert.Equal(1, dataFromRedis.Count);
// update session data without lock id (to support lock free session)
dataFromRedis["key1"] = "value1-updated";
redisConn.TryUpdateAndReleaseLock(null, dataFromRedis, 900);
// Get actual connection and get data from redis
IDatabase actualConnection = GetRealRedisConnection(redisConn);
HashEntry[] sessionDataFromRedis = actualConnection.HashGetAll(redisConn.Keys.DataKey);
Assert.Equal(1, sessionDataFromRedis.Length);
ChangeTrackingSessionStateItemCollection sessionDataFromRedisAsCollection = new ChangeTrackingSessionStateItemCollection(new RedisUtility(pc));
foreach (HashEntry entry in sessionDataFromRedis)
{
sessionDataFromRedisAsCollection[entry.Name] = RedisUtility.GetObjectFromBytes(entry.Value).ToString();
}
Assert.Equal("value1-updated", sessionDataFromRedisAsCollection["key1"]);
// check lock removed and remove data from redis
actualConnection.KeyDelete(redisConn.Keys.DataKey);
Assert.False(actualConnection.KeyExists(redisConn.Keys.LockKey));
DisposeRedisConnectionWrapper(redisConn);
}
} |
<<<<<<<
redisConn.TryRemoveAndReleaseLock(lockId);
A.CallTo(() => mockRedisClient.Eval(A<string>.Ignored, A<string[]>.That.Matches(s => s.Length == 3),
=======
redisConn.redisConnection = A.Fake<IRedisClientConnection>();
redisConn.TryRemoveAndReleaseLockIfLockIdMatch(lockId);
A.CallTo(() => redisConn.redisConnection.Eval(A<string>.Ignored, A<string[]>.That.Matches(s => s.Length == 3),
>>>>>>>
redisConn.redisConnection = A.Fake<IRedisClientConnection>();
redisConn.TryRemoveAndReleaseLock(lockId);
A.CallTo(() => redisConn.redisConnection.Eval(A<string>.Ignored, A<string[]>.That.Matches(s => s.Length == 3),
<<<<<<<
redisConn.TryUpdateAndReleaseLock(lockId, data, sessionTimeout);
=======
redisConn.redisConnection = A.Fake<IRedisClientConnection>();
redisConn.TryUpdateAndReleaseLockIfLockIdMatch(lockId, data, sessionTimeout);
>>>>>>>
redisConn.redisConnection = A.Fake<IRedisClientConnection>();
redisConn.TryUpdateAndReleaseLock(lockId, data, sessionTimeout);
<<<<<<<
redisConn.TryUpdateAndReleaseLock(lockId, data, sessionTimeout);
=======
redisConn.redisConnection = A.Fake<IRedisClientConnection>();
redisConn.TryUpdateAndReleaseLockIfLockIdMatch(lockId, data, sessionTimeout);
>>>>>>>
redisConn.redisConnection = A.Fake<IRedisClientConnection>();
redisConn.TryUpdateAndReleaseLock(lockId, data, sessionTimeout); |
<<<<<<<
LookupSparse = this.lookupSparse,
HashFunctionId = this.hashFunctionId,
=======
LookupSparse = this.lookupSparse,
CountAdditions = this.CountAdditions,
>>>>>>>
LookupSparse = this.lookupSparse,
HashFunctionId = this.hashFunctionId,
CountAdditions = this.CountAdditions,
<<<<<<<
HashFunctionId = hashFunctionId,
=======
CountAdditions = 0,
>>>>>>>
HashFunctionId = hashFunctionId,
CountAdditions = 0, |
<<<<<<<
/// <param name="processLurker">The process lurker.</param>
/// <param name="settingsService">The settings service.</param>
/// <param name="keyboard">The keyboard.</param>
public LifeBulbViewModel(IEventAggregator eventAggregator, IWindowManager windowManager, DockingHelper dockingHelper, ProcessLurker processLurker, SettingsService settingsService, PoeKeyboardHelper keyboard)
: base(windowManager, dockingHelper, processLurker, settingsService)
=======
/// <param name="lurker"></param>
/// <param name="settingsService"></param>H
public LifeBulbViewModel(IEventAggregator eventAggregator, IWindowManager windowManager, DockingHelper dockingHelper, ProcessLurker processLurker, ClientLurker clientLurker,SettingsService settingsService, PoeKeyboardHelper keyboard)
: base(windowManager, dockingHelper, processLurker, settingsService, clientLurker)
>>>>>>>
/// <param name="processLurker">The process lurker.</param>
/// <param name="settingsService">The settings service.</param>
/// <param name="keyboard">The keyboard.</param>
public LifeBulbViewModel(IEventAggregator eventAggregator, IWindowManager windowManager, DockingHelper dockingHelper, ProcessLurker processLurker, SettingsService settingsService, PoeKeyboardHelper keyboard, ClientLurker clientLurker)
: base(windowManager, dockingHelper, processLurker, settingsService, clientLurker)
<<<<<<<
this.View.Height = value;
this.View.Width = value;
this.View.Left = windowInformation.Position.Left + 6;
this.View.Top = windowInformation.Position.Bottom - value;
var lifeView = this.View as LifeBulbView;
=======
this._view.Height = value;
this._view.Width = value;
this._view.Left = windowInformation.Position.Left + 10;
this._view.Top = windowInformation.Position.Bottom - value - 10;
var lifeView = this._view as LifeBulbView;
>>>>>>>
this._view.Height = value;
this._view.Width = value;
this._view.Left = windowInformation.Position.Left + 10;
this._view.Top = windowInformation.Position.Bottom - value - 10;
var lifeView = this.View as LifeBulbView; |
<<<<<<<
=======
using Caliburn.Micro;
using Lurker.Helpers;
using Lurker.Patreon.Events;
using Lurker.Services;
using Lurker.UI.Models;
>>>>>>>
<<<<<<<
/// <summary>
/// The default bulb height.
/// </summary>
protected static readonly int DefaultBulbHeight = 220;
private INotifyPropertyChanged _actionView;
=======
private INotifyPropertyChanged _actionView;
protected static readonly int DefaultBulbHeight = 215;
protected System.Action _action;
protected ClientLurker _clientLurker;
>>>>>>>
/// <summary>
/// The default bulb height.
/// </summary>
protected static readonly int DefaultBulbHeight = 220;
protected ClientLurker _clientLurker;
private INotifyPropertyChanged _actionView;
<<<<<<<
/// <param name="processLurker">The Processs lurker.</param>
/// <param name="settingsService">The settings serivce.</param>
public BulbViewModelBase(IWindowManager windowManager, DockingHelper dockingHelper, ProcessLurker processLurker, SettingsService settingsService)
=======
/// <param name="lurker"></param>
/// <param name="settingsService"></param>H
public BulbViewModel(IWindowManager windowManager, DockingHelper dockingHelper, ProcessLurker processLurker, SettingsService settingsService, ClientLurker clientLurker)
>>>>>>>
/// <param name="processLurker">The Processs lurker.</param>
/// <param name="settingsService">The settings serivce.</param>
public BulbViewModelBase(IWindowManager windowManager, DockingHelper dockingHelper, ProcessLurker processLurker, SettingsService settingsService) |
<<<<<<<
using VirtoCommerce.Storefront.Models;
using VirtoCommerce.Storefront.Owin;
=======
using VirtoCommerce.Storefront.Model;
using VirtoCommerce.Storefront.OwinMiddlewares;
using Microsoft.Practices.Unity;
>>>>>>>
using VirtoCommerce.Storefront.Model;
using VirtoCommerce.Storefront.Owin;
<<<<<<<
var apiClient = new HmacApiClient(ConfigurationManager.ConnectionStrings["VirtoCommerceBaseUrl"].ConnectionString, ConfigurationManager.AppSettings["vc -public-ApiAppId"], ConfigurationManager.AppSettings["vc-public-ApiSecretKey"]);
container.RegisterType<IStoreModuleApi, StoreModuleApi>(new InjectionConstructor(apiClient));
container.RegisterType<IVirtoCommercePlatformApi, VirtoCommercePlatformApi>(new InjectionConstructor(apiClient));
// Create new work context per each request
// TODO: Add caching
app.CreatePerOwinContext(() => container.Resolve<WorkContext>());
app.Use<WorkContextOwinMiddleware>(container.Resolve<IStoreModuleApi>(), container.Resolve<IVirtoCommercePlatformApi>());
=======
//Owin middleware
app.Use<ContextInitializationMiddleware>(container.Resolve<WorkContext>(), container.Resolve<IStoreModuleApi>(),
container.Resolve<IVirtoCommercePlatformApi>());
>>>>>>>
var apiClient = new HmacApiClient(ConfigurationManager.ConnectionStrings["VirtoCommerceBaseUrl"].ConnectionString, ConfigurationManager.AppSettings["vc -public-ApiAppId"], ConfigurationManager.AppSettings["vc-public-ApiSecretKey"]);
container.RegisterType<IStoreModuleApi, StoreModuleApi>(new InjectionConstructor(apiClient));
container.RegisterType<IVirtoCommercePlatformApi, VirtoCommercePlatformApi>(new InjectionConstructor(apiClient));
// Create new work context per each request
// TODO: Add caching
app.CreatePerOwinContext(() => container.Resolve<WorkContext>());
app.Use<WorkContextOwinMiddleware>(container.Resolve<IStoreModuleApi>(), container.Resolve<IVirtoCommercePlatformApi>()); |
<<<<<<<
private readonly ICacheManager<object> _cacheManager;
=======
private readonly string _baseLocalPath;
private FileSystemWatcher _fileSystemWatcher;
private readonly ILocalCacheManager _cacheManager;
>>>>>>>
private readonly ILocalCacheManager<object> _cacheManager;
<<<<<<<
public StaticContentServiceImpl(Markdown markdownRender, ILiquidThemeEngine liquidEngine,
ICacheManager<object> cacheManager, Func<WorkContext> workContextFactory,
Func<IStorefrontUrlBuilder> urlBuilderFactory, Func<string, ContentItem> contentItemFactory,
IContentBlobProvider contentBlobProvider)
=======
public StaticContentServiceImpl(string baseLocalPath, Markdown markdownRender, ILiquidThemeEngine liquidEngine,
ILocalCacheManager cacheManager, Func<WorkContext> workContextFactory,
Func<IStorefrontUrlBuilder> urlBuilderFactory, Func<string, ContentItem> contentItemFactory)
>>>>>>>
public StaticContentServiceImpl(Markdown markdownRender, ILiquidThemeEngine liquidEngine,
ILocalCacheManager cacheManager, Func<WorkContext> workContextFactory,
Func<IStorefrontUrlBuilder> urlBuilderFactory, Func<string, ContentItem> contentItemFactory,
IContentBlobProvider contentBlobProvider) |
<<<<<<<
public ContentController(Func<string, IContentBlobStorageProvider> contentStorageProviderFactory, IBlobUrlResolver urlResolver, ISecurityService securityService, IPermissionScopeService permissionScopeService)
=======
private readonly IStoreService _storeService;
public ContentController(Func<string, string, IContentBlobStorageProvider> contentStorageProviderFactory, IBlobUrlResolver urlResolver, ISecurityService securityService, IPermissionScopeService permissionScopeService, IStoreService storeService)
>>>>>>>
private readonly IStoreService _storeService;
public ContentController(Func<string, IContentBlobStorageProvider> contentStorageProviderFactory, IBlobUrlResolver urlResolver, ISecurityService securityService, IPermissionScopeService permissionScopeService, IStoreService storeService)
<<<<<<<
var contentStorageProvider = _contentStorageProviderFactory("");
=======
var themesProvider = _contentStorageProviderFactory("themes", storeId);
var pageProvider = _contentStorageProviderFactory("pages", storeId);
var store = _storeService.GetById(storeId);
>>>>>>>
var contentStorageProvider = _contentStorageProviderFactory("");
var store = _storeService.GetById(storeId);
<<<<<<<
ThemesCount = contentStorageProvider.Search("Themes/" + storeId, null).Folders.Count(),
BlogsCount = contentStorageProvider.Search("Pages/" + storeId + "/blogs", null).Folders.Count(),
PagesCount = contentStorageProvider.Search("Pages/" + storeId, null).Items.Count()
=======
ActiveThemeName = store.GetDynamicPropertyValue("DefaultThemeName", "not set"),
ThemesCount = themesProvider.Search("/", null).Folders.Count(),
BlogsCount = pageProvider.Search("/blogs", null).Folders.Count(),
PagesCount = pageProvider.Search("/", null).Items.Count()
>>>>>>>
ActiveThemeName = store.GetDynamicPropertyValue("DefaultThemeName", "not set"),
ThemesCount = contentStorageProvider.Search("Themes/" + storeId, null).Folders.Count(),
BlogsCount = contentStorageProvider.Search("Pages/" + storeId + "/blogs", null).Folders.Count(),
PagesCount = contentStorageProvider.Search("Pages/" + storeId, null).Items.Count() |
<<<<<<<
public class Module : ModuleBase
{
private readonly IUnityContainer _container;
public Module(IUnityContainer container)
{
_container = container;
}
#region IModule Members
public override void Initialize()
{
var settingsManager = _container.Resolve<ISettingsManager>();
var xmlRelativePath = settingsManager.GetValue("Swashbuckle.XmlRelativePath", string.Empty);
var defaultApiKey = settingsManager.GetValue("Swashbuckle.DefaultApiKey", string.Empty);
Func<PopulateTagsFilter> tagsFilterFactory = () => new PopulateTagsFilter(_container.Resolve<IPackageService>());
GlobalConfiguration.Configuration.
EnableSwagger(
c =>
{
if (!string.IsNullOrEmpty(xmlRelativePath))
{
var xmlFilesPaths = GetXmlFilesPaths(xmlRelativePath);
foreach (var path in xmlFilesPaths)
{
c.IncludeXmlComments(path);
}
}
c.IgnoreObsoleteProperties();
c.UseFullTypeNameInSchemaIds();
c.DescribeAllEnumsAsStrings();
c.SingleApiVersion("v1", string.Format("VirtoCommerce Platform Web documentation. For this sample, you can use the <code>{0}</code> special-key to test the authorization filters.", defaultApiKey));
c.DocumentFilter(tagsFilterFactory);
c.OperationFilter(tagsFilterFactory);
c.ResolveConflictingActions(apiDescriptions => apiDescriptions.First());
c.RootUrl(req => new Uri(req.RequestUri, req.GetRequestContext().VirtualPathRoot).ToString());
c.ApiKey("apiKey")
.Description("API Key Authentication")
.Name("api_key")
.In("header");
}
).EnableSwaggerUi();
}
#endregion
private string[] GetXmlFilesPaths(string xmlRelativePath)
{
var path = HostingEnvironment.MapPath(xmlRelativePath);
var files = Directory.GetFiles(path, "*.Web.XML");
return files;
}
private string GroupAction(System.Web.Http.Description.ApiDescription apiDescriptor)
{
return apiDescriptor.ActionDescriptor.ControllerDescriptor.ControllerName;
}
private class PopulateTagsFilter : IDocumentFilter, IOperationFilter
{
private readonly IPackageService _packageService;
public PopulateTagsFilter(IPackageService packageService)
{
_packageService = packageService;
}
#region IDocumentFilter Members
public void Apply(SwaggerDocument swaggerDoc, SchemaRegistry schemaRegistry, System.Web.Http.Description.IApiExplorer apiExplorer)
{
var tags = _packageService.GetModules().Select(x => new Tag
{
name = x.Id,
description = x.Description
}).ToList();
tags.Add(new Tag {
name = "VirtoCommerce.Platform",
description = "Platform functionality represent common resources and operations"
});
swaggerDoc.tags = tags;
}
#endregion
#region IOperationFilter Members
public void Apply(Operation operation, SchemaRegistry schemaRegistry, System.Web.Http.Description.ApiDescription apiDescription)
{
var module = _packageService.GetModules().Where(x => x.ModuleInfo.ModuleInstance != null).FirstOrDefault(x => apiDescription.ActionDescriptor.ControllerDescriptor.ControllerType.Assembly == x.ModuleInfo.ModuleInstance.GetType().Assembly);
if (module != null)
{
operation.tags = new string[] { module.Id };
}
else if (apiDescription.ActionDescriptor.ControllerDescriptor.ControllerType.Assembly.GetName().Name == "VirtoCommerce.Platform.Web")
{
operation.tags = new string[] { "VirtoCommerce.Platform" };
}
}
#endregion
}
}
=======
public class Module : ModuleBase
{
private readonly IUnityContainer _container;
public Module(IUnityContainer container)
{
_container = container;
}
#region IModule Members
public override void Initialize()
{
var settingsManager = _container.Resolve<ISettingsManager>();
var xmlRelativePaths = new[] { "~/App_Data/Modules", "~/bin" };
var defaultApiKey = settingsManager.GetValue("Swashbuckle.DefaultApiKey", string.Empty);
GlobalConfiguration.Configuration.
EnableSwagger(
c =>
{
foreach (var xmlRelativePath in xmlRelativePaths)
{
var xmlFilesPaths = GetXmlFilesPaths(xmlRelativePath);
foreach (var path in xmlFilesPaths)
{
c.IncludeXmlComments(path);
}
}
c.IgnoreObsoleteProperties();
c.UseFullTypeNameInSchemaIds();
c.DescribeAllEnumsAsStrings();
c.SingleApiVersion("v1", string.Format("VirtoCommerce Platform Web documentation. For this sample, you can use the {0} special-key to test the authorization filters.", defaultApiKey));
c.ResolveConflictingActions(apiDescriptions => apiDescriptions.First());
c.RootUrl(req => new Uri(req.RequestUri, req.GetRequestContext().VirtualPathRoot).ToString());
c.ApiKey("apiKey")
.Description("API Key Authentication")
.Name("api_key")
.In("header");
}
).EnableSwaggerUi(c =>
{
}
);
}
private string[] GetXmlFilesPaths(string xmlRelativePath)
{
var path = HostingEnvironment.MapPath(xmlRelativePath);
var files = Directory.GetFiles(path, "*.Web.XML");
return files;
}
#endregion
}
>>>>>>>
public class Module : ModuleBase
{
private readonly IUnityContainer _container;
public Module(IUnityContainer container)
{
_container = container;
}
#region IModule Members
public override void Initialize()
{
var settingsManager = _container.Resolve<ISettingsManager>();
var xmlRelativePaths = new[] { "~/App_Data/Modules", "~/bin" };
var defaultApiKey = settingsManager.GetValue("Swashbuckle.DefaultApiKey", string.Empty);
Func<PopulateTagsFilter> tagsFilterFactory = () => new PopulateTagsFilter(_container.Resolve<IPackageService>());
GlobalConfiguration.Configuration.
EnableSwagger(
c =>
{
foreach (var xmlRelativePath in xmlRelativePaths)
{
var xmlFilesPaths = GetXmlFilesPaths(xmlRelativePath);
foreach (var path in xmlFilesPaths)
{
c.IncludeXmlComments(path);
}
}
c.IgnoreObsoleteProperties();
c.UseFullTypeNameInSchemaIds();
c.DescribeAllEnumsAsStrings();
c.SingleApiVersion("v1", string.Format("VirtoCommerce Platform Web documentation. For this sample, you can use the <code>{0}</code> special-key to test the authorization filters.", defaultApiKey));
c.DocumentFilter(tagsFilterFactory);
c.OperationFilter(tagsFilterFactory);
c.ResolveConflictingActions(apiDescriptions => apiDescriptions.First());
c.RootUrl(req => new Uri(req.RequestUri, req.GetRequestContext().VirtualPathRoot).ToString());
c.ApiKey("apiKey")
.Description("API Key Authentication")
.Name("api_key")
.In("header");
}
).EnableSwaggerUi();
}
#endregion
private string[] GetXmlFilesPaths(string xmlRelativePath)
{
var path = HostingEnvironment.MapPath(xmlRelativePath);
var files = Directory.GetFiles(path, "*.Web.XML");
return files;
}
private string GroupAction(System.Web.Http.Description.ApiDescription apiDescriptor)
{
return apiDescriptor.ActionDescriptor.ControllerDescriptor.ControllerName;
}
private class PopulateTagsFilter : IDocumentFilter, IOperationFilter
{
private readonly IPackageService _packageService;
public PopulateTagsFilter(IPackageService packageService)
{
_packageService = packageService;
}
#region IDocumentFilter Members
public void Apply(SwaggerDocument swaggerDoc, SchemaRegistry schemaRegistry, System.Web.Http.Description.IApiExplorer apiExplorer)
{
var tags = _packageService.GetModules().Select(x => new Tag
{
name = x.Id,
description = x.Description
}).ToList();
tags.Add(new Tag {
name = "VirtoCommerce.Platform",
description = "Platform functionality represent common resources and operations"
});
swaggerDoc.tags = tags;
}
#endregion
#region IOperationFilter Members
public void Apply(Operation operation, SchemaRegistry schemaRegistry, System.Web.Http.Description.ApiDescription apiDescription)
{
var module = _packageService.GetModules().Where(x => x.ModuleInfo.ModuleInstance != null).FirstOrDefault(x => apiDescription.ActionDescriptor.ControllerDescriptor.ControllerType.Assembly == x.ModuleInfo.ModuleInstance.GetType().Assembly);
if (module != null)
{
operation.tags = new string[] { module.Id };
}
else if (apiDescription.ActionDescriptor.ControllerDescriptor.ControllerType.Assembly.GetName().Name == "VirtoCommerce.Platform.Web")
{
operation.tags = new string[] { "VirtoCommerce.Platform" };
}
}
#endregion
}
} |
<<<<<<<
}
private ICommerceService GetCommerceService()
{
return new CommerceServiceImpl(() => new CommerceRepositoryImpl("VirtoCommerce", new EntityPrimaryKeyGeneratorInterceptor(), new AuditableInterceptor()));
}
private StoreModuleController GetStoreController()
{
Func<IPlatformRepository> platformRepositoryFactory = () => new PlatformRepository("VirtoCommerce", new EntityPrimaryKeyGeneratorInterceptor(), new AuditableInterceptor());
Func<IStoreRepository> repositoryFactory = () => new StoreRepositoryImpl("VirtoCommerce", new EntityPrimaryKeyGeneratorInterceptor(), new AuditableInterceptor());
var dynamicPropertyService = new DynamicPropertyService(platformRepositoryFactory);
var cacheManager = new CacheManager(new InMemoryCachingProvider(), null);
var storeService = new StoreServiceImpl(repositoryFactory, cacheManager, GetCommerceService(), null, dynamicPropertyService, null, null);
var controller = new StoreModuleController(storeService, null, null);
return controller;
}
}
=======
var shippingService = new ShippingServiceImpl();
var storeService = new StoreServiceImpl(repositoryFactory, GetCommerceService(), null, null, null);
var controller = new StoreModuleController(storeService, null, null);
return controller;
}
}
>>>>>>>
}
private ICommerceService GetCommerceService()
{
return new CommerceServiceImpl(() => new CommerceRepositoryImpl("VirtoCommerce", new EntityPrimaryKeyGeneratorInterceptor(), new AuditableInterceptor()));
}
private StoreModuleController GetStoreController()
{
Func<IPlatformRepository> platformRepositoryFactory = () => new PlatformRepository("VirtoCommerce", new EntityPrimaryKeyGeneratorInterceptor(), new AuditableInterceptor());
Func<IStoreRepository> repositoryFactory = () => new StoreRepositoryImpl("VirtoCommerce", new EntityPrimaryKeyGeneratorInterceptor(), new AuditableInterceptor());
var dynamicPropertyService = new DynamicPropertyService(platformRepositoryFactory);
var storeService = new StoreServiceImpl(repositoryFactory, GetCommerceService(), null, dynamicPropertyService, null, null);
var controller = new StoreModuleController(storeService, null, null);
return controller;
}
} |
<<<<<<<
lineItemWebModel.TaxTotal = new Money(currency);
=======
>>>>>>>
<<<<<<<
webModel.DiscountTotal = new Money(serviceModel.DiscountTotal ?? 0, currency);
webModel.ExtendedPrice = new Money(serviceModel.ExtendedPrice ?? 0, currency);
=======
>>>>>>>
<<<<<<<
webModel.ListPrice = new Money(serviceModel.ListPrice ?? 0, currency);
webModel.PlacedPrice = new Money(serviceModel.PlacedPrice ?? 0, currency);
=======
webModel.ListPrice = new Money(serviceModel.ListPrice ?? 0, currency.Code);
>>>>>>>
webModel.ListPrice = new Money(serviceModel.ListPrice ?? 0, currency); |
<<<<<<<
#region IAsyncObserver<QuoteRequestUpdatedEvent> Members
public Task OnNextAsync(QuoteRequestUpdatedEvent quoteRequestCreatedEvent)
{
if (quoteRequestCreatedEvent.QuoteRequest != null)
{
var cacheKey = GetCacheKey(quoteRequestCreatedEvent.QuoteRequest.CustomerId);
_cacheManager.Remove(cacheKey, "ApiRegion");
}
return Task.Factory.StartNew(() => { });
}
#endregion
private string GetCacheKey(string customerId)
=======
private static string GetCacheKey(string customerId)
>>>>>>>
#region IAsyncObserver<QuoteRequestUpdatedEvent> Members
public Task OnNextAsync(QuoteRequestUpdatedEvent quoteRequestCreatedEvent)
{
if (quoteRequestCreatedEvent.QuoteRequest != null)
{
var cacheKey = GetCacheKey(quoteRequestCreatedEvent.QuoteRequest.CustomerId);
_cacheManager.Remove(cacheKey, "ApiRegion");
}
return Task.Factory.StartNew(() => { });
}
#endregion
private static string GetCacheKey(string customerId) |
<<<<<<<
using (new Utilities.ProfilingSample("Single Pass - Deferred Lighting Pass", renderLoop))
{
// Bind material data
m_LitRenderLoop.Bind();
m_SinglePassLightLoop.RenderDeferredLighting(camera, renderLoop, m_CameraColorBuffer);
// m_TilePassLightLoop.RenderDeferredLighting(camera, renderLoop, );
}
=======
// Bind material data
m_LitRenderLoop.Bind();
m_SinglePassLightLoop.RenderDeferredLighting(camera, renderLoop, m_CameraColorBuffer);
// m_TilePassLightLoop.RenderDeferredLighting(camera, renderLoop, m_CameraColorBuffer);
>>>>>>>
using (new Utilities.ProfilingSample("Single Pass - Deferred Lighting Pass", renderLoop))
{
// Bind material data
m_LitRenderLoop.Bind();
m_SinglePassLightLoop.RenderDeferredLighting(camera, renderLoop, m_CameraColorBuffer);
// m_TilePassLightLoop.RenderDeferredLighting(camera, renderLoop, m_CameraColorBuffer);
}
<<<<<<<
using (new Utilities.ProfilingSample("Build Light list", renderLoop))
{
PrepareLightsForGPU(cullResults, camera, ref shadows, ref m_lightList);
m_TilePassLightLoop.BuildGPULightLists(camera, renderLoop, m_lightList, m_CameraDepthBuffer);
PushGlobalParams(camera, renderLoop, m_lightList);
}
=======
PrepareLightsForGPU(cullResults, camera, ref shadows, ref m_lightList);
//m_TilePassLightLoop.BuildGPULightLists(camera, renderLoop, m_lightList, m_CameraDepthBuffer);
PushGlobalParams(camera, renderLoop, m_lightList);
>>>>>>>
using (new Utilities.ProfilingSample("Build Light list", renderLoop))
{
PrepareLightsForGPU(cullResults, camera, ref shadows, ref m_lightList);
//m_TilePassLightLoop.BuildGPULightLists(camera, renderLoop, m_lightList, m_CameraDepthBuffer);
PushGlobalParams(camera, renderLoop, m_lightList);
} |
<<<<<<<
if (!string.IsNullOrEmpty(language)
&& (!ensureTwoPublishedLanguages || _workContext.CurrentLanguage.Length >= 2)
)
=======
// Get slug for requested language
if (!string.IsNullOrEmpty(language) && _workContext.StoreLanguages.Length >= 2)
>>>>>>>
// Get slug for requested language
if (!string.IsNullOrEmpty(language) && _workContext.CurrentLanguage.Length >= 2) |
<<<<<<<
DiscountTotal = new Money(currency);
TaxTotal = new Money(currency);
=======
ListPrice = new Money(currency.Code);
SalePrice = new Money(currency.Code);
>>>>>>>
ListPrice = new Money(currency);
SalePrice = new Money(currency); |
<<<<<<<
using VirtoCommerce.Storefront.Model.Services;
using VirtoCommerce.Storefront.Model.StaticContent;
using VirtoCommerce.LiquidThemeEngine.Extensions;
=======
using VirtoCommerce.Storefront.Model.Services;
>>>>>>>
using VirtoCommerce.Storefront.Model.Services;
using VirtoCommerce.Storefront.Model.StaticContent;
using VirtoCommerce.LiquidThemeEngine.Extensions;
<<<<<<<
private readonly IStaticContentService _staticContentService;
=======
private readonly ICatalogModuleApi _catalogModuleApi;
private readonly ISearchModuleApi _searchApi;
>>>>>>>
private readonly ICatalogModuleApi _catalogModuleApi;
private readonly ISearchModuleApi _searchApi;
private readonly IStaticContentService _staticContentService;
<<<<<<<
_customerService = container.Resolve<ICustomerService>();
_staticContentService = container.Resolve<IStaticContentService>();
=======
_catalogModuleApi = container.Resolve<ICatalogModuleApi>();
_searchApi = container.Resolve<ISearchModuleApi>();
>>>>>>>
_catalogModuleApi = container.Resolve<ICatalogModuleApi>();
_searchApi = container.Resolve<ISearchModuleApi>();
_customerService = container.Resolve<ICustomerService>();
_staticContentService = container.Resolve<IStaticContentService>(); |
<<<<<<<
public abstract class ServiceBase
{
#region Settings
protected void LoadObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatObjectsListWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveSettingsObjects)
{
var entity = haveSettingsObject as Entity;
if (entity != null && !entity.IsTransient())
{
var storedSettings = settingManager.GetObjectSettings(entity.GetType().Name, entity.Id);
// Replace in-memory settings with stored in database
if (haveSettingsObject.Settings != null)
{
var resultSettings = new List<SettingEntry>();
foreach (var setting in haveSettingsObject.Settings)
{
var storedSetting = storedSettings.FirstOrDefault(x => x.Name == setting.Name);
resultSettings.Add(storedSetting ?? setting);
}
haveSettingsObject.Settings = resultSettings;
}
else
{
haveSettingsObject.Settings = storedSettings;
}
}
}
}
protected void SaveObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatObjectsListWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveSettingsObjects)
{
var entity = haveSettingsObject as Entity;
if (entity != null && !entity.IsTransient())
{
var objectType = entity.GetType().Name;
var settings = new List<SettingEntry>();
if (haveSettingsObject.Settings != null)
{
//Save settings
foreach (var setting in haveSettingsObject.Settings)
{
setting.ObjectId = entity.Id;
setting.ObjectType = objectType;
settings.Add(setting);
}
}
settingManager.SaveSettings(settings.ToArray());
}
}
}
protected void RemoveObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatObjectsListWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveSettingsObjects)
{
var entity = haveSettingsObject as Entity;
if (entity != null && !entity.IsTransient())
{
settingManager.RemoveObjectSettings(entity.GetType().Name, entity.Id);
}
}
}
#endregion
protected virtual void CommitChanges(IRepository repository)
{
try
{
repository.UnitOfWork.Commit();
}
catch (Exception ex)
{
ex.ThrowFaultException();
}
}
protected virtual ObservableChangeTracker GetChangeTracker(IRepository repository)
{
var retVal = new ObservableChangeTracker
{
RemoveAction = x => repository.Remove(x),
AddAction = x => repository.Add(x)
};
return retVal;
}
}
=======
public abstract class ServiceBase
{
protected void LoadObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatListObjectsWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveSettingsObjects)
{
var entity = haveSettingsObject as Entity;
if (entity != null && !entity.IsTransient())
{
var storedSettings = settingManager.GetObjectSettings(entity.GetType().Name, entity.Id);
//Merge default settings and stored in db
if (haveSettingsObject.Settings != null)
{
var resultSettings = new List<SettingEntry>();
foreach (var setting in haveSettingsObject.Settings)
{
var storedSetting = storedSettings.FirstOrDefault(x => x.Name == setting.Name);
if (storedSetting != null)
{
resultSettings.Add(storedSetting);
}
else
{
setting.Value = setting.DefaultValue;
resultSettings.Add(setting);
}
}
haveSettingsObject.Settings = resultSettings;
}
else
{
haveSettingsObject.Settings = storedSettings;
}
}
}
}
protected void SaveObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatListObjectsWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveSettingsObjects)
{
var entity = haveSettingsObject as Entity;
if (entity != null && !entity.IsTransient())
{
var settings = new List<SettingEntry>();
if (haveSettingsObject.Settings != null)
{
//Save settings
foreach (var setting in haveSettingsObject.Settings)
{
setting.ObjectId = entity.Id;
setting.ObjectType = entity.GetType().Name;
settings.Add(setting);
}
}
settingManager.SaveSettings(settings.ToArray());
}
}
}
protected void RemoveObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatListObjectsWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveSettingsObjects)
{
var entity = haveSettingsObject as Entity;
if (entity != null && !entity.IsTransient())
{
settingManager.RemoveObjectSettings(entity.GetType().Name, entity.Id);
}
}
}
protected virtual void CommitChanges(IRepository repository)
{
try
{
repository.UnitOfWork.Commit();
}
catch (Exception ex)
{
ex.ThrowFaultException();
}
}
protected virtual ObservableChangeTracker GetChangeTracker(IRepository repository)
{
var retVal = new ObservableChangeTracker
{
RemoveAction = (x) =>
{
repository.Remove(x);
},
AddAction = (x) =>
{
repository.Add(x);
}
};
return retVal;
}
}
>>>>>>>
public abstract class ServiceBase
{
#region Settings
protected void LoadObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatObjectsListWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveSettingsObjects)
{
var entity = haveSettingsObject as Entity;
if (entity != null && !entity.IsTransient())
{
var storedSettings = settingManager.GetObjectSettings(entity.GetType().Name, entity.Id);
// Replace in-memory settings with stored in database
if (haveSettingsObject.Settings != null)
{
var resultSettings = new List<SettingEntry>();
foreach (var setting in haveSettingsObject.Settings)
{
var storedSetting = storedSettings.FirstOrDefault(x => x.Name == setting.Name);
if (storedSetting != null)
{
resultSettings.Add(storedSetting);
}
else
{
setting.Value = setting.DefaultValue;
resultSettings.Add(setting);
}
}
haveSettingsObject.Settings = resultSettings;
}
else
{
haveSettingsObject.Settings = storedSettings;
}
}
}
}
protected void SaveObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatObjectsListWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveSettingsObjects)
{
var entity = haveSettingsObject as Entity;
if (entity != null && !entity.IsTransient())
{
var objectType = entity.GetType().Name;
var settings = new List<SettingEntry>();
if (haveSettingsObject.Settings != null)
{
//Save settings
foreach (var setting in haveSettingsObject.Settings)
{
setting.ObjectId = entity.Id;
setting.ObjectType = objectType;
settings.Add(setting);
}
}
settingManager.SaveSettings(settings.ToArray());
}
}
}
protected void RemoveObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatObjectsListWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveSettingsObjects)
{
var entity = haveSettingsObject as Entity;
if (entity != null && !entity.IsTransient())
{
settingManager.RemoveObjectSettings(entity.GetType().Name, entity.Id);
}
}
}
#endregion
protected virtual void CommitChanges(IRepository repository)
{
try
{
repository.UnitOfWork.Commit();
}
catch (Exception ex)
{
ex.ThrowFaultException();
}
}
protected virtual ObservableChangeTracker GetChangeTracker(IRepository repository)
{
var retVal = new ObservableChangeTracker
{
RemoveAction = x => repository.Remove(x),
AddAction = x => repository.Add(x)
};
return retVal;
}
} |
<<<<<<<
=======
using VirtoCommerce.Foundation.AppConfig.Repositories;
using VirtoCommerce.Foundation.Frameworks.Extensions;
using VirtoCommerce.Platform.Core.Security;
>>>>>>>
using VirtoCommerce.Platform.Core.Security;
<<<<<<<
private readonly IPropertyService _propertyService;
private readonly ISettingsManager _settingManager;
=======
private readonly IPropertyService _propertyService;
private readonly Func<IAppConfigRepository> _appConfigRepositoryFactory;
private readonly IPermissionService _permissionService;
>>>>>>>
private readonly IPropertyService _propertyService;
private readonly ISettingsManager _settingManager;
private readonly IPermissionService _permissionService;
<<<<<<<
ICatalogSearchService itemSearchService,
ISettingsManager settingManager,
IPropertyService propertyService)
=======
ICatalogSearchService itemSearchService,
Func<IFoundationAppConfigRepository> appConfigRepositoryFactory,
IPropertyService propertyService, IPermissionService permissionService)
>>>>>>>
ICatalogSearchService itemSearchService,
ISettingsManager settingManager,
IPropertyService propertyService, IPermissionService permissionService)
<<<<<<<
_propertyService = propertyService;
_settingManager = settingManager;
=======
_appConfigRepositoryFactory = appConfigRepositoryFactory;
_propertyService = propertyService;
_permissionService = permissionService;
>>>>>>>
_propertyService = propertyService;
_settingManager = settingManager;
_permissionService = permissionService;
}
// GET: api/catalog/catalogs
[HttpGet]
[ResponseType(typeof(webModel.Catalog[]))]
[Route("")]
public IHttpActionResult GetCatalogs()
{
var criteria = new moduleModel.SearchCriteria
{
ResponseGroup = moduleModel.ResponseGroup.WithCatalogs
};
var serviceResult = _searchService.Search(criteria);
var retVal = serviceResult.Catalogs.Select(x => x.ToWebModel()).ToArray();
return Ok(retVal);
}
// GET: api/catalog/catalogs/4
[HttpGet]
[ResponseType(typeof(webModel.Catalog))]
[Route("{id}")]
[CheckPermission(Permission = PredefinedPermissions.Query)]
public IHttpActionResult Get(string id)
{
var catalog = _catalogService.GetById(id);
if (catalog == null)
{
return NotFound();
}
var allCatalogProperties = _propertyService.GetCatalogProperties(id);
return Ok(catalog.ToWebModel(allCatalogProperties));
<<<<<<<
private IEnumerable<webModel.CatalogLanguage> GetSystemLanguages()
{
var retVal = new List<webModel.CatalogLanguage>();
var languages = _settingManager.GetArray<string>("VirtoCommerce.Core.Languages", new string[] { "en-US" });
foreach (var languageCode in languages)
{
retVal.Add(new webModel.CatalogLanguage(languageCode));
}
return retVal;
}
=======
private IEnumerable<webModel.CatalogLanguage> GetSystemLanguages()
{
var retVal = new List<webModel.CatalogLanguage>();
using (var appConfigRep = _appConfigRepositoryFactory())
{
if (appConfigRep != null)
{
var languageSetting = appConfigRep.Settings.Expand(x => x.SettingValues).FirstOrDefault(x => x.Name.Equals("Languages"));
if (languageSetting != null)
{
foreach (var languageCode in languageSetting.SettingValues.Select(x => x.ToString()))
{
retVal.Add(new webModel.CatalogLanguage(languageCode));
}
}
}
}
return retVal;
}
>>>>>>>
private IEnumerable<webModel.CatalogLanguage> GetSystemLanguages()
{
var retVal = new List<webModel.CatalogLanguage>();
var languages = _settingManager.GetArray<string>("VirtoCommerce.Core.Languages", new string[] { "en-US" });
foreach (var languageCode in languages)
{
retVal.Add(new webModel.CatalogLanguage(languageCode));
}
return retVal;
} |
<<<<<<<
using System.Web.Http;
=======
using VirtoCommerce.Storefront.Model.Cart.Services;
using VirtoCommerce.Storefront.Model.Pricing.Services;
>>>>>>>
using VirtoCommerce.Storefront.Model.Cart.Services;
using VirtoCommerce.Storefront.Model.Pricing.Services;
<<<<<<<
GlobalConfiguration.Configure(WebApiConfig.Register);
//app.UseWebApi(GlobalConfiguration.Configuration);
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
=======
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters, () => container.Resolve<WorkContext>());
>>>>>>>
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters, () => container.Resolve<WorkContext>());
GlobalConfiguration.Configure(WebApiConfig.Register);
//app.UseWebApi(GlobalConfiguration.Configuration); |
<<<<<<<
public async Task<ActionResult> CreateOrderJson(BankCardInfo bankCardInfo)
=======
[Route("createorder")]
public async Task<ActionResult> CreateOrderJson(VirtoCommerceDomainPaymentModelBankCardInfo bankCardInfo)
>>>>>>>
public async Task<ActionResult> CreateOrderJson(VirtoCommerceDomainPaymentModelBankCardInfo bankCardInfo)
<<<<<<<
public async Task<ActionResult> ExternalPaymentCallback(string orderId)
=======
[Route("checkout/paymentform")]
public async Task<ActionResult> PaymentForm(string orderId)
>>>>>>>
public async Task<ActionResult> PaymentForm(string orderId)
<<<<<<<
=======
[Route("checkout/thanks/{orderId}")]
>>>>>>> |
<<<<<<<
webModel.DiscountTotal = new Money(serviceModel.DiscountTotal ?? 0, currency);
webModel.HandlingTotal = new Money(serviceModel.HandlingTotal ?? 0, currency);
=======
webModel.HandlingTotal = new Money(serviceModel.HandlingTotal ?? 0, currency.Code);
>>>>>>>
webModel.HandlingTotal = new Money(serviceModel.HandlingTotal ?? 0, currency);
<<<<<<<
webModel.ShippingTotal = new Money(serviceModel.ShippingTotal ?? 0, currency);
webModel.SubTotal = new Money(serviceModel.SubTotal ?? 0, currency);
=======
>>>>>>>
<<<<<<<
webModel.TaxTotal = new Money(serviceModel.TaxTotal ?? 0, currency);
webModel.Total = new Money(serviceModel.Total ?? 0, currency);
=======
webModel.TaxTotal = new Money(serviceModel.TaxTotal ?? 0, currency.Code);
>>>>>>>
webModel.TaxTotal = new Money(serviceModel.TaxTotal ?? 0, currency); |
<<<<<<<
using PagedList;
using System.Linq;
=======
using System;
using System.Linq;
using System.Web;
using PagedList;
>>>>>>>
using PagedList;
using System.Linq;
using System.Web;
using PagedList; |
<<<<<<<
=======
using VirtoCommerce.Storefront.Controllers.Api;
using VirtoCommerce.Storefront.Model.Common;
>>>>>>>
using VirtoCommerce.Storefront.Controllers.Api;
using VirtoCommerce.Storefront.Model.Common;
<<<<<<<
public static void RegisterRoutes(RouteCollection routes, Func<WorkContext> workContextFactory, ICommerceCoreModuleApi commerceCoreApi, IStaticContentService staticContentService, ILocalCacheManager cacheManager)
=======
public static void RegisterRoutes(RouteCollection routes, Func<WorkContext> workContextFactory, ICommerceCoreModuleApi commerceCoreApi, IStaticContentService staticContentService, ILocalCacheManager cacheManager)
>>>>>>>
public static void RegisterRoutes(RouteCollection routes, Func<WorkContext> workContextFactory, ICommerceCoreModuleApi commerceCoreApi, IStaticContentService staticContentService, ILocalCacheManager cacheManager) |
<<<<<<<
PrintVertex curp = new PrintVertex(ActivePath.End.Position, GCodeUtil.UnspecifiedValue, PathDimensions, GCodeUtil.UnspecifiedValue);
newPath.AppendVertex(curp);
=======
PrintVertex curp = new PrintVertex(ActivePath.End.Position, GCodeUtil.UnspecifiedValue, GCodeUtil.UnspecifiedValue);
newPath.AppendVertex(curp, TPVertexFlags.IsPathStart);
>>>>>>>
PrintVertex curp = new PrintVertex(ActivePath.End.Position, GCodeUtil.UnspecifiedValue, PathDimensions, GCodeUtil.UnspecifiedValue);
newPath.AppendVertex(curp, TPVertexFlags.IsPathStart);
<<<<<<<
PrintVertex curp = new PrintVertex(ActivePath.End.Position, GCodeUtil.UnspecifiedValue, PathDimensions, GCodeUtil.UnspecifiedValue);
newPath.AppendVertex(curp);
=======
PrintVertex curp = new PrintVertex(ActivePath.End.Position, GCodeUtil.UnspecifiedValue, GCodeUtil.UnspecifiedValue);
newPath.AppendVertex(curp, TPVertexFlags.IsPathStart);
>>>>>>>
PrintVertex curp = new PrintVertex(ActivePath.End.Position, GCodeUtil.UnspecifiedValue, PathDimensions, GCodeUtil.UnspecifiedValue);
newPath.AppendVertex(curp, TPVertexFlags.IsPathStart); |
<<<<<<<
/// <summary>
/// Event that is fired if the service call fails with an exception.
/// This event is fired for every failed attempt to call the service method.
/// </summary>
event OnExceptionHandler OnException;
=======
/// <summary>
/// Allows access to WCF extensibility features.
/// </summary>
/// <remarks>
/// Make sure this is called after any other endpoint-modifying configuration operations,
/// as not doing so will not produce expected results.
/// </remarks>
ChannelFactory ChannelFactory { get; }
>>>>>>>
/// <summary>
/// Event that is fired if the service call fails with an exception.
/// This event is fired for every failed attempt to call the service method.
/// </summary>
event OnExceptionHandler OnException;
/// <summary>
/// Allows access to WCF extensibility features.
/// </summary>
/// <remarks>
/// Make sure this is called after any other endpoint-modifying configuration operations,
/// as not doing so will not produce expected results.
/// </remarks>
ChannelFactory ChannelFactory { get; } |
<<<<<<<
_logger?.WriteLine("Disposing WatchableApp");
Process?.Dispose();
Scenario.Dispose();
=======
Process?.Dispose();
Scenario?.Dispose();
>>>>>>>
_logger?.WriteLine("Disposing WatchableApp");
Process?.Dispose();
Scenario?.Dispose(); |
<<<<<<<
protected static Rect ControlWinPos2 { get; set; }
=======
//protected bool Loaded { get; set; }
protected static Rect ControlWindowPosition { get; set; }
>>>>>>>
protected static Rect ControlWindowPosition { get; set; } |
<<<<<<<
rotationSpeed *= (speedTweak)*customSpeed*(reverse ? -1 : 1);
//rotation += getAxisInversion() * TimeWarp.fixedDeltaTime * speed;
rotation += GetAxisInversion()*TimeWarp.fixedDeltaTime*rotationSpeed*electricChargeConstraintData.Ratio;
RotationChanged |= mask;
//playAudio();
if (motorSound!=null) motorSound.Play();
=======
pos = interpolator.minPos + interpolator.maxPos - pos;
>>>>>>>
pos = Interpolator.MinPosition + Interpolator.MaxPosition - pos;
<<<<<<<
translationSpeed *= (speedTweak)*customSpeed*(reverse ? -1 : 1);
//translation += getAxisInversion() * TimeWarp.fixedDeltaTime * speed;
translation += GetAxisInversion()*TimeWarp.fixedDeltaTime*translationSpeed*
electricChargeConstraintData.Ratio;
TranslationChanged |= mask;
//playAudio();
if (motorSound!=null) motorSound.Play();
=======
if (rotation != pos) {
rotation = pos;
RotationChanged |= 4;
} else
RotationChanged = 0;
}
else
{
if (translation != pos) {
translation = pos;
TranslationChanged |= 4;
} else
TranslationChanged = 0;
>>>>>>>
if (rotation != pos) {
rotation = pos;
RotationChanged |= 4;
} else
RotationChanged = 0;
}
else
{
if (translation != pos) {
translation = pos;
TranslationChanged |= 4;
} else
TranslationChanged = 0;
<<<<<<<
Interpolator.SetCommand (0f, 0f);
if (MoveFlags == 0 && !on)
{
if (motorSound!=null) motorSound.Stop();
}
}
protected void CheckRotationLimits()
{
if (rotateLimits || limitTweakableFlag)
{
if (rotation < minTweak || rotation > maxTweak)
{
RotationChanged = 2;
if (rotation < minTweak)
{
FixedMeshTransform.Rotate(-rotateAxis * (minTweak - rotation), Space.Self);
transform.Rotate(rotateAxis * (minTweak - rotation), Space.Self);
rotation = minTweak;
}
else if (rotation > maxTweak)
{
FixedMeshTransform.Rotate(rotateAxis * (rotation - maxTweak), Space.Self);
transform.Rotate(-rotateAxis * (rotation - maxTweak), Space.Self);
rotation = maxTweak;
}
rotationEuler = rotation;
}
if (rotateLimitsRevertOn && ((RotationChanged & 1) > 0))
{
reversedRotationOn = !reversedRotationOn;
}
if (rotateLimitsRevertKey && ((RotationChanged & 2) > 0))
{
reversedRotationKey = !reversedRotationKey;
}
if (rotateLimitsOff)
{
on = false;
UpdateState();
}
}
else
{
if (rotation >= 180)
{
rotation -= 360;
rotationDelta -= 360;
}
if (rotation < -180)
{
rotation += 360;
rotationDelta += 360;
}
}
}
protected void CheckTranslationLimits()
{
if (translateLimits)
{
if (translation < minTweak || translation > maxTweak)
{
translation = Mathf.Clamp(translation, minTweak, maxTweak);
TranslationChanged = 2;
float isGantry;
float outofBounds;
if (part.name.Contains("Gantry"))
isGantry = -1f;
else
isGantry = 1f;
if (translation < minTweak)
{
outofBounds = minTweak - translation;
transform.Translate((translateAxis.x * isGantry * outofBounds * GetAxisInversion()),
(translateAxis.y * isGantry * outofBounds * GetAxisInversion()),
(translateAxis.z * isGantry * outofBounds * GetAxisInversion()), Space.Self);
FixedMeshTransform.Translate((-translateAxis.x * isGantry * outofBounds * GetAxisInversion()),
(-translateAxis.y * isGantry * outofBounds * GetAxisInversion()),
(-translateAxis.z * isGantry * outofBounds * GetAxisInversion()), Space.Self);
translation = minTweak;
}
else if (translation > maxTweak)
{
outofBounds = translation - maxTweak;
transform.Translate((-translateAxis.x * isGantry * outofBounds * GetAxisInversion()),
(-translateAxis.y * isGantry * outofBounds * GetAxisInversion()),
(-translateAxis.z * isGantry * outofBounds * GetAxisInversion()), Space.Self);
FixedMeshTransform.Translate((translateAxis.x * isGantry * outofBounds * GetAxisInversion()),
(translateAxis.y * isGantry * outofBounds * GetAxisInversion()),
(translateAxis.z * isGantry * outofBounds * GetAxisInversion()), Space.Self);
translation = maxTweak;
}
//translation = Mathf.Clamp(translation, minTweak, maxTweak);
if (translateLimitsRevertOn && ((TranslationChanged & 1) > 0))
{
reversedTranslationOn = !reversedTranslationOn;
}
if (translateLimitsRevertKey && ((TranslationChanged & 2) > 0))
{
reversedTranslationKey = !reversedTranslationKey;
}
if (translateLimitsOff)
{
on = false;
UpdateState();
}
}
}
=======
interpolator.setCommand (0f, 0f);
>>>>>>>
Interpolator.SetCommand (0f, 0f);
<<<<<<<
Interpolator.Update (TimeWarp.fixedDeltaTime);
if (Interpolator.Active)
Debug.Log( Interpolator.StateToString() );
=======
interpolator.Update (TimeWarp.fixedDeltaTime);
updatePosition();
//if (interpolator.active)
// Debug.Log( interpolator.StateToString() );
if (interpolator.active && (interpolator.cmdVel != 0))
motorSound.Play();
else
motorSound.Stop();
>>>>>>>
Interpolator.Update (TimeWarp.fixedDeltaTime);
UpdatePosition();
if (Interpolator.Active && (Interpolator.CmdVelocity != 0))
motorSound.Play();
else
motorSound.Stop(); |
<<<<<<<
new de4dot.code.deobfuscators.MPRESS.DeobfuscatorInfo(),
=======
new de4dot.code.deobfuscators.Rummage.DeobfuscatorInfo(),
>>>>>>>
new de4dot.code.deobfuscators.MPRESS.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.Rummage.DeobfuscatorInfo(), |
<<<<<<<
cmd.ReleaseTemporaryRT(CameraRenderTargetID.opaque);
cmd.EndSample("LightweightPipeline.Render");
=======
>>>>>>>
cmd.ReleaseTemporaryRT(CameraRenderTargetID.opaque);
<<<<<<<
private RenderTextureDescriptor CreateRTDesc(FrameRenderingConfiguration renderingConfig, float scaler = 1.0f)
{
RenderTextureDescriptor desc;
if (LightweightUtils.HasFlag(renderingConfig, FrameRenderingConfiguration.Stereo))
desc = XRSettings.eyeTextureDesc;
else
desc = new RenderTextureDescriptor(m_CurrCamera.pixelWidth, m_CurrCamera.pixelHeight);
float renderScale = (m_CurrCamera.cameraType == CameraType.Game) ? m_Asset.RenderScale : 1.0f;
desc.width = (int)((float)desc.width * renderScale * scaler);
desc.height = (int)((float)desc.height * renderScale * scaler);
return desc;
}
private void SetupIntermediateResources(FrameRenderingConfiguration renderingConfig, ref ScriptableRenderContext context)
=======
private void SetupIntermediateResources(FrameRenderingConfiguration renderingConfig, bool shadows, ref ScriptableRenderContext context)
>>>>>>>
private RenderTextureDescriptor CreateRTDesc(FrameRenderingConfiguration renderingConfig, float scaler = 1.0f)
{
RenderTextureDescriptor desc;
if (LightweightUtils.HasFlag(renderingConfig, FrameRenderingConfiguration.Stereo))
desc = XRSettings.eyeTextureDesc;
else
desc = new RenderTextureDescriptor(m_CurrCamera.pixelWidth, m_CurrCamera.pixelHeight);
float renderScale = GetRenderScale();
desc.width = (int)((float)desc.width * renderScale * scaler);
desc.height = (int)((float)desc.height * renderScale * scaler);
return desc;
}
private void SetupIntermediateResources(FrameRenderingConfiguration renderingConfig, bool shadows, ref ScriptableRenderContext context)
<<<<<<<
// TODO: Might be worth caching baseDesc for allocation of other targets (Screen-space Shadow Map?)
RenderTextureDescriptor baseDesc = CreateRTDesc(renderingConfig);
=======
RenderTextureDescriptor baseDesc;
if (LightweightUtils.HasFlag(renderingConfig, FrameRenderingConfiguration.Stereo))
baseDesc = XRSettings.eyeTextureDesc;
else
baseDesc = new RenderTextureDescriptor(m_CurrCamera.pixelWidth, m_CurrCamera.pixelHeight);
float renderScale = GetRenderScale();
baseDesc.width = (int)((float)baseDesc.width * renderScale);
baseDesc.height = (int)((float)baseDesc.height * renderScale);
>>>>>>>
RenderTextureDescriptor baseDesc = CreateRTDesc(renderingConfig); |
<<<<<<<
// Used in Authenticate and Snapshot examples. The client they help create is used by all examples.
// From your Face subscription in the Azure portal, get your subscription key and location/region (for example, 'westus').
=======
// Used in Authenticate and Snapshot examples. The client these help create is used by all examples.
// <snippet_mainvars>
// From your Face subscription in the Azure portal, get your subscription key and endpoint.
// You made need to change the first part of your endpoint (for example, it may be 'westus' or a custom domain)
>>>>>>>
// Used in Authenticate and Snapshot examples. The client these help create is used by all examples.
// <snippet_mainvars>
// From your Face subscription in the Azure portal, get your subscription key and endpoint.
<<<<<<<
// Large FaceList variables
const string LargeFaceListId = "mylargefacelistid_001"; // must be lowercase, 0-9, or "_"
const string LargeFaceListName = "MyLargeFaceListName";
=======
// <snippet_client>
>>>>>>>
// Large FaceList variables
const string LargeFaceListId = "mylargefacelistid_001"; // must be lowercase, 0-9, "_" or "-" characters
const string LargeFaceListName = "MyLargeFaceListName";
// <snippet_client>
<<<<<<<
// Authenticate for another region or subscription (used in Snapshot only).
=======
// </snippet_client>
// <snippet_snapshot_client>
// Authenticate for another region (used in Snapshot only).
>>>>>>>
// </snippet_client>
// <snippet_snapshot_client>
// Authenticate for another region or subscription (used in Snapshot only).
<<<<<<<
// Detect - get features from faces.
=======
// </snippet_snapshot_client>
// <snippet_detect_call>
// Detect features from faces.
>>>>>>>
// </snippet_snapshot_client>
// <snippet_detect_call>
// Detect - get features from faces.
<<<<<<<
// Find Similar - find a similar face from a list of faces.
=======
// </snippet_detect_call>
// Find a similar face from a list of faces.
>>>>>>>
// </snippet_detect_call>
// Find Similar - find a similar face from a list of faces.
<<<<<<<
Console.WriteLine();
=======
// </snippet_target_persongroup_delete>
>>>>>>>
Console.WriteLine();
// </snippet_target_persongroup_delete> |
<<<<<<<
URL ="https://console.ng.bluemix.net/catalog/natural-language-classifier/", ServiceID="NaturalLanguageClassifierV1" },
new ServiceSetup() { ServiceName = "Tone Analyzer", ServiceAPI = "tone-analyzer/api",
URL ="https://console.ng.bluemix.net/catalog/services/tone-analyzer/", ServiceID="ToneAnalyzerV3" }
new ServiceSetup() { ServiceName = "Tradeoff Analytics", ServiceAPI = "tradeoff-analytics/api",
URL ="https://console.ng.bluemix.net/catalog/services/tradeoff-analytics/", ServiceID="TradeoffAnalyticsV1" }
new ServiceSetup() { ServiceName = "Personality Insights", ServiceAPI = "personality-insights/api",
URL ="https://console.ng.bluemix.net/catalog/services/personality-insights/", ServiceID="PersonalityInsightsV2" }
=======
URL ="https://console.ng.bluemix.net/catalog/natural-language-classifier/", ServiceID="NaturalLanguageClassifierV1" },
new ServiceSetup() { ServiceName = "Conversation", ServiceAPI = "conversation-experimental/api",
URL ="https://console.ng.bluemix.net/catalog/services/conversation/", ServiceID="ConversationV1" }
>>>>>>>
URL ="https://console.ng.bluemix.net/catalog/natural-language-classifier/", ServiceID="NaturalLanguageClassifierV1" },
new ServiceSetup() { ServiceName = "Tone Analyzer", ServiceAPI = "tone-analyzer/api",
URL ="https://console.ng.bluemix.net/catalog/services/tone-analyzer/", ServiceID="ToneAnalyzerV3" }
new ServiceSetup() { ServiceName = "Tradeoff Analytics", ServiceAPI = "tradeoff-analytics/api",
URL ="https://console.ng.bluemix.net/catalog/services/tradeoff-analytics/", ServiceID="TradeoffAnalyticsV1" }
new ServiceSetup() { ServiceName = "Personality Insights", ServiceAPI = "personality-insights/api",
URL ="https://console.ng.bluemix.net/catalog/services/personality-insights/", ServiceID="PersonalityInsightsV2" }
new ServiceSetup() { ServiceName = "Conversation", ServiceAPI = "conversation-experimental/api",
URL ="https://console.ng.bluemix.net/catalog/services/conversation/", ServiceID="ConversationV1" } |
<<<<<<<
State = AvatarState.DONT_UNDERSTAND;
m_TextOutput.SendData(new TextData( PickRandomString( m_FailurePhrases ) ));
=======
m_TextOutput.SendData(new TextToSpeechData( PickRandomString( m_FailurePhrases ) ));
>>>>>>>
State = AvatarState.DONT_UNDERSTAND;
m_TextOutput.SendData(new TextToSpeechData( PickRandomString( m_FailurePhrases ) )); |
<<<<<<<
internal GraphQLType GetGQLType(Type type)
=> _types.FirstOrDefault(t => t.CLRType == type)
?? new GraphQLType(type) { IsScalar = true };
=======
internal override GraphQLType GetGQLType(Type type) => GetGQLType(type, _types);
private static GraphQLType GetGQLType(Type type, List<GraphQLType> types) => types.First(t => t.CLRType == type);
>>>>>>>
internal override GraphQLType GetGQLType(Type type)
=> _types.FirstOrDefault(t => t.CLRType == type)
?? new GraphQLType(type) { IsScalar = true }; |
<<<<<<<
AddDefaultPrimitives();
AddType<TContext>("queryType");
=======
>>>>>>>
AddType<TContext>("queryType");
<<<<<<<
var schemaType = AddType<GraphQLSchema<TContext>>("__Schema");
schemaType.AddField("types", (db, s) => s.Types.Concat(VariableTypes.IntrospectionTypes).ToList());
schemaType.AddField("queryType", (db, s) => (GraphQLType) null); // TODO: queryType
schemaType.AddField("mutationType", (db, s) => (GraphQLType) null); // TODO: mutations + mutationType
schemaType.AddField("directives", (db, s) => new List<GraphQLType>()); // TODO: Directives
var typeType = AddType<GraphQLType>("__Type");
typeType.AddField("kind", (db, t) => GetTypeKind(t));
typeType.AddField(t => t.Name);
typeType.AddField(t => t.Description);
typeType.AddField(t => t.Fields); // TODO: includeDeprecated
typeType.AddField("interfaces", (db, t) => new List<GraphQLType>());
var fieldType = AddType<GraphQLField>("__Field");
fieldType.AddField(f => f.Name);
fieldType.AddField(f => f.Description);
//field.AddField(f => f.Arguments); // TODO:
fieldType.AddField(f => f.Type);
fieldType.AddField("isDeprecated", (db, f) => false); // TODO: deprecation
fieldType.AddField("deprecationReason", (db, f) => "");
this.AddField("__schema", db => this);
this.AddField("__type", new {name = ""}, (db, args) => _types.AsQueryable().First(t => t.Name == args.name));
=======
AddEnum<TypeKind>("__TypeKind");
AddEnum<DirectiveLocation>("__DirectiveLocation");
var ischema = AddType<IntroSchema>("__Schema");
ischema.AddField("types", s => s.Types);
ischema.AddField("queryType", s => s.QueryType);
ischema.AddField("mutationType", s => s.MutationType.OrDefault());
ischema.AddField("directives", s => s.Directives);
var itype = AddType<IntroType>("__Type");
itype.AddField("kind", t => t.Kind);
itype.AddField("name", t => t.Name.OrDefault());
itype.AddField("description", t => t.Description.OrDefault());
// TODO: support includeDeprecated filter argument
itype.AddField("fields", t => t.Fields.OrDefault());
itype.AddField("inputFields", t => t.InputFields.OrDefault());
itype.AddField ("ofType", s => s.OfType.OrDefault());
itype.AddField("interfaces", s => s.Interfaces.OrDefault());
itype.AddField("possibleTypes", s => s.PossibleTypes.OrDefault());
var ifield = AddType<IntroField>("__Field");
ifield.AddField("name", f => f.Name);
ifield.AddField("description", f => f.Description.OrDefault());
ifield.AddField("args", f => f.Args);
ifield.AddField("type", f => f.Type);
ifield.AddField("isDeprecated", f => f.IsDeprecated);
ifield.AddField("deprecationReason", f => f.DeprecationReason.OrDefault());
var ivalue = AddType<IntroInputValue>("__InputValue");
ivalue.AddField("name", v => v.Name);
ivalue.AddField("description", v => v.Description.OrDefault());
ivalue.AddField("type", v => v.Type);
ivalue.AddField("defaultValue", v => v.DefaultValue.OrDefault());
var ienumValue = AddType<IntroEnumValue>("__EnumValue");
ienumValue.AddField("name", e => e.Name);
ienumValue.AddField("description", e => e.Description.OrDefault());
ienumValue.AddField("isDeprecated", e => e.IsDeprecated);
ienumValue.AddField("deprecationReason", e => e.DeprecationReason.OrDefault());
var idirective = AddType<IntroDirective>("__Directive");
idirective.AddField("name", d => d.Name);
idirective.AddField("description", d => d.Description.OrDefault());
idirective.AddField("locations", d => d.Locations);
idirective.AddField("args", d => d.Args);
this.AddQuery("__schema", _ => IntroSchema.Of(Adapter));
this.AddQuery("__type", new { name = "" },
(_, args) => IntroSchema.Of(Adapter).Types
.FirstOrDefault(t => t.Name.OrDefault() == args.name));
>>>>>>>
AddEnum<TypeKind>("__TypeKind");
AddEnum<DirectiveLocation>("__DirectiveLocation");
var ischema = AddType<IntroSchema>("__Schema");
ischema.AddField("types", s => s.Types);
ischema.AddField("queryType", s => s.QueryType);
ischema.AddField("mutationType", s => s.MutationType.OrDefault());
ischema.AddField("directives", s => s.Directives);
var itype = AddType<IntroType>("__Type");
itype.AddField("kind", t => t.Kind);
itype.AddField("name", t => t.Name.OrDefault());
itype.AddField("description", t => t.Description.OrDefault());
// TODO: support includeDeprecated filter argument
itype.AddField("fields", t => t.Fields.OrDefault());
itype.AddField("inputFields", t => t.InputFields.OrDefault());
itype.AddField ("ofType", s => s.OfType.OrDefault());
itype.AddField("interfaces", s => s.Interfaces.OrDefault());
itype.AddField("possibleTypes", s => s.PossibleTypes.OrDefault());
var ifield = AddType<IntroField>("__Field");
ifield.AddField("name", f => f.Name);
ifield.AddField("description", f => f.Description.OrDefault());
ifield.AddField("args", f => f.Args);
ifield.AddField("type", f => f.Type);
ifield.AddField("isDeprecated", f => f.IsDeprecated);
ifield.AddField("deprecationReason", f => f.DeprecationReason.OrDefault());
var ivalue = AddType<IntroInputValue>("__InputValue");
ivalue.AddField("name", v => v.Name);
ivalue.AddField("description", v => v.Description.OrDefault());
ivalue.AddField("type", v => v.Type);
ivalue.AddField("defaultValue", v => v.DefaultValue.OrDefault());
var ienumValue = AddType<IntroEnumValue>("__EnumValue");
ienumValue.AddField("name", e => e.Name);
ienumValue.AddField("description", e => e.Description.OrDefault());
ienumValue.AddField("isDeprecated", e => e.IsDeprecated);
ienumValue.AddField("deprecationReason", e => e.DeprecationReason.OrDefault());
var idirective = AddType<IntroDirective>("__Directive");
idirective.AddField("name", d => d.Name);
idirective.AddField("description", d => d.Description.OrDefault());
idirective.AddField("locations", d => d.Locations);
idirective.AddField("args", d => d.Args);
this.AddField("__schema", _ => IntroSchema.Of(Adapter));
this.AddField("__type", new { name = "" },
(_, args) => IntroSchema.Of(Adapter).Types
.FirstOrDefault(t => t.Name.OrDefault() == args.name)); |
<<<<<<<
var acct =
(IDictionary<string, object>)
gql.ExecuteQuery("{ accountPaidBy(paid: { year: 2016 month: 1 day: 1 }) { id } }")["accountPaidBy"];
Assert.AreEqual(acct["id"], 1);
=======
var results = gql.ExecuteQuery("{ accountPaidBy(paid: \"2016-02-01T00:00:00\") { id } }");
Test.DeepEquals(results, "{ accountPaidBy: { id: 1 } }");
>>>>>>>
var results = gql.ExecuteQuery("{ accountPaidBy(paid: { year: 2016 month: 1 day: 1 }) { id } }");
Test.DeepEquals(results, "{ accountPaidBy: { id: 1 } }"); |
<<<<<<<
#if NETFX45 || CORE
=======
#if NET45
>>>>>>>
#if NET45 || CORE
<<<<<<<
#if NETFX45 || CORE
=======
#if NET45
>>>>>>>
#if NET45 || CORE
<<<<<<<
#if NETFX45 || CORE
/// <summary>
/// Derefence a FtpListItem object
/// </summary>
/// <param name="item">The item to derefence</param>
/// <param name="recMax">Maximum recursive calls</param>
/// <param name="count">Counter</param>
/// <returns>FtpListItem, null if the link can't be dereferenced</returns>
async Task<FtpListItem> DereferenceLinkAsync(FtpListItem item, int recMax, IntRef count)
{
if (item.Type != FtpFileSystemObjectType.Link)
throw new FtpException("You can only derefernce a symbolic link. Please verify the item type is Link.");
if (item.LinkTarget == null)
throw new FtpException("The link target was null. Please check this before trying to dereference the link.");
foreach (FtpListItem obj in GetListing(item.LinkTarget.GetFtpDirectoryName(), FtpListOption.ForceList))
{
if (item.LinkTarget == obj.FullName)
{
if (obj.Type == FtpFileSystemObjectType.Link)
{
if (++count.Value == recMax)
return null;
return await DereferenceLinkAsync(obj, recMax, count);
}
if (HasFeature(FtpCapability.MDTM))
{
DateTime modify = GetModifiedTime(obj.FullName);
if (modify != DateTime.MinValue)
obj.Modified = modify;
}
if (obj.Type == FtpFileSystemObjectType.File && obj.Size < 0 && HasFeature(FtpCapability.SIZE))
obj.Size = GetFileSize(obj.FullName);
return obj;
}
}
return null;
}
/// <summary>
/// Dereference a <see cref="FtpListItem"/> object asynchronously
/// </summary>
/// <param name="item">The item to dereference</param>
/// <param name="recMax">Maximum recursive calls</param>
/// <returns>FtpListItem, null if the link can't be dereferenced</returns>
public Task<FtpListItem> DereferenceLinkAsync(FtpListItem item, int recMax) {
//TODO: Add cancellation support
FtpTrace.WriteFunc("DereferenceLink", new object[] { item.FullName, recMax });
IntRef count = new IntRef { Value = 0 };
return DereferenceLinkAsync(item, recMax, count);
=======
#if NET45
/// <summary>
/// Dereference a <see cref="FtpListItem"/> object asynchronously
/// </summary>
/// <param name="item">The item to dereference</param>
/// <param name="recMax">Maximum recursive calls</param>
/// <returns>FtpListItem, null if the link can't be dereferenced</returns>
public async Task<FtpListItem> DereferenceLinkAsync(FtpListItem item, int recMax) {
//TODO: Rewrite as true async method with cancellation support
return await Task.Factory.FromAsync<FtpListItem, int, FtpListItem>(
(i, r, ac, s) => BeginDereferenceLink(i, r, ac, s),
ar => EndDereferenceLink(ar),
item, recMax, null);
>>>>>>>
#if NET45 || CORE
/// <summary>
/// Derefence a FtpListItem object
/// </summary>
/// <param name="item">The item to derefence</param>
/// <param name="recMax">Maximum recursive calls</param>
/// <param name="count">Counter</param>
/// <returns>FtpListItem, null if the link can't be dereferenced</returns>
async Task<FtpListItem> DereferenceLinkAsync(FtpListItem item, int recMax, IntRef count)
{
if (item.Type != FtpFileSystemObjectType.Link)
throw new FtpException("You can only derefernce a symbolic link. Please verify the item type is Link.");
if (item.LinkTarget == null)
throw new FtpException("The link target was null. Please check this before trying to dereference the link.");
foreach (FtpListItem obj in GetListing(item.LinkTarget.GetFtpDirectoryName(), FtpListOption.ForceList))
{
if (item.LinkTarget == obj.FullName)
{
if (obj.Type == FtpFileSystemObjectType.Link)
{
if (++count.Value == recMax)
return null;
return await DereferenceLinkAsync(obj, recMax, count);
}
if (HasFeature(FtpCapability.MDTM))
{
DateTime modify = GetModifiedTime(obj.FullName);
if (modify != DateTime.MinValue)
obj.Modified = modify;
}
if (obj.Type == FtpFileSystemObjectType.File && obj.Size < 0 && HasFeature(FtpCapability.SIZE))
obj.Size = GetFileSize(obj.FullName);
return obj;
}
}
return null;
}
/// <summary>
/// Dereference a <see cref="FtpListItem"/> object asynchronously
/// </summary>
/// <param name="item">The item to dereference</param>
/// <param name="recMax">Maximum recursive calls</param>
/// <returns>FtpListItem, null if the link can't be dereferenced</returns>
public Task<FtpListItem> DereferenceLinkAsync(FtpListItem item, int recMax) {
//TODO: Add cancellation support
FtpTrace.WriteFunc("DereferenceLink", new object[] { item.FullName, recMax });
IntRef count = new IntRef { Value = 0 };
return DereferenceLinkAsync(item, recMax, count);
<<<<<<<
#if NETFX45 || CORE
=======
#if NET45
>>>>>>>
#if NET45 || CORE
<<<<<<<
#if NETFX45 || CORE
=======
#if NET45
>>>>>>>
#if NET45 || CORE
<<<<<<<
#if NETFX45 || CORE
=======
#if NET45
>>>>>>>
#if NET45 || CORE |
<<<<<<<
get
{
{
return db.Ideas.Count();
}
}
=======
get { return db.Ideas.Count(); }
>>>>>>>
get { return db.Ideas.Count(); }
} |
<<<<<<<
=======
using System;
using System.ComponentModel.DataAnnotations;
>>>>>>>
<<<<<<<
public int UserId { get; set; }
public string Author { get; set; }
=======
>>>>>>> |
<<<<<<<
var webpackTsConfig = new TsConfigWebpack();
await Write(webpackTsConfig, "tsconfig.esm.json");
=======
var webpackTsConfig = new TsConfigWebpack { Model = codeModel };
await Write(webpackTsConfig, Path.Combine("../", "tsconfig.esm.json"));
>>>>>>>
var webpackTsConfig = new TsConfigWebpack { Model = codeModel };
await Write(webpackTsConfig, "tsconfig.esm.json"); |
<<<<<<<
var enumName = enumType.Name.ToPascalCase();
if (inModelsModule || enumName.Contains('.'))
tsType = enumName;
else
tsType = "Models." + enumName;
=======
var enumName = enumType.Name;
tsType = "Models." + enumName;
if (inModelsModule || enumName.Contains('.'))
{
tsType = enumName;
}
>>>>>>>
var enumName = enumType.Name.ToPascalCase();
tsType = "Models." + enumName;
if (inModelsModule || enumName.Contains('.'))
{
tsType = enumName;
} |
<<<<<<<
/// <summary>
/// Whether or not to generate a new package.json file.
/// </summary>
public bool GeneratePackageJson { get; set; } = true;
/// <summary>
/// Whether or not to generate a new readme.md file.
/// </summary>
public bool GenerateReadmeMd { get; set; } = false;
/// <summary>
/// Whether or not to generate the LICENSE.txt file.
/// </summary>
public bool GenerateLicenseTxt { get; set; } = true;
=======
/// <summary>
/// The name of the npm package.
/// </summary>
>>>>>>>
/// <summary>
/// Whether or not to generate a new package.json file.
/// </summary>
public bool GeneratePackageJson { get; set; } = true;
/// <summary>
/// Whether or not to generate a new readme.md file.
/// </summary>
public bool GenerateReadmeMd { get; set; } = false;
/// <summary>
/// Whether or not to generate the LICENSE.txt file.
/// </summary>
public bool GenerateLicenseTxt { get; set; } = true;
/// <summary>
/// The name of the npm package.
/// </summary> |
<<<<<<<
using UltimaXNA.Configuration;
using UltimaXNA.Configuration.Properties;
=======
>>>>>>>
using UltimaXNA.Configuration;
using UltimaXNA.Configuration.Properties;
<<<<<<<
player.Move_Instant(packet.X, packet.Y, packet.Z, packet.Direction);
PartySettings.LeaveParty();//fixing party bug
// iPlayer.SetFacing(p.Direction);
=======
player.Move_Instant(
m_QueuedLoginConfirmPacket.X, m_QueuedLoginConfirmPacket.Y,
m_QueuedLoginConfirmPacket.Z, m_QueuedLoginConfirmPacket.Direction);
>>>>>>>
player.Move_Instant(
m_QueuedLoginConfirmPacket.X, m_QueuedLoginConfirmPacket.Y,
m_QueuedLoginConfirmPacket.Z, m_QueuedLoginConfirmPacket.Direction); |
<<<<<<<
using UltimaXNA.Ultima.IO;
=======
using UltimaXNA.Ultima.IO;
using UltimaXNA.Ultima.Data;
>>>>>>>
using UltimaXNA.Ultima.Data;
using UltimaXNA.Ultima.IO; |
<<<<<<<
Settings.World.FullScreenResolution = new Resolution(m_FullScreenResolutionsList[m_DropDownFullScreenResolutions.Index].Width, m_FullScreenResolutionsList[m_DropDownFullScreenResolutions.Index].Height);
Settings.World.PlayWindowGumpResolution = new Resolution(m_PlayWindowResolutionsList[m_DropDownPlayWindowResolutions.Index].Width, m_PlayWindowResolutionsList[m_DropDownPlayWindowResolutions.Index].Height);
Settings.Game.IsVSyncEnabled = m_IsVSyncEnabled.IsChecked;
Settings.Debug.IsConsoleEnabled = m_IsConsoleEnabled.IsChecked;
Settings.Debug.ShowFps = m_ShowFps.IsChecked;
=======
Settings.World.FullScreenResolution = new ResolutionConfig(m_FullScreenResolutionsList[m_DropDownFullScreenResolutions.Index].Width, m_FullScreenResolutionsList[m_DropDownFullScreenResolutions.Index].Height);
Settings.World.PlayWindowGumpResolution = new ResolutionConfig(m_PlayWindowResolutionsList[m_DropDownPlayWindowResolutions.Index].Width, m_PlayWindowResolutionsList[m_DropDownPlayWindowResolutions.Index].Height);
>>>>>>>
Settings.World.FullScreenResolution = new ResolutionConfig(m_FullScreenResolutionsList[m_DropDownFullScreenResolutions.Index].Width, m_FullScreenResolutionsList[m_DropDownFullScreenResolutions.Index].Height);
Settings.World.PlayWindowGumpResolution = new ResolutionConfig(m_PlayWindowResolutionsList[m_DropDownPlayWindowResolutions.Index].Width, m_PlayWindowResolutionsList[m_DropDownPlayWindowResolutions.Index].Height);
Settings.Game.IsVSyncEnabled = m_IsVSyncEnabled.IsChecked;
Settings.Debug.IsConsoleEnabled = m_IsConsoleEnabled.IsChecked;
Settings.Debug.ShowFps = m_ShowFps.IsChecked; |
<<<<<<<
=======
// up button
spriteBatch.Draw2D(m_btnUpClicked ? m_gumpUpButton[1] : m_gumpUpButton[0], new Vector3(X, Y, 0), Vector3.Zero);
>>>>>>>
<<<<<<<
=======
spriteBatch.Draw2D(m_gumpBackground[0], new Vector3(X, Y + m_gumpUpButton[0].Height, 0), Vector3.Zero);
>>>>>>>
<<<<<<<
if (middlewidth > 0)
{
spriteBatch.Draw2D(m_gumpBackground[0], new Point(X, Y + m_gumpUpButton[0].Height), 0, false, false);
spriteBatch.Draw2DTiled(m_gumpBackground[1], new Rectangle(X, Y + m_gumpUpButton[0].Height + m_gumpBackground[0].Height, m_gumpBackground[0].Width, middlewidth), 0, false, false);
spriteBatch.Draw2D(m_gumpBackground[2], new Point(X, Y + BarHeight - m_gumpDownButton[0].Height - m_gumpBackground[2].Height), 0, false, false);
}
// up button
spriteBatch.Draw2D(m_btnUpClicked ? m_gumpUpButton[1] : m_gumpUpButton[0], new Point(X, Y), 0, false, false);
=======
spriteBatch.Draw2DTiled(m_gumpBackground[1], new Rectangle(X, Y + m_gumpUpButton[0].Height + m_gumpBackground[0].Height, m_gumpBackground[0].Width, middlewidth), Vector3.Zero);
spriteBatch.Draw2D(m_gumpBackground[2], new Vector3(X, Y + BarHeight - m_gumpDownButton[0].Height - m_gumpBackground[2].Height, 0), Vector3.Zero);
>>>>>>>
if (middleHeight > 0)
{
spriteBatch.Draw2D(m_gumpBackground[0], new Vector3(X, Y + m_gumpUpButton[0].Height, 0), Vector3.Zero);
spriteBatch.Draw2DTiled(m_gumpBackground[1], new Rectangle(X, Y + m_gumpUpButton[0].Height + m_gumpBackground[0].Height, m_gumpBackground[0].Width, middleHeight), Vector3.Zero);
spriteBatch.Draw2D(m_gumpBackground[2], new Vector3(X, Y + BarHeight - m_gumpDownButton[0].Height - m_gumpBackground[2].Height, 0), Vector3.Zero);
}
else
{
middleHeight = Height - m_gumpUpButton[0].Height - m_gumpDownButton[0].Height;
spriteBatch.Draw2DTiled(m_gumpBackground[1], new Rectangle(X, Y + m_gumpUpButton[0].Height, m_gumpBackground[0].Width, middleHeight), Vector3.Zero);
}
// up button
spriteBatch.Draw2D(m_btnUpClicked ? m_gumpUpButton[1] : m_gumpUpButton[0], new Vector3(X, Y, 0), Vector3.Zero);
<<<<<<<
if (MaxValue > MinValue && middlewidth > 0)
spriteBatch.Draw2D(m_gumpSlider, new Point(X + (m_gumpBackground[0].Width - m_gumpSlider.Width) / 2, Y + m_gumpUpButton[0].Height + (int)m_sliderY), 0, false, false);
=======
spriteBatch.Draw2D(m_gumpSlider, new Vector3(X + (m_gumpBackground[0].Width - m_gumpSlider.Width) / 2, Y + m_gumpUpButton[0].Height + 1 + (int)m_SliderPosition, 0), Vector3.Zero);
>>>>>>>
if (MaxValue > MinValue && middleHeight > 0)
spriteBatch.Draw2D(m_gumpSlider, new Vector3(X + (m_gumpBackground[0].Width - m_gumpSlider.Width) / 2, Y + m_gumpUpButton[0].Height + m_SliderPosition, 0), Vector3.Zero);
<<<<<<<
else if (new Rectangle(0, 0, m_gumpUpButton[0].Width, m_gumpUpButton[0].Height).Contains(new Point(x, y)))
m_btnUpClicked = true;
else if (new Rectangle((m_gumpBackground[0].Width - m_gumpSlider.Width) / 2, m_gumpUpButton[0].Height + (int)m_sliderY, m_gumpSlider.Width, m_gumpSlider.Height).Contains(new Point(x, y)))
=======
else if (new Rectangle((m_gumpBackground[0].Width - m_gumpSlider.Width) / 2, m_gumpUpButton[0].Height + (int)m_SliderPosition, m_gumpSlider.Width, m_gumpSlider.Height).Contains(new Point(x, y)))
>>>>>>>
else if (new Rectangle(0, 0, m_gumpUpButton[0].Width, m_gumpUpButton[0].Height).Contains(new Point(x, y)))
m_btnUpClicked = true;
else if (new Rectangle((m_gumpBackground[0].Width - m_gumpSlider.Width) / 2, m_gumpUpButton[0].Height + (int)m_SliderPosition, m_gumpSlider.Width, m_gumpSlider.Height).Contains(new Point(x, y)))
<<<<<<<
Value = (int)((sliderY / scrollableArea()) * (float)((MaxValue - MinValue))) + MinValue;
m_sliderY = sliderY;
=======
m_value = ((sliderY / scrollableArea()) * (float)((MaxValue - MinValue))) + MinValue;
m_SliderPosition = sliderY;
>>>>>>>
m_value = ((sliderY / scrollableArea()) * (float)((MaxValue - MinValue))) + MinValue;
m_SliderPosition = sliderY; |
<<<<<<<
public DataCollector GetById(Guid id)
=======
public Task<IEnumerable<DataCollector>> GetAllAsync()
{
return GetManyAsync(_ => true);
}
public DataCollector GetById(DataCollectorId id)
>>>>>>>
public DataCollector GetById(DataCollectorId id)
<<<<<<<
=======
public Task SaveDataCollectorAsync(DataCollectorId dataCollectorId, string fullName, string displayName, double locationLatitude,
double locationLongitude, string region, string district)
{
return UpdateAsync(new DataCollector(dataCollectorId)
{
DisplayName = displayName,
FullName = fullName,
Location = new Location(locationLatitude, locationLongitude),
PhoneNumbers = new List<string>(),
Region = region ?? "Unknown",
District = district ?? "Unknown",
Village = "Unknown"
});
}
>>>>>>>
<<<<<<<
public UpdateResult ChangeUserInformation(Guid dataCollectorId, string fullName, string displayName, string region, string district)
=======
public Task<UpdateResult> RemovePhoneNumberAsync(FilterDefinition<DataCollector> filter, string number)
{
return UpdateAsync(filter, Builders<DataCollector>.Update.PullFilter(d => d.PhoneNumbers, pn => pn == number));
}
public Task<UpdateResult> RemovePhoneNumberAsync(Expression<Func<DataCollector, bool>> filter, string number)
{
return UpdateAsync(filter, Builders<DataCollector>.Update.PullFilter(d => d.PhoneNumbers, pn => pn == number));
}
public UpdateResult ChangeUserInformation(DataCollectorId dataCollectorId, string fullName, string displayName, string region, string district)
>>>>>>>
public UpdateResult ChangeUserInformation(DataCollectorId dataCollectorId, string fullName, string displayName, string region, string district)
<<<<<<<
public UpdateResult ChangeLocation(Guid dataCollectorId, double latitude, double longitude)
=======
public Task<UpdateResult> ChangeUserInformationAsync(DataCollectorId dataCollectorId, string fullName, string displayName, string region, string district)
{
return UpdateAsync(d => d.Id == dataCollectorId, Builders<DataCollector>.Update.Combine(
Builders<DataCollector>.Update.Set(d => d.FullName, fullName),
Builders<DataCollector>.Update.Set(d => d.DisplayName, displayName),
Builders<DataCollector>.Update.Set(d => d.Region, region ?? "Unknown"),
Builders<DataCollector>.Update.Set(d => d.District, district ?? "Unknown"))
);
}
public UpdateResult ChangeLocation(DataCollectorId dataCollectorId, double latitude, double longitude)
>>>>>>>
public UpdateResult ChangeLocation(DataCollectorId dataCollectorId, double latitude, double longitude)
<<<<<<<
=======
public Task<UpdateResult> ChangeLocationAsync(DataCollectorId dataCollectorId, double latitude, double longitude)
{
return UpdateAsync(d => d.Id == dataCollectorId,
Builders<DataCollector>.Update.Set(d => d.Location, new Location(latitude, longitude)));
}
>>>>>>> |
<<<<<<<
public Project GetById(Guid projectId)
=======
public async Task<IEnumerable<Project>> GetAllAsync()
{
return (await _collection.FindAsync(_ => true)).ToList();
}
public Project GetById(ProjectId projectId)
>>>>>>>
public Project GetById(ProjectId projectId)
<<<<<<<
public UpdateResult UpdateProject(Guid id, string name)
=======
public Task SaveProjectAsync(ProjectId id, string name)
{
return UpdateAsync(new Project
{
Id = id,
Name = name
});
}
public UpdateResult UpdateProject(ProjectId id, string name)
>>>>>>>
public UpdateResult UpdateProject(ProjectId id, string name)
<<<<<<<
=======
public Task<UpdateResult> UpdateProjectAsync(ProjectId id, string name)
{
return UpdateAsync(p => p.Id == id,
Builders<Project>.Update.Set(p => p.Name, name));
}
>>>>>>> |
<<<<<<<
logger.WriteLine("Adding analyzer '{0}'", fullPath);
_context.AddAdditionalFile(fullPath);
=======
_context.AddAnalyzerReference(fullPath);
>>>>>>>
logger.WriteLine("Adding analyzer '{0}'", fullPath);
_context.AddAnalyzerReference(fullPath);
<<<<<<<
logger.WriteLine("Removing analyzer '{0}'", fullPath);
_context.RemoveAdditionalFile(fullPath);
=======
_context.RemoveAnalyzerReference(fullPath);
>>>>>>>
logger.WriteLine("Removing analyzer '{0}'", fullPath);
_context.RemoveAnalyzerReference(fullPath); |
<<<<<<<
public HealthRisk GetById(Guid id)
=======
public async Task<IEnumerable<HealthRisk>> GetAllAsync()
{
return await GetManyAsync(_ => true);
}
public HealthRisk GetById(HealthRiskId id)
>>>>>>>
public HealthRisk GetById(HealthRiskId id)
<<<<<<<
public HealthRisk GetByReadableId(int readableId)
=======
public Task<HealthRisk> GetByIdAsync(HealthRiskId id)
{
return GetOneAsync(_ => _.Id == id);
}
public HealthRisk GetByReadableId(HealthRiskReadableId readableId)
>>>>>>>
public HealthRisk GetByReadableId(HealthRiskReadableId readableId)
<<<<<<<
public HealthRiskId GetIdFromReadableId(int readbleId)
=======
public Task<HealthRisk> GetByReadableIdAsync(HealthRiskReadableId readableId)
{
return GetOneAsync(_ => _.ReadableId == readableId);
}
public HealthRiskId GetIdFromReadableId(HealthRiskReadableId readbleId)
>>>>>>>
public HealthRiskId GetIdFromReadableId(HealthRiskReadableId readbleId)
<<<<<<<
public void SaveHealthRisk(Guid id, int readableId, string name)
=======
public async Task<HealthRiskId> GetIdFromReadableIdAsync(HealthRiskReadableId readbleId)
{
return (await GetByReadableIdAsync(readbleId)).Id;
}
public void SaveHealthRisk(HealthRiskId id, HealthRiskReadableId readableId, string name)
>>>>>>>
public void SaveHealthRisk(HealthRiskId id, HealthRiskReadableId readableId, string name)
<<<<<<<
public UpdateResult UpdateHealthRisk(Guid id, int readableId, string name)
=======
public Task SaveHealthRiskAsync(HealthRiskId id, HealthRiskReadableId readableId, string name)
{
return UpdateAsync(new HealthRisk(id)
{
Name = name,
ReadableId = readableId
});
}
public UpdateResult UpdateHealthRisk(HealthRiskId id, HealthRiskReadableId readableId, string name)
>>>>>>>
public UpdateResult UpdateHealthRisk(HealthRiskId id, HealthRiskReadableId readableId, string name)
<<<<<<<
=======
public Task<UpdateResult> UpdateHealthRiskAsync(HealthRiskId id, HealthRiskReadableId readableId, string name)
{
return UpdateAsync(d => d.Id == id, Builders<HealthRisk>.Update.Combine(
Builders<HealthRisk>.Update.Set(h => h.Name, name),
Builders<HealthRisk>.Update.Set(h => h.ReadableId, readableId))
);
}
>>>>>>> |
<<<<<<<
public void SaveInvalidReport(Guid caseReportId, Guid dataCollectorId, string message, string origin,
=======
public Task<IEnumerable<InvalidCaseReport>> GetAllAsync()
{
return GetManyAsync(_ => true);
}
public void SaveInvalidReport(CaseReportId caseReportId, DataCollectorId dataCollectorId, string message, string origin,
>>>>>>>
public void SaveInvalidReport(CaseReportId caseReportId, DataCollectorId dataCollectorId, string message, string origin,
<<<<<<<
=======
public Task SaveInvalidReportAsync(CaseReportId caseReportId, DataCollectorId dataCollectorId, string message, string origin,
IEnumerable<string> errorMessages, DateTimeOffset timestamp)
{
return UpdateAsync(new InvalidCaseReport(caseReportId)
{
DataCollectorId = dataCollectorId,
Message = message,
Origin = origin,
ParsingErrorMessage = errorMessages,
Timestamp = timestamp
});
}
>>>>>>> |
<<<<<<<
public void InsertNumCases(RegionWithHealthRisk region, int day, NumberOfPeople numCases)
{
if (day < 7)
{
region.Days0to6 += numCases;
} else if (day < 14)
{
region.Days7to13 += numCases;
} else if (day < 21)
{
region.Days14to20 += numCases;
} else
{
region.Days21to27 += numCases;
}
}
public void InsertPerHealthRiskAndRegionForComing4Weeks(CaseReport caseReport, HealthRisk healthRisk, District district)
=======
public void InsertPerHealthRiskAndRegionForDay(CaseReport report, HealthRisk healthRisk, District district)
{
var numberOfReports = report.NumberOfFemalesAged5AndOlder
+ report.NumberOfFemalesUnder5
+ report.NumberOfMalesAged5AndOlder
+ report.NumberOfMalesUnder5;
var region = _regions.GetById(district.RegionId);
var day = Day.From(report.Timestamp);
var reportsPerHealthRisk = _caseReportsPerHealthRiskPerDay.GetById(day);
if (reportsPerHealthRisk == null)
{
reportsPerHealthRisk = new CaseReportsPerHealthRiskPerDay()
{
Id = day,
Timestamp = report.Timestamp,
ReportsPerHealthRisk = new Dictionary<HealthRiskName, Dictionary<RegionName, int>>()
{
{ healthRisk.Name, new Dictionary<RegionName, int>()
{
{ region.Name, numberOfReports }
}
}
}
};
_caseReportsPerHealthRiskPerDay.Insert(reportsPerHealthRisk);
}
else
{
if (reportsPerHealthRisk.ReportsPerHealthRisk.TryGetValue(healthRisk.Name, out Dictionary<RegionName, int> reportsPerRegion))
{
if (reportsPerRegion.TryGetValue(region.Name, out int totalReports))
{
totalReports += numberOfReports;
}
else
{
reportsPerRegion.Add(region.Name, numberOfReports);
}
}
else
{
reportsPerHealthRisk.ReportsPerHealthRisk.Add(healthRisk.Name, new Dictionary<RegionName, int>()
{
{ region.Name, numberOfReports }
});
}
_caseReportsPerHealthRiskPerDay.Update(reportsPerHealthRisk);
}
}
public void InsertPerHealthRiskAndRegionForComingWeek(CaseReport caseReport, HealthRisk healthRisk, District district)
>>>>>>>
public void InsertNumCases(RegionWithHealthRisk region, int day, NumberOfPeople numCases)
{
if (day < 7)
{
region.Days0to6 += numCases;
} else if (day < 14)
{
region.Days7to13 += numCases;
} else if (day < 21)
{
region.Days14to20 += numCases;
} else
{
region.Days21to27 += numCases;
}
}
public void InsertPerHealthRiskAndRegionForComing4Weeks(CaseReport report, HealthRisk healthRisk, District district)
{
var numberOfReports = report.NumberOfFemalesAged5AndOlder
+ report.NumberOfFemalesUnder5
+ report.NumberOfMalesAged5AndOlder
+ report.NumberOfMalesUnder5;
var region = _regions.GetById(district.RegionId);
var day = Day.From(report.Timestamp);
var reportsPerHealthRisk = _caseReportsPerHealthRiskPerDay.GetById(day);
if (reportsPerHealthRisk == null)
{
reportsPerHealthRisk = new CaseReportsPerHealthRiskPerDay()
{
Id = day,
Timestamp = report.Timestamp,
ReportsPerHealthRisk = new Dictionary<HealthRiskName, Dictionary<RegionName, int>>()
{
{ healthRisk.Name, new Dictionary<RegionName, int>()
{
{ region.Name, numberOfReports }
}
}
}
};
_caseReportsPerHealthRiskPerDay.Insert(reportsPerHealthRisk);
}
else
{
if (reportsPerHealthRisk.ReportsPerHealthRisk.TryGetValue(healthRisk.Name, out Dictionary<RegionName, int> reportsPerRegion))
{
if (reportsPerRegion.TryGetValue(region.Name, out int totalReports))
{
totalReports += numberOfReports;
}
else
{
reportsPerRegion.Add(region.Name, numberOfReports);
}
}
else
{
reportsPerHealthRisk.ReportsPerHealthRisk.Add(healthRisk.Name, new Dictionary<RegionName, int>()
{
{ region.Name, numberOfReports }
});
}
_caseReportsPerHealthRiskPerDay.Update(reportsPerHealthRisk);
}
}
public void InsertPerHealthRiskAndRegionForComingWeek(CaseReport caseReport, HealthRisk healthRisk, District district)
<<<<<<<
var numCases = caseReport.NumberOfMalesUnder5
+caseReport.NumberOfMalesAged5AndOlder
+caseReport.NumberOfFemalesUnder5
+caseReport.NumberOfFemalesAged5AndOlder;
=======
var totalCases = caseReport.NumberOfMalesUnder5
+ caseReport.NumberOfMalesAged5AndOlder
+ caseReport.NumberOfFemalesUnder5
+ caseReport.NumberOfFemalesAged5AndOlder;
>>>>>>>
var numCases = caseReport.NumberOfMalesUnder5
+caseReport.NumberOfMalesAged5AndOlder
+caseReport.NumberOfFemalesUnder5
+caseReport.NumberOfFemalesAged5AndOlder;
<<<<<<<
InsertNumCases(regionForHealthRisk, day, numCases);
} else
=======
regionForHealthRisk.NumCases += totalCases;
}
else
>>>>>>>
InsertNumCases(regionForHealthRisk, day, numCases);
} else
<<<<<<<
Regions = new [] { AddRegionWithCases(region.Name, day, numCases) }
=======
Regions = new[] { AddRegionWithCases(region.Name, totalCases) }
>>>>>>>
Regions = new[] { AddRegionWithCases(region.Name, day, numCases) }
<<<<<<<
Id = day + today,
HealthRisks = new []
=======
Id = day,
HealthRisks = new[]
>>>>>>>
Id = day + today,
HealthRisks = new[] |
<<<<<<<
=======
using Read.DataCollectors;
using Read.GreetingGenerators;
>>>>>>>
using Read.DataCollectors;
using Read.GreetingGenerators;
<<<<<<<
ISystemConfiguratorRepository systemConfiguratorRepository,
IDataCollectors dataCollectors,
IGreetingHistories greetingHistories
)
=======
ISystemConfiguratorRepository systemConfiguratorRepository,
IDataCollectors dataCollectors,
IGreetingHistories greetingHistories)
>>>>>>>
ISystemConfiguratorRepository systemConfiguratorRepository,
IDataCollectors dataCollectors,
IGreetingHistories greetingHistories
)
<<<<<<<
=======
>>>>>>>
<<<<<<<
DeleteAllAdmins();
DeleteAllDataConsumers();
DeleteAllDataCoordinators();
DeleteAllDataOwners();
DeleteAllDataVerifiers();
DeleteAllSystemConfigurators();
=======
>>>>>>>
DeleteAllAdmins();
DeleteAllDataConsumers();
DeleteAllDataCoordinators();
DeleteAllDataOwners();
DeleteAllDataVerifiers();
DeleteAllSystemConfigurators();
<<<<<<<
_adminRepository.DeleteMany(_ => true);
=======
>>>>>>>
_adminRepository.DeleteMany(_ => true);
<<<<<<<
_dataConsumerRepository.DeleteMany(_ => true);
=======
>>>>>>>
_dataConsumerRepository.DeleteMany(_ => true);
<<<<<<<
_dataCoordinatorRepository.DeleteMany(_ => true);
=======
>>>>>>>
_dataCoordinatorRepository.DeleteMany(_ => true);
<<<<<<<
_dataOwnerRepository.DeleteMany(_ => true);
=======
>>>>>>>
_dataOwnerRepository.DeleteMany(_ => true);
<<<<<<<
_dataVerifierRepository.DeleteMany(_ => true);
=======
>>>>>>>
_dataVerifierRepository.DeleteMany(_ => true);
<<<<<<<
_systemConfiguratorRepository.DeleteMany(_ => true);
=======
>>>>>>>
_systemConfiguratorRepository.DeleteMany(_ => true);
<<<<<<<
_dataCollectors.DeleteMany(_ => true);
=======
>>>>>>>
_dataCollectors.DeleteMany(_ => true);
<<<<<<<
_greetingHistories.DeleteMany(_ => true);
=======
>>>>>>>
_greetingHistories.DeleteMany(_ => true); |
<<<<<<<
public int UpdateFrom2() {
SchemaBuilder.AlterTable("ListViewPartRecord",
table => table
.AddColumn<bool>("IsDefault", column => column.WithDefault(false)));
SchemaBuilder.ExecuteSql(@" UPDATE Coevery_Projections_ListViewPartRecord
SET IsDefault = 1
FROM Coevery_Projections_ListViewPartRecord l
WHERE NOT EXISTS( SELECT *
FROM Coevery_Projections_ListViewPartRecord lvp
WHERE lvp.ItemContentType = l.ItemContentType AND lvp.IsDefault = 1)");
SchemaBuilder.ExecuteSql(@" UPDATE Orchard_Framework_ContentItemRecord
SET ContentType_id = (SELECT Id FROM Orchard_Framework_ContentTypeRecord WHERE Name = 'LayoutProperty')
FROM Coevery_Projections_ListViewPartRecord lvp INNER JOIN Orchard_Framework_ContentItemRecord i ON i.Id = lvp.Id
UPDATE Orchard_Framework_ContentTypeRecord
SET Name = 'ListViewPage'
WHERE Name = 'LayoutPropert'");
ContentDefinitionManager.AlterTypeDefinition("ListViewPage",
cfg => cfg
.WithPart("TitlePart"));
return 3;
}
=======
public int UpdateFrom2() {
SchemaBuilder.CreateTable("EntityFilterRecord",
table => table
.Column<int>("Id", c => c.PrimaryKey().Identity())
.Column<string>("EntityName")
.Column<string>("Title")
.Column<int>("FilterGroupRecord_id")
);
return 3;
}
>>>>>>>
public int UpdateFrom2() {
SchemaBuilder.AlterTable("ListViewPartRecord",
table => table
.AddColumn<bool>("IsDefault", column => column.WithDefault(false)));
SchemaBuilder.ExecuteSql(@" UPDATE Coevery_Projections_ListViewPartRecord
SET IsDefault = 1
FROM Coevery_Projections_ListViewPartRecord l
WHERE NOT EXISTS( SELECT *
FROM Coevery_Projections_ListViewPartRecord lvp
WHERE lvp.ItemContentType = l.ItemContentType AND lvp.IsDefault = 1)");
SchemaBuilder.ExecuteSql(@" UPDATE Orchard_Framework_ContentItemRecord
SET ContentType_id = (SELECT Id FROM Orchard_Framework_ContentTypeRecord WHERE Name = 'LayoutProperty')
FROM Coevery_Projections_ListViewPartRecord lvp INNER JOIN Orchard_Framework_ContentItemRecord i ON i.Id = lvp.Id
UPDATE Orchard_Framework_ContentTypeRecord
SET Name = 'ListViewPage'
WHERE Name = 'LayoutPropert'");
ContentDefinitionManager.AlterTypeDefinition("ListViewPage",
cfg => cfg
.WithPart("TitlePart"));
return 3;
}
public int UpdateFrom2() {
SchemaBuilder.CreateTable("EntityFilterRecord",
table => table
.Column<int>("Id", c => c.PrimaryKey().Identity())
.Column<string>("EntityName")
.Column<string>("Title")
.Column<int>("FilterGroupRecord_id")
);
return 3;
} |
<<<<<<<
var index = Options.KnownTypesDict[type];
var wrapper = new KnownTypeObjectSerializer((ObjectSerializer) serializer, index);
=======
var wrapper = new KnownTypeObjectSerializer((ObjectSerializer)serializer, index);
>>>>>>>
var wrapper = new KnownTypeObjectSerializer((ObjectSerializer) serializer, index);
<<<<<<<
//build the serializer IL code
CodeGenerator.BuildSerializer(this, (ObjectSerializer) serializer);
//just ignore if this fails, another thread have already added an identical serializer
return serializer;
//add it to the serializer lookup incase of recursive serialization
=======
//build the serializer IL code
CodeGenerator.BuildSerializer(this, (ObjectSerializer)serializer);
//just ignore if this fails, another thread have already added an identical serializer
return serializer;
}
//add it to the serializer lookup in case of recursive serialization
>>>>>>>
//build the serializer IL code
CodeGenerator.BuildSerializer(this, (ObjectSerializer) serializer);
//just ignore if this fails, another thread have already added an identical serializer
return serializer;
//add it to the serializer lookup in case of recursive serialization |
<<<<<<<
var trackDeserializedObjectMethod = typeof(DeserializerSession).GetTypeInfo().GetMethod(nameof(DeserializerSession.TrackDeserializedObject));
=======
var trackDeserializedObjectMethod =
typeof(DeserializerSession).GetMethod(nameof(DeserializerSession.TrackDeserializedObject));
>>>>>>>
var trackDeserializedObjectMethod =
typeof(DeserializerSession).GetMethod(nameof(DeserializerSession.TrackDeserializedObject));
<<<<<<<
var method = typeof(StreamExtensions).GetTypeInfo().GetMethod(nameof(StreamExtensions.ReadObject));
read = c.StaticCall(method,stream,session);
=======
var method = typeof(StreamExtensions).GetMethod(nameof(StreamExtensions.ReadObject));
read = c.StaticCall(method, stream, session);
>>>>>>>
var method = typeof(StreamExtensions).GetTypeInfo().GetMethod(nameof(StreamExtensions.ReadObject));
read = c.StaticCall(method, stream, session);
<<<<<<<
var readField = c.ReadField(field,cast);
var converted = c.CastOrBox<object>(readField);
=======
var readField = c.ReadField(field, cast);
>>>>>>>
var readField = c.ReadField(field, cast);
<<<<<<<
//nor can they be null (StringSerializer has it's own null handling)
var method = typeof(ValueSerializer).GetTypeInfo().GetMethod(nameof(ValueSerializer.WriteValue));
//write it to the value serializer
var vs = c.Constant( valueSerializer);
c.EmitCall(method, vs, stream, converted, session);
=======
valueSerializer.EmitWriteValue(c, stream, readField, session);
>>>>>>>
valueSerializer.EmitWriteValue(c, stream, readField, session); |
<<<<<<<
/// Looks up a localized string similar to Commit....
/// </summary>
public static string CodeExplorer_Commit {
get {
return ResourceManager.GetString("CodeExplorer_Commit", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Display member &names.
=======
/// Sucht eine lokalisierte Zeichenfolge, die Display member &names ähnelt.
>>>>>>>
/// Looks up a localized string similar to Commit....
/// </summary>
public static string CodeExplorer_Commit {
get {
return ResourceManager.GetString("CodeExplorer_Commit", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Display member &names.
<<<<<<<
/// Looks up a localized string similar to Na&vigate.
=======
/// Sucht eine lokalisierte Zeichenfolge, die &Inspect ähnelt.
/// </summary>
public static string CodeExplorer_Inspect {
get {
return ResourceManager.GetString("CodeExplorer_Inspect", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Na&vigate ähnelt.
>>>>>>>
/// Looks up a localized string similar to Na&vigate.
/// Sucht eine lokalisierte Zeichenfolge, die &Inspect ähnelt.
/// </summary>
public static string CodeExplorer_Inspect {
get {
return ResourceManager.GetString("CodeExplorer_Inspect", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Na&vigate ähnelt. |
<<<<<<<
=======
using Rubberduck.Interaction;
using Rubberduck.Parsing.Rewriter;
>>>>>>>
using Rubberduck.Parsing.Rewriter;
<<<<<<<
_factory = factory;
=======
_rewritingManager = rewritingManager;
>>>>>>>
_factory = factory;
_rewritingManager = rewritingManager;
<<<<<<<
var refactoring = new RemoveParametersRefactoring(_state, Vbe, _factory);
refactoring.Refactor(selection.Value);
=======
using (var view = new RemoveParametersDialog(new RemoveParametersViewModel(_state)))
{
var factory = new RemoveParametersPresenterFactory(Vbe, view, _state, _msgbox);
var refactoring = new RemoveParametersRefactoring(Vbe, factory, _rewritingManager);
refactoring.Refactor(selection.Value);
}
>>>>>>>
if (!selection.HasValue)
{
return false;
}
var member = _state.AllUserDeclarations.FindTarget(selection.Value, ValidDeclarationTypes);
if (member == null)
{
return false;
}
if (_state.IsNewOrModified(member.QualifiedModuleName))
{
return false;
}
var parameters = _state.DeclarationFinder.UserDeclarations(DeclarationType.Parameter)
.Where(item => member.Equals(item.ParentScopeDeclaration))
.ToList();
return member.DeclarationType == DeclarationType.PropertyLet
|| member.DeclarationType == DeclarationType.PropertySet
? parameters.Count > 1
: parameters.Any();
}
protected override void OnExecute(object parameter)
{
var selection = Vbe.GetActiveSelection();
var refactoring = new RemoveParametersRefactoring(_state, Vbe, _factory, _rewritingManager);
refactoring.Refactor(selection.Value); |
<<<<<<<
using Rubberduck.UI;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events;
=======
>>>>>>>
using Rubberduck.UI;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events; |
<<<<<<<
.Select(issue => new InspectionResult(this,
string.Format(InspectionsUI.SelfAssignedDeclarationInspectionResultFormat, issue.IdentifierName),
issue));
=======
.Where(result => !IsIgnoringInspectionResultFor(result, AnnotationName))
.Select(issue => new SelfAssignedDeclarationInspectionResult(this, issue));
>>>>>>>
.Where(result => !IsIgnoringInspectionResultFor(result, AnnotationName))
.Select(issue => new InspectionResult(this,
string.Format(InspectionsUI.SelfAssignedDeclarationInspectionResultFormat, issue.IdentifierName),
issue)); |
<<<<<<<
private readonly IRefactoringPresenterFactory _factory;
=======
private readonly IRewritingManager _rewritingManager;
private readonly IRefactoringDialog<RenameViewModel> _view;
>>>>>>>
private readonly IRefactoringPresenterFactory _factory;
<<<<<<<
_factory = factory;
=======
_rewritingManager = rewritingManager;
_view = view;
>>>>>>>
_rewritingManager = rewritingManager;
<<<<<<<
var refactoring = new RenameRefactoring(_vbe, _factory, _msgBox, _state);
=======
var factory = new RenamePresenterFactory(_vbe, _view, _state);
var refactoring = new RenameRefactoring(_vbe, factory, _msgBox, _state, _state.ProjectsProvider, _rewritingManager);
>>>>>>>
var refactoring = new RenameRefactoring(_vbe, _factory, _msgBox, _state, _state.ProjectsProvider, _rewritingManager);
<<<<<<<
=======
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
private bool _isDisposed;
protected virtual void Dispose(bool disposing)
{
if (_isDisposed || !disposing)
{
return;
}
_view?.Dispose();
_isDisposed = true;
}
>>>>>>> |
<<<<<<<
private readonly IVBE _vbe;
=======
private readonly IRewritingManager _rewritingManager;
>>>>>>>
private readonly IVBE _vbe;
private readonly IRewritingManager _rewritingManager;
<<<<<<<
_vbe = vbe;
=======
_rewritingManager = rewritingManager;
>>>>>>>
_vbe = vbe;
_rewritingManager = rewritingManager;
<<<<<<<
var refactoring = new EncapsulateFieldRefactoring(_state, _vbe, _indenter, _factory);
refactoring.Refactor(result.Target);
=======
using (var view = new EncapsulateFieldDialog(new EncapsulateFieldViewModel(_state, _indenter)))
{
var factory = new EncapsulateFieldPresenterFactory(_vbe, _state, view);
var refactoring = new EncapsulateFieldRefactoring(_vbe, _indenter, factory, _rewritingManager);
refactoring.Refactor(result.Target);
}
>>>>>>>
var refactoring = new EncapsulateFieldRefactoring(_state, _vbe, _indenter, _factory, _rewritingManager);
refactoring.Refactor(result.Target); |
<<<<<<<
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Management.Automation;
using System.Net;
=======
>>>>>>>
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Management.Automation;
using System.Net;
<<<<<<<
if (caps.App.EndsWith(".zip"))
{
if (caps.App.StartsWith("http"))
{
caps.App = this.GetAppFileFromWeb(caps.App);
}
Console.WriteLine("\nApp file:\n\t" + caps.App);
ZipFile.ExtractToDirectory(caps.App, caps.App.Remove(caps.App.Length - 4));
Console.WriteLine("\nZip file extract to:\n\t" + caps.App.Remove(caps.App.Length - 4));
this.UninstallApp(caps.AppUserModelId.Remove(caps.AppUserModelId.Length - 4));
this.InstallApp(caps.App.Remove(caps.App.Length - 4));
}
else
{
throw new FailedCommandException("Your app file is \"" + caps.App + "\". App file is not a .zip file.", 13);
}
Process.Start("ActivateStoreApp", caps.AppUserModelId);
session = this.sessionManager.CreateSession(caps);
=======
IStoreApplication app = new StoreApplication(caps.AppUserModelId, this.utils);
app.BackupInitialStates(); // TODO only when newly installed
app.Activate();
session = this.sessionManager.CreateSession(app, caps);
>>>>>>>
if (caps.App.EndsWith(".zip"))
{
if (caps.App.StartsWith("http"))
{
caps.App = this.GetAppFileFromWeb(caps.App);
}
Console.WriteLine("\nApp file:\n\t" + caps.App);
ZipFile.ExtractToDirectory(caps.App, caps.App.Remove(caps.App.Length - 4));
Console.WriteLine("\nZip file extract to:\n\t" + caps.App.Remove(caps.App.Length - 4));
this.UninstallApp(caps.AppUserModelId.Remove(caps.AppUserModelId.Length - 4));
this.InstallApp(caps.App.Remove(caps.App.Length - 4));
}
else
{
throw new FailedCommandException("Your app file is \"" + caps.App + "\". App file is not a .zip file.", 13);
}
IStoreApplication app = new StoreApplication(caps.AppUserModelId, this.utils);
app.BackupInitialStates(); // TODO only when newly installed
app.Activate();
session = this.sessionManager.CreateSession(app, caps); |
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, messageBox.Object, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, messageBox.Object, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, messageBox.Object, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, messageBox.Object, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, messageBox.Object, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, messageBox.Object, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, messageBox.Object, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, messageBox.Object, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, messageBox.Object, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, messageBox.Object, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, messageBox.Object, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, messageBox.Object, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager);
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, rewritingManager); |
<<<<<<<
using Rubberduck.Parsing.Rewriter;
using Rubberduck.Parsing.Symbols.ParsingExceptions;
using Rubberduck.Parsing.VBA.ComReferenceLoading;
using Rubberduck.Parsing.VBA.DeclarationResolving;
using Rubberduck.Parsing.VBA.Extensions;
using Rubberduck.Parsing.VBA.Parsing;
using Rubberduck.Parsing.VBA.ReferenceManagement;
using Rubberduck.VBEditor.ComManagement.TypeLibs;
using Rubberduck.VBEditor.SourceCodeHandling;
=======
using Rubberduck.VBEditor;
>>>>>>>
using Rubberduck.Parsing.Rewriter;
using Rubberduck.Parsing.Symbols.ParsingExceptions;
using Rubberduck.Parsing.VBA.ComReferenceLoading;
using Rubberduck.Parsing.VBA.DeclarationResolving;
using Rubberduck.Parsing.VBA.Extensions;
using Rubberduck.Parsing.VBA.Parsing;
using Rubberduck.Parsing.VBA.ReferenceManagement;
using Rubberduck.VBEditor;
using Rubberduck.VBEditor.ComManagement.TypeLibs;
using Rubberduck.VBEditor.SourceCodeHandling; |
<<<<<<<
public enum SourceControlTab
{
Changes,
Branches,
UnsyncedCommits,
Settings
}
public class SourceControlViewViewModel : ViewModelBase
=======
public sealed class SourceControlViewViewModel : ViewModelBase, IDisposable
>>>>>>>
public enum SourceControlTab
{
Changes,
Branches,
UnsyncedCommits,
Settings
}
public sealed class SourceControlViewViewModel : ViewModelBase, IDisposable |
<<<<<<<
[TestCategory("Inspections")]
public void UnassignedVariable_QuickFixWorks()
=======
public void UnassignedVariable_VariableOnSingleLine_QuickFixWorks()
>>>>>>>
[TestCategory("Inspections")]
public void UnassignedVariable_QuickFixWorks()
<<<<<<<
[TestCategory("Inspections")]
=======
public void UnassignedVariable_VariableOnMultipleLines_QuickFixWorks()
{
const string inputCode =
@"Sub Foo()
Dim _
var1 _
as _
Integer
End Sub";
const string expectedCode =
@"Sub Foo()
End Sub";
//Arrange
var builder = new MockVbeBuilder();
VBComponent component;
var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
var project = vbe.Object.VBProjects.Item(0);
var module = project.VBComponents.Item(0).CodeModule;
var mockHost = new Mock<IHostApplication>();
mockHost.SetupAllProperties();
var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
parser.Parse();
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotAssignedInspection(parser.State);
inspection.GetInspectionResults().First().QuickFixes.First().Fix();
Assert.AreEqual(expectedCode, module.Lines());
}
[TestMethod]
public void UnassignedVariable_MultipleVariablesOnSingleLine_QuickFixWorks()
{
const string inputCode =
@"Sub Foo()
Dim var1 As Integer, var2 As Boolean
End Sub";
// note the extra space after "Integer"--the VBE will remove it
const string expectedCode =
@"Sub Foo()
Dim var1 As Integer
End Sub";
//Arrange
var builder = new MockVbeBuilder();
VBComponent component;
var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
var project = vbe.Object.VBProjects.Item(0);
var module = project.VBComponents.Item(0).CodeModule;
var mockHost = new Mock<IHostApplication>();
mockHost.SetupAllProperties();
var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
parser.Parse();
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotAssignedInspection(parser.State);
inspection.GetInspectionResults().Single(s => s.Target.IdentifierName == "var2").QuickFixes.First().Fix();
Assert.AreEqual(expectedCode, module.Lines());
}
[TestMethod]
public void UnassignedVariable_MultipleVariablesOnMultipleLines_QuickFixWorks()
{
const string inputCode =
@"Sub Foo()
Dim var1 As Integer, _
var2 As Boolean
End Sub";
const string expectedCode =
@"Sub Foo()
Dim var1 As Integer
End Sub";
//Arrange
var builder = new MockVbeBuilder();
VBComponent component;
var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
var project = vbe.Object.VBProjects.Item(0);
var module = project.VBComponents.Item(0).CodeModule;
var mockHost = new Mock<IHostApplication>();
mockHost.SetupAllProperties();
var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
parser.Parse();
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotAssignedInspection(parser.State);
inspection.GetInspectionResults().Single(s => s.Target.IdentifierName == "var2").QuickFixes.First().Fix();
Assert.AreEqual(expectedCode, module.Lines());
}
[TestMethod]
>>>>>>>
public void UnassignedVariable_VariableOnMultipleLines_QuickFixWorks()
{
const string inputCode =
@"Sub Foo()
Dim _
var1 _
as _
Integer
End Sub";
const string expectedCode =
@"Sub Foo()
End Sub";
//Arrange
var builder = new MockVbeBuilder();
VBComponent component;
var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
var project = vbe.Object.VBProjects.Item(0);
var module = project.VBComponents.Item(0).CodeModule;
var mockHost = new Mock<IHostApplication>();
mockHost.SetupAllProperties();
var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
parser.Parse();
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotAssignedInspection(parser.State);
inspection.GetInspectionResults().First().QuickFixes.First().Fix();
Assert.AreEqual(expectedCode, module.Lines());
}
[TestMethod]
public void UnassignedVariable_MultipleVariablesOnSingleLine_QuickFixWorks()
{
const string inputCode =
@"Sub Foo()
Dim var1 As Integer, var2 As Boolean
End Sub";
// note the extra space after "Integer"--the VBE will remove it
const string expectedCode =
@"Sub Foo()
Dim var1 As Integer
End Sub";
//Arrange
var builder = new MockVbeBuilder();
VBComponent component;
var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
var project = vbe.Object.VBProjects.Item(0);
var module = project.VBComponents.Item(0).CodeModule;
var mockHost = new Mock<IHostApplication>();
mockHost.SetupAllProperties();
var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
parser.Parse();
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotAssignedInspection(parser.State);
inspection.GetInspectionResults().Single(s => s.Target.IdentifierName == "var2").QuickFixes.First().Fix();
Assert.AreEqual(expectedCode, module.Lines());
}
[TestMethod]
public void UnassignedVariable_MultipleVariablesOnMultipleLines_QuickFixWorks()
{
const string inputCode =
@"Sub Foo()
Dim var1 As Integer, _
var2 As Boolean
End Sub";
const string expectedCode =
@"Sub Foo()
Dim var1 As Integer
End Sub";
//Arrange
var builder = new MockVbeBuilder();
VBComponent component;
var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
var project = vbe.Object.VBProjects.Item(0);
var module = project.VBComponents.Item(0).CodeModule;
var mockHost = new Mock<IHostApplication>();
mockHost.SetupAllProperties();
var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
parser.Parse();
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotAssignedInspection(parser.State);
inspection.GetInspectionResults().Single(s => s.Target.IdentifierName == "var2").QuickFixes.First().Fix();
Assert.AreEqual(expectedCode, module.Lines());
}
[TestMethod]
[TestCategory("Inspections")] |
<<<<<<<
/// Looks up a localized string similar to Unreachable Case Else: All possible values are handled by prior Case statement(s).
/// </summary>
public static string UnreachableCaseInspection_CaseElse {
get {
return ResourceManager.GetString("UnreachableCaseInspection_CaseElse", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Invalid Type: Case Statement cannot be evaluated as the Select Statement Type.
/// </summary>
public static string UnreachableCaseInspection_TypeMismatch {
get {
return ResourceManager.GetString("UnreachableCaseInspection_TypeMismatch", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unreachable: Case Statement is handled by prior Case statement(s).
/// </summary>
public static string UnreachableCaseInspection_Unreachable {
get {
return ResourceManager.GetString("UnreachableCaseInspection_Unreachable", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Detects Case Clauses that will never execute. .
/// </summary>
public static string UnreachableCaseInspectionMeta {
get {
return ResourceManager.GetString("UnreachableCaseInspectionMeta", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Case Clause(s) cannot be reached.
/// </summary>
public static string UnreachableCaseInspectionName {
get {
return ResourceManager.GetString("UnreachableCaseInspectionName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Case Clause '{0}' cannot be reached.
/// </summary>
public static string UnreachableCaseInspectionResultFormat {
get {
return ResourceManager.GetString("UnreachableCaseInspectionResultFormat", resourceCulture);
}
}
/// <summary>
=======
/// Looks up a localized string similar to Error handling should be restored after using 'On Error Resume Next'..
/// </summary>
public static string UnhandledOnErrorResumeNextInspectionMeta {
get {
return ResourceManager.GetString("UnhandledOnErrorResumeNextInspectionMeta", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unhandled 'On Error Resume Next'.
/// </summary>
public static string UnhandledOnErrorResumeNextInspectionName {
get {
return ResourceManager.GetString("UnhandledOnErrorResumeNextInspectionName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Introduce error handling subroutine.
/// </summary>
public static string UnhandledOnErrorResumeNextInspectionQuickFix {
get {
return ResourceManager.GetString("UnhandledOnErrorResumeNextInspectionQuickFix", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Errors are ignored but never handled again.
/// </summary>
public static string UnhandledOnErrorResumeNextInspectionResultFormat {
get {
return ResourceManager.GetString("UnhandledOnErrorResumeNextInspectionResultFormat", resourceCulture);
}
}
/// <summary>
>>>>>>>
/// Looks up a localized string similar to Unreachable Case Else: All possible values are handled by prior Case statement(s).
/// </summary>
public static string UnreachableCaseInspection_CaseElse {
get {
return ResourceManager.GetString("UnreachableCaseInspection_CaseElse", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Error handling should be restored after using 'On Error Resume Next'..
/// </summary>
public static string UnhandledOnErrorResumeNextInspectionMeta {
get {
return ResourceManager.GetString("UnhandledOnErrorResumeNextInspectionMeta", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Invalid Type: Case Statement cannot be evaluated as the Select Statement Type.
/// </summary>
public static string UnreachableCaseInspection_TypeMismatch {
get {
return ResourceManager.GetString("UnreachableCaseInspection_TypeMismatch", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unhandled 'On Error Resume Next'.
/// </summary>
public static string UnhandledOnErrorResumeNextInspectionName {
get {
return ResourceManager.GetString("UnhandledOnErrorResumeNextInspectionName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unreachable: Case Statement is handled by prior Case statement(s).
/// </summary>
public static string UnreachableCaseInspection_Unreachable {
get {
return ResourceManager.GetString("UnreachableCaseInspection_Unreachable", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Introduce error handling subroutine.
/// </summary>
public static string UnhandledOnErrorResumeNextInspectionQuickFix {
get {
return ResourceManager.GetString("UnhandledOnErrorResumeNextInspectionQuickFix", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Detects Case Clauses that will never execute. .
/// </summary>
public static string UnreachableCaseInspectionMeta {
get {
return ResourceManager.GetString("UnreachableCaseInspectionMeta", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Case Clause(s) cannot be reached.
/// </summary>
public static string UnreachableCaseInspectionName {
get {
return ResourceManager.GetString("UnreachableCaseInspectionName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Case Clause '{0}' cannot be reached.
/// </summary>
public static string UnreachableCaseInspectionResultFormat {
get {
return ResourceManager.GetString("UnreachableCaseInspectionResultFormat", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Errors are ignored but never handled again.
/// </summary>
public static string UnhandledOnErrorResumeNextInspectionResultFormat {
get {
return ResourceManager.GetString("UnhandledOnErrorResumeNextInspectionResultFormat", resourceCulture);
}
}
/// <summary> |
<<<<<<<
using Rubberduck.VBEditor.SourceCodeHandling;
=======
>>>>>>>
using Rubberduck.VBEditor.SourceCodeHandling;
<<<<<<<
var ideMock = vbeBuilder.Build();
var sourceFileHandler = new Mock<ISourceFileHandler>().Object;
ideMock.Setup(m => m.SourceFileHandler).Returns(() => sourceFileHandler);
var ide = ideMock.Object;
var addin = new Mock<IAddIn>().Object;
=======
var addInBuilder = new MockAddInBuilder();
var ide = vbeBuilder.Build().Object;
var addin = addInBuilder.Build().Object;
>>>>>>>
var ideMock = vbeBuilder.Build();
var sourceFileHandler = new Mock<ISourceFileHandler>().Object;
ideMock.Setup(m => m.SourceFileHandler).Returns(() => sourceFileHandler);
var ide = ideMock.Object;
var addInBuilder = new MockAddInBuilder();
var addin = addInBuilder.Build().Object;
<<<<<<<
var ideMock = vbeBuilder.Build();
var sourceFileHandler = new Mock<ISourceFileHandler>().Object;
ideMock.Setup(m => m.SourceFileHandler).Returns(() => sourceFileHandler);
var ide = ideMock.Object;
var addin = new Mock<IAddIn>().Object;
=======
var addInBuilder = new MockAddInBuilder();
var ide = vbeBuilder.Build().Object;
var addin = addInBuilder.Build().Object;
>>>>>>>
var ideMock = vbeBuilder.Build();
var sourceFileHandler = new Mock<ISourceFileHandler>().Object;
ideMock.Setup(m => m.SourceFileHandler).Returns(() => sourceFileHandler);
var ide = ideMock.Object;
var addInBuilder = new MockAddInBuilder();
var addin = addInBuilder.Build().Object; |
<<<<<<<
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.Parsing.VBA;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events;
=======
using Rubberduck.Inspections.Resources;
>>>>>>>
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.Parsing.VBA;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events;
using Rubberduck.Inspections.Resources; |
<<<<<<<
_refreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRefreshCommand, CanExecuteRefreshCommand);
_repeatLastRunCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRepeatLastRunCommand, CanExecuteRepeatLastRunCommand);
_runNotExecutedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunNotExecutedTestsCommand, CanExecuteRunNotExecutedTestsCommand);
_runInconclusiveTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(),ExecuteRunInconclusiveTestsCommand, CanExecuteRunInconclusiveTestsCommand);
_runFailedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunFailedTestsCommand, CanExecuteRunFailedTestsCommand);
_runPassedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunPassedTestsCommand, CanExecuteRunPassedTestsCommand);
_runSelectedTestCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteSelectedTestCommand, CanExecuteSelectedTestCommand);
=======
RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRefreshCommand, CanExecuteRefreshCommand);
RepeatLastRunCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRepeatLastRunCommand, CanExecuteRepeatLastRunCommand);
RunNotExecutedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunNotExecutedTestsCommand, CanExecuteRunNotExecutedTestsCommand);
RunFailedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunFailedTestsCommand, CanExecuteRunFailedTestsCommand);
RunPassedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunPassedTestsCommand, CanExecuteRunPassedTestsCommand);
RunSelectedTestCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteSelectedTestCommand, CanExecuteSelectedTestCommand);
>>>>>>>
RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRefreshCommand, CanExecuteRefreshCommand);
RepeatLastRunCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRepeatLastRunCommand, CanExecuteRepeatLastRunCommand);
RunNotExecutedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunNotExecutedTestsCommand, CanExecuteRunNotExecutedTestsCommand);
RunInconclusiveTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(),ExecuteRunInconclusiveTestsCommand, CanExecuteRunInconclusiveTestsCommand);
RunFailedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunFailedTestsCommand, CanExecuteRunFailedTestsCommand);
RunPassedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunPassedTestsCommand, CanExecuteRunPassedTestsCommand);
RunSelectedTestCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteSelectedTestCommand, CanExecuteSelectedTestCommand);
<<<<<<<
private readonly CommandBase _runInconclusiveTestsCommand;
public CommandBase RunInconclusiveTestsCommand { get { return _runInconclusiveTestsCommand; } }
private readonly CommandBase _runFailedTestsCommand;
public CommandBase RunFailedTestsCommand { get { return _runFailedTestsCommand; } }
=======
public CommandBase RunFailedTestsCommand { get; }
>>>>>>>
public CommandBase RunInconclusiveTestsCommand { get; }
public CommandBase RunFailedTestsCommand { get; } |
<<<<<<<
using Rubberduck.Parsing.Inspections.Abstract;
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events;
=======
using Rubberduck.Inspections.Resources;
>>>>>>>
using Rubberduck.Parsing.Inspections.Abstract;
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events;
using Rubberduck.Inspections.Resources; |
<<<<<<<
var refactoring = new RenameRefactoring(_vbe, _factory, _messageBox, _state);
refactoring.Refactor(result.Target);
=======
using (var view = new RenameDialog(new RenameViewModel(_state)))
{
var factory = new RenamePresenterFactory(_vbe, view, _state);
var refactoring = new RenameRefactoring(_vbe, factory, _messageBox, _state, _state.ProjectsProvider, _rewritingManager);
refactoring.Refactor(result.Target);
}
>>>>>>>
var refactoring = new RenameRefactoring(_vbe, _factory, _messageBox, _state, _state.ProjectsProvider, _rewritingManager);
refactoring.Refactor(result.Target); |
<<<<<<<
private const string Always = "Always";
=======
private const string Never = "Never";
private const string OriginalPath = "OriginalPath";
>>>>>>>
private const string Always = "Always";
private const string OriginalPath = "OriginalPath";
<<<<<<<
private readonly HashSet<string> _imports = new HashSet<string>();
private readonly HashSet<string> _itemTypes = new HashSet<string>();
private readonly Dictionary<string, (bool hasCopyAlways, HashSet<string> items)> _items = new Dictionary<string, (bool hasCopyAlways, HashSet<string> items)>();
private readonly Dictionary<string, HashSet<string>> _references = new Dictionary<string, HashSet<string>>();
private readonly HashSet<string> _customOutputs = new HashSet<string>();
private readonly Dictionary<string, HashSet<string>> _outputGroups = new Dictionary<string, HashSet<string>>();
=======
private string _markerFile;
private HashSet<string> _imports = new HashSet<string>();
private HashSet<string> _itemTypes = new HashSet<string>();
private Dictionary<string, HashSet<string>> _items = new Dictionary<string, HashSet<string>>();
private HashSet<string> _customInputs = new HashSet<string>();
private HashSet<string> _customOutputs = new HashSet<string>();
private HashSet<string> _analyzerReferences = new HashSet<string>();
private HashSet<string> _compilationReferences = new HashSet<string>();
private HashSet<string> _copyReferenceInputs = new HashSet<string>();
private Dictionary<string, HashSet<string>> _outputGroups = new Dictionary<string, HashSet<string>>();
>>>>>>>
private string _markerFile;
private readonly HashSet<string> _imports = new HashSet<string>();
private readonly HashSet<string> _itemTypes = new HashSet<string>();
private readonly Dictionary<string, (bool hasCopyAlways, HashSet<string> items)> _items = new Dictionary<string, (bool hasCopyAlways, HashSet<string> items)>();
private HashSet<string> _customInputs = new HashSet<string>();
private HashSet<string> _customOutputs = new HashSet<string>();
private HashSet<string> _analyzerReferences = new HashSet<string>();
private HashSet<string> _compilationReferences = new HashSet<string>();
private HashSet<string> _copyReferenceInputs = new HashSet<string>();
private readonly HashSet<string> _customOutputs = new HashSet<string>();
private readonly Dictionary<string, HashSet<string>> _outputGroups = new Dictionary<string, HashSet<string>>();
<<<<<<<
if (e.ProjectChanges.TryGetValue(UpToDateCheckOutput.SchemaName, out var outputs) &&
outputs.Difference.AnyChanges)
{
_customOutputs.Clear();
_customOutputs.AddRange(outputs.After.Items.Select(item => item.Value[FullPath]));
}
=======
>>>>>>>
if (e.ProjectChanges.TryGetValue(UpToDateCheckOutput.SchemaName, out var outputs) &&
outputs.Difference.AnyChanges)
{
_customOutputs.Clear();
_customOutputs.AddRange(outputs.After.Items.Select(item => item.Value[FullPath]));
} |
<<<<<<<
var declaratioFinder = new DeclarationFinder(
new List<Declaration>(),
new List<IAnnotation>(),
new List<UnboundMemberDeclaration>(),
new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>(),
new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>());
=======
var declaratioFinder = new DeclarationFinder(new List<Declaration>(), new List<IParseTreeAnnotation>(),
new List<UnboundMemberDeclaration>(), new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>());
>>>>>>>
var declaratioFinder = new DeclarationFinder(
new List<Declaration>(),
new List<IParseTreeAnnotation>(),
new List<UnboundMemberDeclaration>(),
new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>(),
new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>());
<<<<<<<
var declarationFinder = new DeclarationFinder(
new List<Declaration>(),
new List<IAnnotation>(),
new List<UnboundMemberDeclaration>(),
new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>(),
new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>());
declarationFinderProviderMock.SetupGet(m => m.DeclarationFinder).Returns(declarationFinder);
=======
var declaratioFinder = new DeclarationFinder(new List<Declaration>(), new List<IParseTreeAnnotation>(),
new List<UnboundMemberDeclaration>(), new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>());
declarationFinderProviderMock.SetupGet(m => m.DeclarationFinder).Returns(declaratioFinder);
>>>>>>>
var declarationFinder = new DeclarationFinder(
new List<Declaration>(),
new List<IParseTreeAnnotation>(),
new List<UnboundMemberDeclaration>(),
new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>(),
new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>());
declarationFinderProviderMock.SetupGet(m => m.DeclarationFinder).Returns(declarationFinder); |
<<<<<<<
[AppliesTo(ProjectCapability.DotNet)]
internal class SingleFileGeneratorFactoryAggregator : IVsSingleFileGeneratorFactory
=======
[AppliesTo(ProjectCapability.CSharpOrVisualBasicOrFSharp)]
internal class SingleFileGeneratorFactoryAggregator : IVsSingleFileGeneratorFactory, IDisposable
>>>>>>>
[AppliesTo(ProjectCapability.DotNet)]
internal class SingleFileGeneratorFactoryAggregator : IVsSingleFileGeneratorFactory, IDisposable |
<<<<<<<
new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, userInteraction, null, new Mock<IExtractInterfaceConflictFinderFactory>().Object, new CodeBuilder()),
=======
new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, userInteraction, null, CreateCodeBuilder()),
>>>>>>>
new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, userInteraction, null, new Mock<IExtractInterfaceConflictFinderFactory>().Object, CreateCodeBuilder()), |
<<<<<<<
using Rubberduck.VBEditor.Events;
using Rubberduck.UI.CodeExplorer;
=======
using Rubberduck.VBEditor;
using Rubberduck.VBEditor.ComManagement;
>>>>>>>
using Rubberduck.VBEditor.Events;
using Rubberduck.UI.CodeExplorer;
using Rubberduck.VBEditor;
using Rubberduck.VBEditor.ComManagement;
<<<<<<<
VbeEvents = MockVbeEvents.CreateMockVbeEvents(Vbe);
=======
ProjectsRepository = new Mock<IProjectsRepository>();
ProjectsRepository.Setup(x => x.Project(It.IsAny<string>())).Returns(VbProject.Object);
ProjectsRepository.Setup(x => x.Component(It.IsAny<QualifiedModuleName>())).Returns(VbComponent.Object);
>>>>>>>
VbeEvents = MockVbeEvents.CreateMockVbeEvents(Vbe);
ProjectsRepository = new Mock<IProjectsRepository>();
ProjectsRepository.Setup(x => x.Project(It.IsAny<string>())).Returns(VbProject.Object);
ProjectsRepository.Setup(x => x.Component(It.IsAny<QualifiedModuleName>())).Returns(VbComponent.Object);
<<<<<<<
VbeEvents = MockVbeEvents.CreateMockVbeEvents(Vbe);
=======
ProjectsRepository = new Mock<IProjectsRepository>();
ProjectsRepository.Setup(x => x.Project(It.IsAny<string>())).Returns(VbProject.Object);
ProjectsRepository.Setup(x => x.Component(It.IsAny<QualifiedModuleName>())).Returns(VbComponent.Object);
>>>>>>>
VbeEvents = MockVbeEvents.CreateMockVbeEvents(Vbe);
ProjectsRepository = new Mock<IProjectsRepository>();
ProjectsRepository.Setup(x => x.Project(It.IsAny<string>())).Returns(VbProject.Object);
ProjectsRepository.Setup(x => x.Component(It.IsAny<QualifiedModuleName>())).Returns(VbComponent.Object); |
<<<<<<<
=======
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
>>>>>>>
<<<<<<<
var item = new Declaration(qualifiedName, hostApp, hostApp, Tokens.Variant, string.Empty, false, false,
Accessibility.Global, DeclarationType.BracketedExpression, context, context.GetSelection(), true, null);
=======
var item = new Declaration(qualifiedName, hostApp, hostApp, Tokens.Variant, string.Empty, false, false, Accessibility.Global, DeclarationType.BracketedExpression, context, null, context.GetSelection(), true, null);
>>>>>>>
var item = new Declaration(qualifiedName, hostApp, hostApp, Tokens.Variant, string.Empty, false, false, Accessibility.Global, DeclarationType.BracketedExpression, context, null, context.GetSelection(), true, null); |
<<<<<<<
using Rubberduck.UI;
using Rubberduck.VBERuntime;
=======
using System;
using System.Collections.ObjectModel;
>>>>>>>
using Rubberduck.UI;
using Rubberduck.VBERuntime;
using System;
<<<<<<<
var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
=======
var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, new ReadOnlyCollection<Type>(new List<Type>()));
>>>>>>>
var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object, new List<Type>());
<<<<<<<
var viewModel = new GeneralSettingsViewModel(GetNondefaultConfig(), GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
=======
var viewModel = new GeneralSettingsViewModel(GetNondefaultConfig(), GetOperatingSystemMock().Object, new ReadOnlyCollection<Type>(new List<Type>()));
>>>>>>>
var viewModel = new GeneralSettingsViewModel(GetNondefaultConfig(), GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object, new List<Type>());
<<<<<<<
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
=======
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, new ReadOnlyCollection<Type>(new List<Type>()));
>>>>>>>
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object, new List<Type>());
<<<<<<<
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
=======
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, new ReadOnlyCollection<Type>(new List<Type>()));
>>>>>>>
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object, new List<Type>());
<<<<<<<
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
=======
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, new ReadOnlyCollection<Type>(new List<Type>()));
>>>>>>>
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object, new List<Type>());
<<<<<<<
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
=======
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, new ReadOnlyCollection<Type>(new List<Type>()));
>>>>>>>
var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object, new List<Type>()); |
<<<<<<<
using Rubberduck.UI.Refactorings;
using Rubberduck.UI.Refactorings.Rename;
using Rubberduck.UI.Settings;
=======
>>>>>>>
using Rubberduck.UI.Settings;
<<<<<<<
using Rubberduck.VBEditor.ComManagement.TypeLibs;
=======
using Rubberduck.Parsing.Common;
using Rubberduck.Refactorings;
using Rubberduck.VBEditor;
>>>>>>>
using Rubberduck.VBEditor.ComManagement.TypeLibs;
<<<<<<<
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
=======
using Rubberduck.AutoComplete;
using Rubberduck.AutoComplete.Service;
using Rubberduck.CodeAnalysis.CodeMetrics;
using Rubberduck.Parsing.Rewriter;
using Rubberduck.Parsing.VBA.ComReferenceLoading;
using Rubberduck.Parsing.VBA.DeclarationResolving;
using Rubberduck.Parsing.VBA.Parsing;
using Rubberduck.Parsing.VBA.ReferenceManagement;
using Rubberduck.VBEditor.ComManagement.TypeLibs;
>>>>>>>
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
<<<<<<<
RegisterSettingsViewModel(container);
RegisterRefactoringDialogs(container);
=======
>>>>>>>
RegisterSettingsViewModel(container);
RegisterRefactoringDialogs(container); |
<<<<<<<
var conflictFinderFactory = new TestConflictFinderFactory() as IExtractInterfaceConflictFinderFactory;
return new ExtractInterfaceRefactoring(baseRefactoring, state, userInteraction, selectionService, conflictFinderFactory, CreateCodeBuilder());
=======
return new ExtractInterfaceRefactoring(baseRefactoring, state, userInteraction, selectionService, CreateCodeBuilder());
>>>>>>>
var conflictFinderFactory = new TestConflictFinderFactory() as IExtractInterfaceConflictFinderFactory;
return new ExtractInterfaceRefactoring(baseRefactoring, state, userInteraction, selectionService, conflictFinderFactory, CreateCodeBuilder());
<<<<<<<
private class TestConflictFinderFactory : IExtractInterfaceConflictFinderFactory
{
public IExtractInterfaceConflictFinder Create(IDeclarationFinderProvider declarationFinderProvider, string projectId)
{
return new ExtractInterfaceConflictFinder(declarationFinderProvider, projectId);
}
}
=======
private static ICodeBuilder CreateCodeBuilder()
=> new CodeBuilder(new Indenter(null, CreateIndenterSettings));
private static IndenterSettings CreateIndenterSettings()
{
var s = IndenterSettingsTests.GetMockIndenterSettings();
s.VerticallySpaceProcedures = true;
s.LinesBetweenProcedures = 1;
return s;
}
>>>>>>>
private class TestConflictFinderFactory : IExtractInterfaceConflictFinderFactory
{
public IExtractInterfaceConflictFinder Create(IDeclarationFinderProvider declarationFinderProvider, string projectId)
{
return new ExtractInterfaceConflictFinder(declarationFinderProvider, projectId);
}
}
private static ICodeBuilder CreateCodeBuilder()
=> new CodeBuilder(new Indenter(null, CreateIndenterSettings));
private static IndenterSettings CreateIndenterSettings()
{
var s = IndenterSettingsTests.GetMockIndenterSettings();
s.VerticallySpaceProcedures = true;
s.LinesBetweenProcedures = 1;
return s;
} |
<<<<<<<
=======
using Rubberduck.Resources;
>>>>>>>
using Rubberduck.Resources;
<<<<<<<
return _codeBuilder.BuildMemberBlockFromPrototype(mbed, accessibility: Tokens.Private, newIdentifier: $"{interfaceName}_{member.IdentifierName}", content: memberBody);
=======
return _codeBuilder.BuildMemberBlockFromPrototype(mbed, accessibility: Accessibility.Private, newIdentifier: $"{interfaceName}_{member.IdentifierName}", content: _memberBody);
>>>>>>>
return _codeBuilder.BuildMemberBlockFromPrototype(mbed, accessibility: Accessibility.Private, newIdentifier: $"{interfaceName}_{member.IdentifierName}", content: memberBody);
<<<<<<<
if (!_codeBuilder.TryBuildPropertyGetCodeBlock(variable, implementingMemberName, out var propertyGet, Tokens.Private, memberBody))
=======
if (!_codeBuilder.TryBuildPropertyGetCodeBlock(variable, $"{interfaceName}_{variable.IdentifierName}", out var propertyGet, Accessibility.Private, _memberBody))
>>>>>>>
if (!_codeBuilder.TryBuildPropertyGetCodeBlock(variable, $"{interfaceName}_{variable.IdentifierName}", out var propertyGet, Accessibility.Private, memberBody))
<<<<<<<
if (!_codeBuilder.TryBuildPropertyLetCodeBlock(variable, implementingMemberName, out var propertyLet, Tokens.Private, memberBody))
=======
if (!_codeBuilder.TryBuildPropertyLetCodeBlock(variable, $"{interfaceName}_{variable.IdentifierName}", out var propertyLet, Accessibility.Private, _memberBody))
>>>>>>>
if (!_codeBuilder.TryBuildPropertyLetCodeBlock(variable, $"{interfaceName}_{variable.IdentifierName}", out var propertyLet, Accessibility.Private, memberBody))
<<<<<<<
if (!_codeBuilder.TryBuildPropertySetCodeBlock(variable, implementingMemberName, out var propertySet, Tokens.Private, memberBody))
=======
if (!_codeBuilder.TryBuildPropertySetCodeBlock(variable, $"{interfaceName}_{variable.IdentifierName}", out var propertySet, Accessibility.Private, _memberBody))
>>>>>>>
if (!_codeBuilder.TryBuildPropertySetCodeBlock(variable, $"{interfaceName}_{variable.IdentifierName}", out var propertySet, Accessibility.Private, memberBody)) |
<<<<<<<
var vm = new CodeExplorerViewModel(new FolderHelper(state), state, removeCommand, _generalSettingsProvider.Object, _windowSettingsProvider.Object, uiDispatcher.Object, vbe.Object);
vm.ExportAllCommand = new ExportAllCommand(vbe.Object, mockFolderBrowserFactory.Object);
=======
var vm = new CodeExplorerViewModel(new FolderHelper(state, vbe.Object), state, removeCommand, _generalSettingsProvider.Object, _windowSettingsProvider.Object, uiDispatcher.Object, vbe.Object);
vm.ExportAllCommand = new ExportAllCommand(null, mockFolderBrowserFactory.Object);
>>>>>>>
var vm = new CodeExplorerViewModel(new FolderHelper(state, vbe.Object), state, removeCommand, _generalSettingsProvider.Object, _windowSettingsProvider.Object, uiDispatcher.Object, vbe.Object);
vm.ExportAllCommand = new ExportAllCommand(vbe.Object, mockFolderBrowserFactory.Object); |
<<<<<<<
=======
using Rubberduck.AutoComplete;
using Rubberduck.CodeAnalysis.CodeMetrics;
>>>>>>>
using Rubberduck.AutoComplete;
using Rubberduck.CodeAnalysis.CodeMetrics;
<<<<<<<
using Rubberduck.Parsing.VBA.DeclarationCaching;
using Rubberduck.Parsing.VBA.Parsing.ParsingExceptions;
using Rubberduck.UI.AddRemoveReferences;
using Rubberduck.UnitTesting.Settings;
=======
>>>>>>>
using Rubberduck.Parsing.VBA.DeclarationCaching;
using Rubberduck.Parsing.VBA.Parsing.ParsingExceptions;
using Rubberduck.UI.AddRemoveReferences;
using Rubberduck.UnitTesting.Settings; |
<<<<<<<
return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
.Select(context => new ObsoleteCommentSyntaxInspectionResult(this, new QualifiedContext<ParserRuleContext>(context.ModuleName, context.Context)));
=======
return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line))
.Select(context => new ObsoleteCommentSyntaxInspectionResult(this, context, GetQualifiedMemberName(context)));
>>>>>>>
return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
.Select(context => new ObsoleteCommentSyntaxInspectionResult(this, context, GetQualifiedMemberName(context))); |
<<<<<<<
public RenameDeclarationQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRewritingManager rewritingManager)
: base(typeof(HungarianNotationInspection), typeof(UseMeaningfulNameInspection), typeof(DefaultProjectNameInspection))
=======
public RenameDeclarationQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox)
: base(typeof(HungarianNotationInspection), typeof(UseMeaningfulNameInspection), typeof(DefaultProjectNameInspection), typeof(UnderscoreInPublicClassModuleMemberInspection))
>>>>>>>
public RenameDeclarationQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRewritingManager rewritingManager)
: base(typeof(HungarianNotationInspection), typeof(UseMeaningfulNameInspection), typeof(DefaultProjectNameInspection), typeof(UnderscoreInPublicClassModuleMemberInspection)) |
<<<<<<<
var interfaceMember = Declarations.FindInterfaceMember(interfaceImplementation);
var message = string.Format(RubberduckUI.Refactoring_TargetIsInterfaceMemberImplementation, declaration.IdentifierName, interfaceMember.ComponentName, interfaceMember.IdentifierName);
var args = new RefactoringConfirmEventArgs(message) {Confirm = true};
ConfirmReorderParameter?.Invoke(this, args);
return args.Confirm ? interfaceMember : null;
=======
var interfaceMember = member.InterfaceMemberImplemented;
var message =
string.Format(RubberduckUI.Refactoring_TargetIsInterfaceMemberImplementation, TargetDeclaration.IdentifierName, interfaceMember.ComponentName, interfaceMember.IdentifierName);
return _messageBox.ConfirmYesNo(message, RubberduckUI.ReorderParamsDialog_TitleText) ? interfaceMember : null;
>>>>>>>
var interfaceMember = member.InterfaceMemberImplemented;
var message =
string.Format(RubberduckUI.Refactoring_TargetIsInterfaceMemberImplementation, TargetDeclaration.IdentifierName, interfaceMember.ComponentName, interfaceMember.IdentifierName);
var args = new RefactoringConfirmEventArgs(message) {Confirm = true};
ConfirmReorderParameter?.Invoke(this, args);
return args.Confirm ? interfaceMember : null; |
<<<<<<<
using Rubberduck.VBEditor.Application;
=======
using Rubberduck.UI;
>>>>>>>
using Rubberduck.VBEditor.Application;
using Rubberduck.UI;
<<<<<<<
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotUsedInspection(parser.State);
=======
var inspection = new VariableNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotUsedInspection(parser.State);
<<<<<<<
var inspection = new VariableNotUsedInspection(parser.State);
=======
var inspection = new VariableNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotUsedInspection(parser.State);
<<<<<<<
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotUsedInspection(parser.State);
=======
var inspection = new VariableNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotUsedInspection(parser.State);
<<<<<<<
var inspection = new VariableNotUsedInspection(parser.State);
=======
var inspection = new VariableNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotUsedInspection(parser.State);
<<<<<<<
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotUsedInspection(parser.State);
=======
var inspection = new VariableNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new VariableNotUsedInspection(parser.State);
<<<<<<<
var inspection = new VariableNotUsedInspection(parser.State);
=======
var inspection = new VariableNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new VariableNotUsedInspection(parser.State);
<<<<<<<
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new VariableNotUsedInspection(parser.State);
=======
var inspection = new VariableNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new VariableNotUsedInspection(parser.State);
<<<<<<<
var inspection = new VariableNotUsedInspection(parser.State);
=======
var inspection = new VariableNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new VariableNotUsedInspection(parser.State); |
<<<<<<<
public RubberduckMenu(VBE vbe, AddIn addIn, Configuration config, IRubberduckParser parser, IEnumerable<IInspection> inspections)
=======
public RubberduckMenu(VBE vbe, AddIn addIn, IConfigurationService configService, Parser parser, IEnumerable<IInspection> inspections)
>>>>>>>
public RubberduckMenu(VBE vbe, AddIn addIn, IConfigurationService configService, IRubberduckParser parser, IEnumerable<IInspection> inspections) |
<<<<<<<
[Test]
[Category("Inspections")]
public void InspectionName()
{
const string inspectionName = "ObjectVariableNotSetInspection";
var inspection = new ObjectVariableNotSetInspection(null);
Assert.AreEqual(inspectionName, inspection.Name);
}
private void AssertInputCodeYieldsExpectedInspectionResultCount(string inputCode, int expected)
=======
private void AssertInputCodeYieldsExpectedInspectionResultCount(string inputCode, int expected, params string[] testLibraries)
>>>>>>>
[Test]
[Category("Inspections")]
public void InspectionName()
{
const string inspectionName = "ObjectVariableNotSetInspection";
var inspection = new ObjectVariableNotSetInspection(null);
Assert.AreEqual(inspectionName, inspection.Name);
}
private void AssertInputCodeYieldsExpectedInspectionResultCount(string inputCode, int expected, params string[] testLibraries) |
<<<<<<<
private readonly ICodePaneWrapperFactory _wrapperFactory;
=======
private readonly INavigateImplementations _navigateImplementations;
private readonly IRubberduckCodePaneFactory _factory;
>>>>>>>
private readonly ICodePaneWrapperFactory _wrapperFactory;
private readonly INavigateImplementations _navigateImplementations;
<<<<<<<
public RefactorMenu(VBE vbe, AddIn addin, IRubberduckParser parser, IActiveCodePaneEditor editor, ICodePaneWrapperFactory wrapperFactory)
=======
public RefactorMenu(VBE vbe, AddIn addin, IRubberduckParser parser, IActiveCodePaneEditor editor, INavigateImplementations navigateImplementations, IRubberduckCodePaneFactory factory)
>>>>>>>
public RefactorMenu(VBE vbe, AddIn addin, IRubberduckParser parser, IActiveCodePaneEditor editor, INavigateImplementations navigateImplementations, ICodePaneWrapperFactory wrapperFactory)
<<<<<<<
_wrapperFactory = wrapperFactory;
=======
_navigateImplementations = navigateImplementations;
_factory = factory;
>>>>>>>
_navigateImplementations = navigateImplementations;
_wrapperFactory = wrapperFactory;
<<<<<<<
private void ShowImplementationsToolwindow(IEnumerable<Declaration> implementations, string name)
{
// throws a COMException if toolwindow was already closed
var window = new SimpleListControl(string.Format(RubberduckUI.AllImplementations_Caption, name));
var presenter = new ImplementationsListDockablePresenter(IDE, AddIn, window, implementations, _wrapperFactory);
presenter.Show();
}
=======
>>>>>>>
<<<<<<<
FindAllImplementations();
}
public void FindAllImplementations()
{
var codePane = _wrapperFactory.Create(IDE.ActiveCodePane);
var selection = new QualifiedSelection(new QualifiedModuleName(codePane.CodeModule.Parent), codePane.Selection);
var progress = new ParsingProgressPresenter();
var parseResult = progress.Parse(_parser, IDE.ActiveVBProject);
var implementsStatement = parseResult.Declarations.FindInterfaces()
.SelectMany(i => i.References.Where(reference => reference.Context.Parent is VBAParser.ImplementsStmtContext))
.SingleOrDefault(r => r.QualifiedModuleName == selection.QualifiedName && r.Selection.Contains(selection.Selection));
if (implementsStatement != null)
{
FindAllImplementations(implementsStatement.Declaration, parseResult);
}
var member = parseResult.Declarations.FindInterfaceImplementationMembers()
.SingleOrDefault(m => m.Project == selection.QualifiedName.Project
&& m.ComponentName == selection.QualifiedName.ComponentName
&& m.Selection.Contains(selection.Selection)) ??
parseResult.Declarations.FindInterfaceMembers()
.SingleOrDefault(m => m.Project == selection.QualifiedName.Project
&& m.ComponentName == selection.QualifiedName.ComponentName
&& m.Selection.Contains(selection.Selection));
if (member == null)
{
return;
}
FindAllImplementations(member, parseResult);
}
public void FindAllImplementations(Declaration target)
{
var progress = new ParsingProgressPresenter();
var parseResult = progress.Parse(_parser, IDE.ActiveVBProject);
FindAllImplementations(target, parseResult);
}
private void FindAllImplementations(Declaration target, VBProjectParseResult parseResult)
{
string name;
var implementations = (target.DeclarationType == DeclarationType.Class
? FindAllImplementationsOfClass(target, parseResult, out name)
: FindAllImplementationsOfMember(target, parseResult, out name)) ??
new List<Declaration>();
var declarations = implementations as IList<Declaration> ?? implementations.ToList();
var implementationsCount = declarations.Count();
if (implementationsCount == 1)
{
// if there's only 1 implementation, just jump to it:
ImplementationsListDockablePresenter.OnNavigateImplementation(IDE, declarations.First());
}
else if (implementationsCount > 1)
{
// if there's more than one implementation, show the dockable navigation window:
try
{
ShowImplementationsToolwindow(declarations, name);
}
catch (COMException)
{
// the exception is related to the docked control host instance,
// trying again will work (I know, that's bad bad bad code)
ShowImplementationsToolwindow(declarations, name);
}
}
else
{
var message = string.Format(RubberduckUI.AllImplementations_NoneFound, name);
var caption = string.Format(RubberduckUI.AllImplementations_Caption, name);
System.Windows.Forms.MessageBox.Show(message, caption, MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
private IEnumerable<Declaration> FindAllImplementationsOfClass(Declaration target, VBProjectParseResult parseResult, out string name)
{
if (target.DeclarationType != DeclarationType.Class)
{
name = string.Empty;
return null;
}
var result = target.References
.Where(reference => reference.Context.Parent is VBAParser.ImplementsStmtContext)
.SelectMany(reference => parseResult.Declarations[reference.QualifiedModuleName.ComponentName])
.ToList();
name = target.ComponentName;
return result;
}
private IEnumerable<Declaration> FindAllImplementationsOfMember(Declaration target, VBProjectParseResult parseResult, out string name)
{
if (!target.DeclarationType.HasFlag(DeclarationType.Member))
{
name = string.Empty;
return null;
}
var isInterface = parseResult.Declarations.FindInterfaces()
.Select(i => i.QualifiedName.QualifiedModuleName.ToString())
.Contains(target.QualifiedName.QualifiedModuleName.ToString());
if (isInterface)
{
name = target.ComponentName + "." + target.IdentifierName;
return parseResult.Declarations.FindInterfaceImplementationMembers(target.IdentifierName)
.Where(item => item.IdentifierName == target.ComponentName + "_" + target.IdentifierName);
}
var member = parseResult.Declarations.FindInterfaceMember(target);
name = member.ComponentName + "." + member.IdentifierName;
return parseResult.Declarations.FindInterfaceImplementationMembers(member.IdentifierName)
.Where(item => item.IdentifierName == member.ComponentName + "_" + member.IdentifierName);
=======
_navigateImplementations.Find();
>>>>>>>
_navigateImplementations.Find(); |
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager);
<<<<<<<
private string RemoveParams(string inputCode, bool passInTarget = false, Selection? selection = null, IEnumerable<int> paramIndices = null)
=======
[Test]
[Category("Refactorings")]
[Category("Remove Parameters")]
public void Presenter_Accept_AutoMarksSingleParamAsRemoved()
{
//Input
const string inputCode =
@"Private Sub Foo(ByVal arg1 As Integer)
End Sub";
var selection = new Selection(1, 15, 1, 15);
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
using(var state = MockParser.CreateAndParse(vbe.Object))
{
var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
var model = new RemoveParametersModel(state, qualifiedSelection, new Mock<IMessageBox>().Object);
model.RemoveParameters = new[] { model.Parameters[0] }.ToList();
var factory = new RemoveParametersPresenterFactory(vbe.Object, null, state, null);
var presenter = factory.Create();
Assert.IsTrue(model.Parameters[0].Declaration.Equals(presenter.Show().Parameters[0].Declaration));
}
}
[Test]
[Category("Refactorings")]
[Category("Remove Parameters")]
public void Presenter_ParameterlessTargetReturnsNullModel()
{
//Input
const string inputCode =
@"Private Sub Foo()
End Sub";
var selection = new Selection(1, 15, 1, 15);
var builder = new MockVbeBuilder();
var projectBuilder = builder.ProjectBuilder("TestProject1", ProjectProtection.Unprotected);
projectBuilder.AddComponent("Module1", ComponentType.StandardModule, inputCode, selection);
var project = projectBuilder.Build();
builder.AddProject(project);
var vbe = builder.Build();
using (var state = MockParser.CreateAndParse(vbe.Object))
{
var factory = new RemoveParametersPresenterFactory(vbe.Object, null, state, new Mock<IMessageBox>().Object);
var presenter = factory.Create();
Assert.AreEqual(null, presenter.Show());
}
}
[Test]
[Category("Refactorings")]
[Category("Remove Parameters")]
public void Factory_NullSelectionNullReturnsNullPresenter()
{
//Input
const string inputCode =
@"Private Sub Foo()
End Sub";
var builder = new MockVbeBuilder();
var projectBuilder = builder.ProjectBuilder("TestProject1", ProjectProtection.Unprotected);
projectBuilder.AddComponent("Module1", ComponentType.StandardModule, inputCode);
var project = projectBuilder.Build();
builder.AddProject(project);
var vbe = builder.Build();
vbe.Setup(v => v.ActiveCodePane).Returns((ICodePane)null);
using (var state = MockParser.CreateAndParse(vbe.Object))
{
var factory = new RemoveParametersPresenterFactory(vbe.Object, null, state, null);
Assert.IsNull(factory.Create());
}
}
private static string RemoveParams(string inputCode, bool passInTarget = false, Selection? selection = null, IEnumerable<int> paramIndices = null)
>>>>>>>
private static string RemoveParams(string inputCode, bool passInTarget = false, Selection? selection = null, IEnumerable<int> paramIndices = null)
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object, rewritingManager); |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.