Was made refactoring

Taritsyn · Taritsyn · commit ef9109ca8a8f · 2018-03-11T19:38:18.000+03:00
diff --git a/src/MsieJavaScriptEngine/Helpers/CallStackItem.cs b/src/MsieJavaScriptEngine/Helpers/CallStackItem.cs
@@ -41,15 +41,6 @@ public int ColumnNumber
 			set;
 		}
 
-		/// <summary>
-		/// Gets or sets a source fragment
-		/// </summary>
-		public string SourceFragment
-		{
-			get;
-			set;
-		}
-
 
 		/// <summary>
 		/// Constructs an instance of the script call stack item
@@ -60,7 +51,6 @@ public CallStackItem()
 			DocumentName = string.Empty;
 			LineNumber = 0;
 			ColumnNumber = 0;
-			SourceFragment = string.Empty;
 		}
 	}
 }
diff --git a/src/MsieJavaScriptEngine/Helpers/JsErrorHelpers.cs b/src/MsieJavaScriptEngine/Helpers/JsErrorHelpers.cs
@@ -76,10 +76,8 @@ internal static CallStackItem[] ParseCallStack(string callStack)
 		/// <see cref="CallStackItem"/> instances
 		/// </summary>
 		/// <param name="callStackItems">An array of <see cref="CallStackItem"/> instances</param>
-		/// <param name="omitSourceFragment">Flag for whether to omit source fragment</param>
 		/// <returns>String representation of the script call stack</returns>
-		internal static string StringifyCallStackItems(CallStackItem[] callStackItems,
-			bool omitSourceFragment = false)
+		internal static string StringifyCallStackItems(CallStackItem[] callStackItems)
 		{
 			if (callStackItems == null)
 			{
@@ -103,8 +101,7 @@ internal static string StringifyCallStackItems(CallStackItem[] callStackItems,
 					stackBuilder.AppendLine();
 				}
 				WriteErrorLocation(stackBuilder, stackItem.FunctionName, stackItem.DocumentName,
-					stackItem.LineNumber, stackItem.ColumnNumber,
-					!omitSourceFragment ? stackItem.SourceFragment : string.Empty);
+					stackItem.LineNumber, stackItem.ColumnNumber);
 			}
 
 			string callStack = stackBuilder.ToString();
diff --git a/src/MsieJavaScriptEngine/Resources/CommonStrings.Designer.cs b/src/MsieJavaScriptEngine/Resources/CommonStrings.Designer.cs
diff --git a/src/MsieJavaScriptEngine/Resources/CommonStrings.resx b/src/MsieJavaScriptEngine/Resources/CommonStrings.resx
@@ -165,9 +165,6 @@ See more details:
   <data name="ErrorDetails_EngineMode" xml:space="preserve">
     <value>Engine mode</value>
   </data>
-  <data name="ErrorDetails_ErrorCode" xml:space="preserve">
-    <value>Error code</value>
-  </data>
   <data name="ErrorDetails_LineNumber" xml:space="preserve">
     <value>Line number</value>
   </data>
diff --git a/src/MsieJavaScriptEngine/Resources/CommonStrings.ru-ru.resx b/src/MsieJavaScriptEngine/Resources/CommonStrings.ru-ru.resx
@@ -165,9 +165,6 @@
   <data name="ErrorDetails_EngineMode" xml:space="preserve">
     <value>Режим движка</value>
   </data>
-  <data name="ErrorDetails_ErrorCode" xml:space="preserve">
-    <value>Код ошибки</value>
-  </data>
   <data name="ErrorDetails_LineNumber" xml:space="preserve">
     <value>Номер строки</value>
   </data>
diff --git a/src/MsieJavaScriptEngine/ScriptDispatcher.cs b/src/MsieJavaScriptEngine/ScriptDispatcher.cs
@@ -3,6 +3,7 @@
 #if NET45 || NETSTANDARD
 using System.Runtime.ExceptionServices;
 #endif
+using System.Runtime.CompilerServices;
 using System.Threading;
 
 using MsieJavaScriptEngine.Utilities;
@@ -71,6 +72,7 @@ public ScriptDispatcher()
 		}
 
 
+		[MethodImpl((MethodImplOptions)256 /* AggressiveInlining */)]
 		private void VerifyNotDisposed()
 		{
 			if (_disposedFlag.IsSet())
diff --git a/test/MsieJavaScriptEngine.Test.Auto/MsieJavaScriptEngine.Test.Auto.csproj b/test/MsieJavaScriptEngine.Test.Auto/MsieJavaScriptEngine.Test.Auto.csproj
@@ -18,7 +18,11 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 	</ItemGroup>
 
 </Project>
diff --git a/test/MsieJavaScriptEngine.Test.ChakraActiveScript/MsieJavaScriptEngine.Test.ChakraActiveScript.csproj b/test/MsieJavaScriptEngine.Test.ChakraActiveScript/MsieJavaScriptEngine.Test.ChakraActiveScript.csproj
@@ -17,7 +17,11 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 	</ItemGroup>
 
 </Project>
diff --git a/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/MsieJavaScriptEngine.Test.ChakraEdgeJsRt.csproj b/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/MsieJavaScriptEngine.Test.ChakraEdgeJsRt.csproj
@@ -18,7 +18,11 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 	</ItemGroup>
 
 </Project>
diff --git a/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/MsieJavaScriptEngine.Test.ChakraIeJsRt.csproj b/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/MsieJavaScriptEngine.Test.ChakraIeJsRt.csproj
@@ -18,7 +18,11 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 	</ItemGroup>
 
 </Project>
diff --git a/test/MsieJavaScriptEngine.Test.Classic/MsieJavaScriptEngine.Test.Classic.csproj b/test/MsieJavaScriptEngine.Test.Classic/MsieJavaScriptEngine.Test.Classic.csproj
@@ -17,7 +17,11 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 	</ItemGroup>
 
 </Project>
diff --git a/test/MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj b/test/MsieJavaScriptEngine.Test.Common/MsieJavaScriptEngine.Test.Common.csproj
@@ -24,8 +24,8 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-		<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
+		<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'netcoreapp1.0' ">
@@ -40,4 +40,8 @@
 		<EmbeddedResource Include="Resources/cube.js;Resources/power.js" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+	</ItemGroup>
+
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,6 @@ public int ColumnNumber`
`41`	`41`	`set;`
`42`	`42`	`}`
`43`	`43`
`44`		`- /// <summary>`
`45`		`- /// Gets or sets a source fragment`
`46`		`- /// </summary>`
`47`		`- public string SourceFragment`
`48`		`- {`
`49`		`- get;`
`50`		`- set;`
`51`		`- }`
`52`		`-`
`53`	`44`
`54`	`45`	`/// <summary>`
`55`	`46`	`/// Constructs an instance of the script call stack item`
`@@ -60,7 +51,6 @@ public CallStackItem()`
`60`	`51`	`DocumentName = string.Empty;`
`61`	`52`	`LineNumber = 0;`
`62`	`53`	`ColumnNumber = 0;`
`63`		`- SourceFragment = string.Empty;`
`64`	`54`	`}`
`65`	`55`	`}`
`66`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,8 @@ internal static CallStackItem[] ParseCallStack(string callStack)`
`76`	`76`	`/// <see cref="CallStackItem"/> instances`
`77`	`77`	`/// </summary>`
`78`	`78`	`/// <param name="callStackItems">An array of <see cref="CallStackItem"/> instances</param>`
`79`		`- /// <param name="omitSourceFragment">Flag for whether to omit source fragment</param>`
`80`	`79`	`/// <returns>String representation of the script call stack</returns>`
`81`		`- internal static string StringifyCallStackItems(CallStackItem[] callStackItems,`
`82`		`- bool omitSourceFragment = false)`
	`80`	`+ internal static string StringifyCallStackItems(CallStackItem[] callStackItems)`
`83`	`81`	`{`
`84`	`82`	`if (callStackItems == null)`
`85`	`83`	`{`
`@@ -103,8 +101,7 @@ internal static string StringifyCallStackItems(CallStackItem[] callStackItems,`
`103`	`101`	`stackBuilder.AppendLine();`
`104`	`102`	`}`
`105`	`103`	`WriteErrorLocation(stackBuilder, stackItem.FunctionName, stackItem.DocumentName,`
`106`		`- stackItem.LineNumber, stackItem.ColumnNumber,`
`107`		`- !omitSourceFragment ? stackItem.SourceFragment : string.Empty);`
	`104`	`+ stackItem.LineNumber, stackItem.ColumnNumber);`
`108`	`105`	`}`
`109`	`106`
`110`	`107`	`string callStack = stackBuilder.ToString();`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#if NET45 \|\| NETSTANDARD`
`4`	`4`	`using System.Runtime.ExceptionServices;`
`5`	`5`	`#endif`
	`6`	`+using System.Runtime.CompilerServices;`
`6`	`7`	`using System.Threading;`
`7`	`8`
`8`	`9`	`using MsieJavaScriptEngine.Utilities;`
`@@ -71,6 +72,7 @@ public ScriptDispatcher()`
`71`	`72`	`}`
`72`	`73`
`73`	`74`
	`75`	`+ [MethodImpl((MethodImplOptions)256 /* AggressiveInlining */)]`
`74`	`76`	`private void VerifyNotDisposed()`
`75`	`77`	`{`
`76`	`78`	`if (_disposedFlag.IsSet())`