Merge branch 'hotfix/fix-components-19'

Author: EvilBeaver

install/opm-0.13.0.ospx

@@ -14,15 +14,15 @@ namespace NUnitTests
 	public class TestContextClass : AutoContext<TestContextClass>
 	{
 
-		[ContextMethod("УстаревшийМетод", "ObsoleteMethod", isDeprecated: true)]
+		[ContextMethod("УстаревшийМетод", "ObsoleteMethod", IsDeprecated = true, ThrowOnUse = false)]
 		public void ObsoleteMethod()
 		{
 			// Do nothing
 		}
 
 		[ContextMethod("ХорошийМетод", "GoodMethod")]
-		[ContextMethod("ObsoleteAlias", isDeprecated: true)]
-		[ContextMethod("VeryObsoleteAlias", isDeprecated: true, throwOnUse: true)]
+		[ContextMethod("ObsoleteAlias", IsDeprecated = true, ThrowOnUse = false)]
+		[ContextMethod("VeryObsoleteAlias", IsDeprecated = true, ThrowOnUse = true)]
 		public void GoodMethod()
 		{
 			// Do nothing

src/NUnitTests/TestContextClass.cs

@@ -482,7 +482,7 @@ public bool ValueIsFilled(IValue inValue)
 
         }
 
-        [ContextMethod("IsValueFilled", null, isDeprecated: true)]
+        [ContextMethod("IsValueFilled", IsDeprecated = true, ThrowOnUse = false)]
         [Obsolete]
         public bool IsValueFilled(IValue value)
         {

src/ScriptEngine.HostedScript/Library/SystemGlobalContext.cs

@@ -16,7 +16,7 @@ public class ContextMethodAttribute : Attribute
         private readonly string _name;
         private readonly string _alias;
 
-        public ContextMethodAttribute(string name, string alias = null, bool isDeprecated = false, bool throwOnUse = false)
+        public ContextMethodAttribute(string name, string alias = null)
         {
             if(!Utils.IsValidIdentifier(name))
                 throw new ArgumentException("Name must be a valid identifier");
@@ -26,13 +26,6 @@ public ContextMethodAttribute(string name, string alias = null, bool isDeprecate
 
             _name = name;
             _alias = alias;
-            IsDeprecated = isDeprecated;
-            ThrowOnUse = throwOnUse;
-        }
-
-        public ContextMethodAttribute(string name, bool isDeprecated)
-            : this(name, null, isDeprecated)
-        {
         }
 
         public string GetName()
@@ -45,9 +38,22 @@ public string GetAlias()
             return _alias;
         }
 
-        public bool IsDeprecated { get; }
+        public string GetAlias(string nativeMethodName)
+        {
+            if (!string.IsNullOrEmpty(_alias))
+            {
+                return _alias;
+            }
+            if (!IsDeprecated)
+            {
+                return nativeMethodName;
+            }
+            return null;
+        }
+        
+        public bool IsDeprecated { get; set; }
 
-        public bool ThrowOnUse { get; }
+        public bool ThrowOnUse { get; set; }
 
         public bool IsFunction { get; set; }
     }
@@ -187,9 +193,7 @@ private void MapType(Type type)
                     scriptMethInfo.IsDeprecated = item.Binding.IsDeprecated;
                     scriptMethInfo.ThrowOnUseDeprecated = item.Binding.ThrowOnUse;
                     scriptMethInfo.Name = item.Binding.GetName();
-                    scriptMethInfo.Alias = string.IsNullOrEmpty(item.Binding.GetAlias()) ?
-                       scriptMethInfo.Name
-                        :item.Binding.GetAlias();
+                    scriptMethInfo.Alias = item.Binding.GetAlias(item.Method.Name);
 
                     scriptMethInfo.Params = paramDefs;