Automatic code cleanup

Author: mkaring

Assets/resharper.png

@@ -65,7 +65,7 @@ internal static int Main(string[] args) {
 						parameters.Project = proj;
 					}
 					catch (Exception ex) {
-						WriteLineWithColor(ConsoleColor.Red, 
+						WriteLineWithColor(ConsoleColor.Red,
 							string.Format(Resources.Culture, Resources.ErrorLoadingProjectFailed, ex.ToString()));
 						return -1;
 					}
@@ -91,7 +91,8 @@ internal static int Main(string[] args) {
 							}
 							catch (Exception ex) {
 								WriteLineWithColor(ConsoleColor.Red,
-									string.Format(Resources.Culture, Resources.ErrorLoadingProjectFailed, ex.ToString()));
+									string.Format(Resources.Culture, Resources.ErrorLoadingProjectFailed,
+										ex.ToString()));
 								return -1;
 							}
 						}
@@ -109,8 +110,9 @@ internal static int Main(string[] args) {
 					proj.Debug = debug.HasValue();
 					parameters.Project = proj;
 				}
-				
-				parameters.ConfigureLogging = builder => builder.AddConsole(b => b.IncludeScopes = false).SetMinimumLevel(GetLogLevel(verbosity));
+
+				parameters.ConfigureLogging = builder =>
+					builder.AddConsole(b => b.IncludeScopes = false).SetMinimumLevel(GetLogLevel(verbosity));
 
 				int retVal = await RunProject(parameters);
 
@@ -132,7 +134,7 @@ internal static int Main(string[] args) {
 				return cmd.Execute(args);
 			}
 			catch (Exception ex) {
-				WriteLineWithColor(ConsoleColor.Red, 
+				WriteLineWithColor(ConsoleColor.Red,
 					string.Format(Resources.Culture, Resources.ErrorUnexpected, ex.ToString()));
 
 				// ReSharper disable once InvertIf
@@ -148,6 +150,7 @@ internal static int Main(string[] args) {
 				Console.Title = originalTitle;
 			}
 		}
+
 		private static ConfuserProject LoadConfuserProject(string projFile) {
 			var proj = new ConfuserProject();
 			var xmlDoc = new XmlDocument();
@@ -188,7 +191,6 @@ private static LogLevel GetLogLevel(CommandOption verbosityOption) {
 				default:
 					return LogLevel.Information;
 			}
-
 		}
 
 		private static bool NeedPause() =>

Confuser.CLI/Program.cs

@@ -9,9 +9,11 @@ public sealed class EmptyProtectionParameters : IProtectionParameters {
 
 		IImmutableList<IDnlibDef> IProtectionParameters.Targets => ImmutableArray.Create<IDnlibDef>();
 
-		private EmptyProtectionParameters() { }
+		private EmptyProtectionParameters() {
+		}
 
-		T IProtectionParameters.GetParameter<T>(IConfuserContext context, IDnlibDef target, IProtectionParameter<T> parameter) {
+		T IProtectionParameters.GetParameter<T>(IConfuserContext context, IDnlibDef target,
+			IProtectionParameter<T> parameter) {
 			if (context == null) throw new ArgumentNullException(nameof(context));
 			if (target == null) throw new ArgumentNullException(nameof(target));
 			if (parameter == null) throw new ArgumentNullException(nameof(parameter));

Confuser.Core.Exports/EmptyProtectionParameters.cs

@@ -88,11 +88,13 @@ void PopulateBlockHeaders(HashSet<Instruction> blockHeaders, HashSet<Instruction
 					if (i + 1 < body.Instructions.Count)
 						blockHeaders.Add(body.Instructions[i + 1]);
 				}
-				else if ((instr.OpCode.FlowControl == FlowControl.Throw || instr.OpCode.FlowControl == FlowControl.Return) &&
+				else if ((instr.OpCode.FlowControl == FlowControl.Throw ||
+				          instr.OpCode.FlowControl == FlowControl.Return) &&
 				         i + 1 < body.Instructions.Count) {
 					blockHeaders.Add(body.Instructions[i + 1]);
 				}
 			}
+
 			blockHeaders.Add(body.Instructions[0]);
 			foreach (ExceptionHandler eh in body.ExceptionHandlers) {
 				blockHeaders.Add(eh.TryStart);
@@ -117,7 +119,8 @@ void SplitBlocks(HashSet<Instruction> blockHeaders, HashSet<Instruction> entryHe
 						var type = ControlFlowBlockType.Normal;
 						if (entryHeaders.Contains(currentBlockHdr) || currentBlockHdr == body.Instructions[0])
 							type |= ControlFlowBlockType.Entry;
-						if (footer.OpCode.FlowControl == FlowControl.Return || footer.OpCode.FlowControl == FlowControl.Throw)
+						if (footer.OpCode.FlowControl == FlowControl.Return ||
+						    footer.OpCode.FlowControl == FlowControl.Throw)
 							type |= ControlFlowBlockType.Exit;
 
 						blocks.Add(new ControlFlowBlock(currentBlockId, type, currentBlockHdr, footer));
@@ -129,6 +132,7 @@ void SplitBlocks(HashSet<Instruction> blockHeaders, HashSet<Instruction> entryHe
 
 				instrBlocks[i] = currentBlockId;
 			}
+
 			if (blocks.Count == 0 || blocks[blocks.Count - 1].Id != currentBlockId) {
 				Instruction footer = body.Instructions[body.Instructions.Count - 1];
 
@@ -160,6 +164,7 @@ void LinkBlocks() {
 					}
 				}
 			}
+
 			for (int i = 0; i < blocks.Count; i++) {
 				if (blocks[i].Footer.OpCode.FlowControl != FlowControl.Branch &&
 				    blocks[i].Footer.OpCode.FlowControl != FlowControl.Return &&

Confuser.Core.Exports/Helpers/ControlFlowGraph.cs

@@ -40,6 +40,7 @@ public static BlockKey[] ComputeKeys(ControlFlowGraph graph, IRandomGenerator ra
 					key.Type = BlockKeyType.Incremental;
 				keys[block.Id] = key;
 			}
+
 			ProcessBlocks(keys, graph, random);
 			return keys;
 		}
@@ -68,13 +69,15 @@ static void ProcessBlocks(BlockKey[] keys, ControlFlowGraph graph, IRandomGenera
 							updated = true;
 						}
 					}
+
 					if (block.Targets.Count > 0) {
 						uint newExit = block.Targets.Select(b => keys[b.Id].EntryState).Max();
 						if (key.ExitState != newExit) {
 							key.ExitState = newExit;
 							updated = true;
 						}
 					}
+
 					if (block.Footer.OpCode.Code == Code.Endfilter || block.Footer.OpCode.Code == Code.Endfinally) {
 						// Match the exit state within finally/fault/filter
 						List<ExceptionHandler> ehs;
@@ -84,18 +87,20 @@ static void ProcessBlocks(BlockKey[] keys, ControlFlowGraph graph, IRandomGenera
 							foreach (var eh in graph.Body.ExceptionHandlers) {
 								if (eh.FilterStart != null && block.Footer.OpCode.Code == Code.Endfilter) {
 									if (footerIndex >= graph.IndexOf(eh.FilterStart) &&
-										footerIndex < graph.IndexOf(eh.HandlerStart))
+									    footerIndex < graph.IndexOf(eh.HandlerStart))
 										ehs.Add(eh);
 								}
 								else if (eh.HandlerType == ExceptionHandlerType.Finally ||
-										 eh.HandlerType == ExceptionHandlerType.Fault) {
+								         eh.HandlerType == ExceptionHandlerType.Fault) {
 									if (footerIndex >= graph.IndexOf(eh.HandlerStart) &&
-										(eh.HandlerEnd == null || footerIndex < graph.IndexOf(eh.HandlerEnd)))
+									    (eh.HandlerEnd == null || footerIndex < graph.IndexOf(eh.HandlerEnd)))
 										ehs.Add(eh);
 								}
 							}
+
 							ehMap[block] = ehs;
 						}
+
 						foreach (var eh in ehs) {
 							uint ehVal;
 							if (finallyIds.TryGetValue(eh, out ehVal)) {
@@ -122,9 +127,10 @@ static void ProcessBlocks(BlockKey[] keys, ControlFlowGraph graph, IRandomGenera
 							int footerIndex = graph.IndexOf(block.Footer);
 							foreach (var eh in graph.Body.ExceptionHandlers) {
 								if (footerIndex >= graph.IndexOf(eh.TryStart) &&
-									(eh.TryEnd == null || footerIndex < graph.IndexOf(eh.TryEnd)))
+								    (eh.TryEnd == null || footerIndex < graph.IndexOf(eh.TryEnd)))
 									ehs.Add(eh);
 							}
+
 							ehMap[block] = ehs;
 						}
 
@@ -137,6 +143,7 @@ static void ProcessBlocks(BlockKey[] keys, ControlFlowGraph graph, IRandomGenera
 								maxVal = ehVal;
 							}
 						}
+
 						if (maxVal != null) {
 							if (key.ExitState > maxVal.Value) {
 								maxVal = key.ExitState;
@@ -146,10 +153,12 @@ static void ProcessBlocks(BlockKey[] keys, ControlFlowGraph graph, IRandomGenera
 								key.ExitState = maxVal.Value;
 								updated = true;
 							}
+
 							foreach (var eh in ehs)
 								finallyIds[eh] = maxVal.Value;
 						}
 					}
+
 					keys[block.Id] = key;
 				}
 			} while (updated);

Confuser.Core.Exports/Helpers/KeySequence.cs

@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 
 namespace Confuser.Core {
-
 	/// <summary>
 	///     Base class of Confuser packers.
 	/// </summary>

Confuser.Core.Exports/IPacker.cs

@@ -9,7 +9,6 @@ namespace Confuser.Core {
 	public interface IPackerMetadata {
 		string Id { get; }
 
-		[DefaultValue(null)]
-		string MarkerId { get; }
+		[DefaultValue(null)] string MarkerId { get; }
 	}
 }

Confuser.Core.Exports/IPackerMetadata.cs

@@ -9,7 +9,6 @@ namespace Confuser.Core {
 	public interface IProtectionMetadata {
 		string Id { get; }
 
-		[DefaultValue(null)]
-		string MarkerId { get; }
+		[DefaultValue(null)] string MarkerId { get; }
 	}
 }

Confuser.Core.Exports/IProtectionMetadata.cs

@@ -7,6 +7,7 @@
 
 namespace Confuser.Core {
 	public interface IRuntimeModuleBuilder {
-		void AddImplementation(string targetFrameworkName, Func<Stream> assemblyStreamFactory, Func<Stream> debugSymbolStreamFactory);
+		void AddImplementation(string targetFrameworkName, Func<Stream> assemblyStreamFactory,
+			Func<Stream> debugSymbolStreamFactory);
 	}
 }

Confuser.Core.Exports/IRuntimeModuleBuilder.cs

@@ -3,7 +3,6 @@
 
 namespace Confuser.Core.Parameter {
 	internal sealed class BooleanProtectionParameter : IProtectionParameter<bool> {
-
 		public bool DefaultValue { get; }
 
 		public string Name { get; }
@@ -30,6 +29,7 @@ bool IProtectionParameter<bool>.Deserialize(string serializedValue) {
 				case "0":
 					return false;
 			}
+
 			throw new SerializationException($"Value {serializedValue} can't be deserialized to boolean.");
 		}