Fix IsVisibleOutside testing

yck1509 · Oct 13, 2015 · 78cb337 · 78cb337
1 parent 2cb8427
commit 78cb337
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/Confuser.Core/Project/ConfuserProject.cs b/Confuser.Core/Project/ConfuserProject.cs
@@ -169,6 +169,17 @@ public enum SettingItemAction {
 	/// </summary>
 	/// <typeparam name="T"><see cref="Protection" /> or <see cref="Packer" /></typeparam>
 	public class SettingItem<T> : Dictionary<string, string> {
+		/// <summary>
+		/// Initialize this setting item instance
+		/// </summary>
+		/// <param name="id">The protection id</param>
+		/// <param name="action">The action to take</param>
+		/// <param name="inherit">Inherits protection</param>
+		public SettingItem(string id = null, SettingItemAction action = SettingItemAction.Add) {
+			Id = id;
+			Action = action;
+		}
+
 		/// <summary>
 		///     The identifier of component
 		/// </summary>
@@ -239,6 +250,18 @@ internal void Load(XmlElement elem) {
 	///     A rule that control how <see cref="Protection" />s are applied to module
 	/// </summary>
 	public class Rule : List<SettingItem<Protection>> {
+		/// <summary>
+		/// Initialize this rule instance
+		/// </summary>
+		/// <param name="pattern">The pattern</param>
+		/// <param name="preset">The preset</param>
+		/// <param name="inherit">Inherits protection</param>
+		public Rule(string pattern = "true", ProtectionPreset preset = ProtectionPreset.None, bool inherit = false) {
+			Pattern = pattern;
+			Preset = preset;
+			Inherit = inherit;
+		}
+
 		/// <summary>
 		///     Gets or sets the pattern that determine the target components of the rule.
 		/// </summary>

diff --git a/Confuser.Renamer/AnalyzePhase.cs b/Confuser.Renamer/AnalyzePhase.cs
@@ -157,7 +157,7 @@ void Analyze(NameService service, ConfuserContext context, ProtectionParameters
 		void Analyze(NameService service, ConfuserContext context, ProtectionParameters parameters, MethodDef method) {
 			if (method.DeclaringType.IsVisibleOutside() &&
 			    (method.IsFamily || method.IsFamilyOrAssembly || method.IsPublic) &&
-			    !IsVisibleOutside(context, parameters, method))
+			    IsVisibleOutside(context, parameters, method))
 				service.SetCanRename(method, false);
 
 			else if (method.IsRuntimeSpecialName)
@@ -176,7 +176,7 @@ void Analyze(NameService service, ConfuserContext context, ProtectionParameters
 		void Analyze(NameService service, ConfuserContext context, ProtectionParameters parameters, FieldDef field) {
 			if (field.DeclaringType.IsVisibleOutside() &&
 			    (field.IsFamily || field.IsFamilyOrAssembly || field.IsPublic) &&
-			    !IsVisibleOutside(context, parameters, field))
+			    IsVisibleOutside(context, parameters, field))
 				service.SetCanRename(field, false);
 
 			else if (field.IsRuntimeSpecialName)
@@ -194,7 +194,7 @@ void Analyze(NameService service, ConfuserContext context, ProtectionParameters
 
 		void Analyze(NameService service, ConfuserContext context, ProtectionParameters parameters, PropertyDef property) {
 			if (property.DeclaringType.IsVisibleOutside() &&
-			    !IsVisibleOutside(context, parameters, property))
+			    IsVisibleOutside(context, parameters, property))
 				service.SetCanRename(property, false);
 
 			else if (property.IsRuntimeSpecialName)
@@ -212,7 +212,7 @@ void Analyze(NameService service, ConfuserContext context, ProtectionParameters
 
 		void Analyze(NameService service, ConfuserContext context, ProtectionParameters parameters, EventDef evt) {
 			if (evt.DeclaringType.IsVisibleOutside() &&
-			    !IsVisibleOutside(context, parameters, evt))
+			    IsVisibleOutside(context, parameters, evt))
 				service.SetCanRename(evt, false);
 
 			else if (evt.IsRuntimeSpecialName)