Skip to content

Commit cc1ff0e

Browse files
TaritsynTaritsyn
committed
Was made refactoring
1 parent e54d6d2 commit cc1ff0e

20 files changed

Lines changed: 282 additions & 48 deletions

‎src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
2525
/// <summary>
2626
/// Name of JS engine
2727
/// </summary>
28-
private const string ENGINE_NAME = "ChakraCore JS engine";
28+
public const string EngineName = "ChakraCoreJsEngine";
2929

3030
/// <summary>
3131
/// Version of original JS engine
3232
/// </summary>
33-
private const string ENGINE_VERSION = "1.2";
33+
private const string EngineVersion = "1.2";
3434

3535
/// <summary>
3636
/// Instance of JS runtime
@@ -67,15 +67,15 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
6767
/// </summary>
6868
public override string Name
6969
{
70-
get { return ENGINE_NAME; }
70+
get { return EngineName; }
7171
}
7272

7373
/// <summary>
7474
/// Gets a version of original JS engine
7575
/// </summary>
7676
public override string Version
7777
{
78-
get { return ENGINE_VERSION; }
78+
get { return EngineVersion; }
7979
}
8080

8181

@@ -101,7 +101,7 @@ public ChakraCoreJsEngine()
101101
{
102102
throw new JsEngineLoadException(
103103
string.Format(CoreStrings.Runtime_JsEngineNotLoaded,
104-
ENGINE_NAME, e.Message), ENGINE_NAME, ENGINE_VERSION, e);
104+
EngineName, e.Message), EngineName, EngineVersion, e);
105105
}
106106

107107
_externalObjects = new HashSet<object>();
@@ -847,7 +847,7 @@ private static JsRuntimeException ConvertJsExceptionToJsRuntimeException(
847847
category = "Fatal error";
848848
}
849849

850-
var jsEngineException = new JsRuntimeException(message, ENGINE_NAME, ENGINE_VERSION)
850+
var jsEngineException = new JsRuntimeException(message, EngineName, EngineVersion)
851851
{
852852
ErrorCode = ((uint)jsException.ErrorCode).ToString(CultureInfo.InvariantCulture),
853853
Category = category,

‎src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngineFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public sealed class ChakraCoreJsEngineFactory : IJsEngineFactory
1212
/// </summary>
1313
public string EngineName
1414
{
15-
get { return "ChakraCoreJsEngine"; }
15+
get { return ChakraCoreJsEngine.EngineName; }
1616
}
1717

1818

‎src/JavaScriptEngineSwitcher.ChakraCore/JsEngineFactoryCollectionExtensions.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using JavaScriptEngineSwitcher.Core;
1+
using System;
2+
3+
using JavaScriptEngineSwitcher.Core;
24

35
namespace JavaScriptEngineSwitcher.ChakraCore
46
{
@@ -15,6 +17,11 @@ public static class JsEngineFactoryCollectionExtensions
1517
/// <returns>Instance of <see cref="JsEngineFactoryCollection" /></returns>
1618
public static JsEngineFactoryCollection AddChakraCore(this JsEngineFactoryCollection source)
1719
{
20+
if (source == null)
21+
{
22+
throw new ArgumentNullException("source");
23+
}
24+
1825
source.Add(new ChakraCoreJsEngineFactory());
1926

2027
return source;

‎src/JavaScriptEngineSwitcher.Core/JsEngineFactoryCollection.cs‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,30 @@ public void Add(IJsEngineFactory factory)
4242
throw new ArgumentNullException("factory");
4343
}
4444

45-
_factories[factory.EngineName] = factory;
45+
string engineName = factory.EngineName;
46+
if (_factories.ContainsKey(engineName))
47+
{
48+
_factories[engineName] = factory;
49+
}
50+
else
51+
{
52+
_factories.Add(engineName, factory);
53+
}
54+
}
55+
56+
/// <summary>
57+
/// Removes a single factory from the collection
58+
/// </summary>
59+
/// <param name="engineName">Name of JS engine</param>
60+
/// <returns>A boolean value indicating whether the factory was succesfully removed from the collection</returns>
61+
public bool Remove(string engineName)
62+
{
63+
if (engineName == null)
64+
{
65+
throw new ArgumentNullException("engineName");
66+
}
67+
68+
return _factories.Remove(engineName);
4669
}
4770

4871
/// <summary>

‎src/JavaScriptEngineSwitcher.Core/Utilities/DelegateExtensions.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ public static class DelegateExtensions
1515
/// <returns>An object that represents the method</returns>
1616
public static MethodInfo GetMethodInfo(this Delegate source)
1717
{
18+
if (source == null)
19+
{
20+
throw new ArgumentNullException("source");
21+
}
22+
1823
return source.Method;
1924
}
2025
}

‎src/JavaScriptEngineSwitcher.Core/Utilities/StringBuilderExtensions.cs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Text;
1+
using System;
2+
using System.Text;
23
using System.Text.RegularExpressions;
34

45
namespace JavaScriptEngineSwitcher.Core.Utilities
@@ -21,6 +22,11 @@ internal static class StringBuilderExtensions
2122
/// <returns>Instance of <see cref="StringBuilder"/></returns>
2223
public static StringBuilder AppendFormatLine(this StringBuilder source)
2324
{
25+
if (source == null)
26+
{
27+
throw new ArgumentNullException("source");
28+
}
29+
2430
return source.AppendLine();
2531
}
2632

@@ -36,6 +42,11 @@ public static StringBuilder AppendFormatLine(this StringBuilder source)
3642
/// <returns>Instance of <see cref="StringBuilder"/></returns>
3743
public static StringBuilder AppendFormatLine(this StringBuilder source, string format, params object[] args)
3844
{
45+
if (source == null)
46+
{
47+
throw new ArgumentNullException("source");
48+
}
49+
3950
if (_formatPlaceholderRegExp.IsMatch(format))
4051
{
4152
return source.AppendFormat(format, args).AppendLine();

‎src/JavaScriptEngineSwitcher.Core/Utilities/TypeExtensions.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ public static class TypeExtensions
1717
/// <returns>The code of the underlying type</returns>
1818
public static TypeCode GetTypeCode(this Type source)
1919
{
20+
if (source == null)
21+
{
22+
throw new ArgumentNullException("source");
23+
}
24+
2025
TypeCode typeCode;
2126

2227
#if NETSTANDARD1_3
@@ -107,6 +112,11 @@ public static TypeCode GetTypeCode(this Type source)
107112
/// <returns>The converted object</returns>
108113
public static TypeInfo GetTypeInfo(this Type source)
109114
{
115+
if (source == null)
116+
{
117+
throw new ArgumentNullException("source");
118+
}
119+
110120
return new TypeInfo(source);
111121
}
112122
#endif

‎src/JavaScriptEngineSwitcher.Core/Utilities/TypeInfoExtensions.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
using System.Reflection;
1+
using System;
2+
using System.Reflection;
23

34
namespace JavaScriptEngineSwitcher.Core.Utilities
45
{
56
public static class TypeInfoExtensions
67
{
78
public static bool IsInstanceOfType(this TypeInfo source, object o)
89
{
10+
if (source == null)
11+
{
12+
throw new ArgumentNullException("source");
13+
}
14+
915
if (o == null)
1016
{
1117
return false;

‎src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public sealed class JintJsEngine : JsEngineBase
2626
/// <summary>
2727
/// Name of JS engine
2828
/// </summary>
29-
private const string ENGINE_NAME = "Jint JS engine";
29+
public const string EngineName = "JintJsEngine";
3030

3131
/// <summary>
3232
/// Version of original JS engine
3333
/// </summary>
34-
private const string ENGINE_VERSION = "2.9.1";
34+
private const string EngineVersion = "2.9.1";
3535

3636
/// <summary>
3737
/// Jint JS engine
@@ -48,15 +48,15 @@ public sealed class JintJsEngine : JsEngineBase
4848
/// </summary>
4949
public override string Name
5050
{
51-
get { return ENGINE_NAME; }
51+
get { return EngineName; }
5252
}
5353

5454
/// <summary>
5555
/// Gets a version of original JS engine
5656
/// </summary>
5757
public override string Version
5858
{
59-
get { return ENGINE_VERSION; }
59+
get { return EngineVersion; }
6060
}
6161

6262

@@ -90,7 +90,7 @@ public JintJsEngine(JintSettings settings)
9090
{
9191
throw new JsEngineLoadException(
9292
string.Format(CoreStrings.Runtime_JsEngineNotLoaded,
93-
ENGINE_NAME, e.Message), ENGINE_NAME, ENGINE_VERSION, e);
93+
EngineName, e.Message), EngineName, EngineVersion, e);
9494
}
9595
}
9696

@@ -135,7 +135,7 @@ private JsRuntimeException ConvertParserExceptionToJsRuntimeException(
135135
message = jsParserException.Message;
136136
}
137137

138-
var jsRuntimeException = new JsRuntimeException(message, ENGINE_NAME, ENGINE_VERSION,
138+
var jsRuntimeException = new JsRuntimeException(message, EngineName, EngineVersion,
139139
jsParserException)
140140
{
141141
Category = "ParserError",
@@ -165,7 +165,7 @@ private JsRuntimeException ConvertJavaScriptExceptionToJsRuntimeException(
165165
}
166166
}
167167

168-
var jsRuntimeException = new JsRuntimeException(jsException.Message, ENGINE_NAME, ENGINE_VERSION,
168+
var jsRuntimeException = new JsRuntimeException(jsException.Message, EngineName, EngineVersion,
169169
jsException)
170170
{
171171
Category = category,
@@ -185,7 +185,7 @@ private JsRuntimeException ConvertRecursionDepthOverflowExceptionToJsRuntimeExce
185185
jsRecursionException.CallChain);
186186

187187
var jsRuntimeException = new JsRuntimeException(message,
188-
ENGINE_NAME, ENGINE_VERSION, jsRecursionException)
188+
EngineName, EngineVersion, jsRecursionException)
189189
{
190190
Category = "RecursionDepthOverflowError",
191191
Source = jsRecursionException.Source,
@@ -199,7 +199,7 @@ private JsRuntimeException ConvertStatementsCountOverflowExceptionToJsRuntimeExc
199199
OriginalStatementsCountOverflowException jsStatementsException)
200200
{
201201
var jsRuntimeException = new JsRuntimeException(Strings.Runtime_StatementsCountOverflow,
202-
ENGINE_NAME, ENGINE_VERSION)
202+
EngineName, EngineVersion)
203203
{
204204
Category = "StatementsCountOverflowError",
205205
Source = jsStatementsException.Source,
@@ -213,7 +213,7 @@ private JsRuntimeException ConvertTimeoutExceptionToJsRuntimeException(
213213
TimeoutException jsTimeoutException)
214214
{
215215
var jsRuntimeException = new JsRuntimeException(Strings.Runtime_ExecutionTimeout,
216-
ENGINE_NAME, ENGINE_VERSION)
216+
EngineName, EngineVersion)
217217
{
218218
Category = "TimeoutError",
219219
Source = jsTimeoutException.Source,

‎src/JavaScriptEngineSwitcher.Jint/JintJsEngineFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public sealed class JintJsEngineFactory : IJsEngineFactory
1717
/// </summary>
1818
public string EngineName
1919
{
20-
get { return "JintJsEngine"; }
20+
get { return JintJsEngine.EngineName; }
2121
}
2222

2323

0 commit comments

Comments
 (0)