Squashed 'dotnet-symbol-service/' changes from 3db2eb5..9e78cc4

9e78cc4 Switch target framework to netcoreapp3.1
c8c7a71 Update library to version GitHub recommends
febf7fd Update to include method end line as tree node data and change ASD match
218ac4f Pull changes from dotnet-symbol-service
a7fa6d7 Initial scroll-to-method capability for source viewer
a41e345 Adds % of traced source locations to source viewer
be09cf6 Store source location count for Java and .NET
07c3fa1 Handles methods having no sequence points
8318a74 Add source file info to Symbol Service

git-subtree-dir: dotnet-symbol-service
git-subtree-split: 9e78cc4e45eb280a51e392ef3395e5c90320f1a3

Author: Steve Salas

SymbolService/Controllers/MethodsController.cs

@@ -27,6 +27,7 @@
 
 namespace SymbolService.Controllers
 {
+    [ApiController]
     [Produces("application/json")]
     [Route("api/Methods")]
     public class MethodsController : Controller
@@ -157,15 +158,22 @@ private IEnumerable<MethodDefinition> GetMethodDefinitions(TypeDefinition typeDe
 
         private MethodInfo GetMethodInfo(MethodDefinition method)
         {
-            return new MethodInfo
+	        var sequencePoints = method.DebugInformation.HasSequencePoints ? method.DebugInformation.SequencePoints : null;
+	        var visibleSequencePoints = sequencePoints?.Count(x => !x.IsHidden) ?? 0;
+
+			return new MethodInfo
             {
                 FullyQualifiedName = method.Name,
                 ContainingClass = method.DeclaringType?.FullName,
+				File = sequencePoints?.First().Document.Url,
                 AccessModifiers = GetAccessModifiers(method),
                 Parameters = GetParameters(method),
                 ReturnType = method.ReturnType.FullName,
-                Instructions = method.Body?.Instructions?.Count ?? 0
-            };
+                Instructions = method.Body?.Instructions?.Count ?? 0,
+				SequencePointCount = visibleSequencePoints,
+				MethodStartLine = GetMethodStartLine(method),
+				MethodEndLine = GetMethodEndLine(method)
+			};
         }
 
         static readonly Dictionary<Modifier, Func<MethodDefinition, Modifier>> AccessModiferQueries = new Dictionary<Modifier, Func<MethodDefinition, Modifier>>()
@@ -189,5 +197,29 @@ private List<String> GetParameters(MethodDefinition method)
         {
             return method.Parameters.Select(parameter => parameter.ParameterType.FullName).ToList();
         }
+
+		private int GetMethodStartLine(MethodDefinition method)
+		{
+			var methodStartLine = -1;
+
+			if(method.DebugInformation.HasSequencePoints)
+			{
+				methodStartLine = method.DebugInformation.SequencePoints.OrderBy(t => t.StartLine).First().StartLine;
+			}
+
+			return methodStartLine;
+		}
+
+		private int GetMethodEndLine(MethodDefinition method)
+		{
+			var methodEndLine = -1;
+
+			if (method.DebugInformation.HasSequencePoints)
+			{
+				methodEndLine = method.DebugInformation.SequencePoints.OrderBy(t => t.StartLine).Where(t => !t.IsHidden).Last().EndLine;
+			}
+
+			return methodEndLine;
+		}
     }
 }

SymbolService/Model/MethodInfo.cs

@@ -27,6 +27,8 @@ public class MethodInfo
 
 		public String ContainingClass { get; set; }
 
+		public String File { get; set; }
+
 		public int AccessModifiers { get; set; }
 
 		public IEnumerable<String> Parameters { get; set; }
@@ -37,7 +39,14 @@ public class MethodInfo
 
         public Guid SurrogateFor { get; set; }
 
-	    public MethodInfo()
+		public int SequencePointCount { get; set; }
+
+		public int MethodStartLine { get; set; }
+
+		public int MethodEndLine { get; set; }
+
+
+		public MethodInfo()
 	    {
 	        Id = Guid.NewGuid();
 	    }

SymbolService/Program.cs

@@ -14,21 +14,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace SymbolService
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateHostBuilder(args).Build().Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStartup<Startup>();
+                });
     }
 }

SymbolService/Startup.cs

@@ -18,7 +18,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Hosting;
 
 namespace SymbolService
 {
@@ -34,21 +34,23 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc();
+            services.AddControllers();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
-            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
-            loggerFactory.AddDebug();
-
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseMvc();
+            app.UseRouting();
+
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
         }
     }
 }

SymbolService/SymbolService.csproj

@@ -1,16 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>SymbolService</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
     <PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
   </ItemGroup>
 

SymbolService/appsettings.Development.json

@@ -1,10 +1,9 @@
 {
   "Logging": {
-    "IncludeScopes": false,
     "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
   }
-}
+}

SymbolService/appsettings.json

@@ -1,15 +1,10 @@
 {
   "Logging": {
-    "IncludeScopes": false,
-    "Debug": {
-      "LogLevel": {
-        "Default": "Warning"
-      }
-    },
-    "Console": {
-      "LogLevel": {
-        "Default": "Warning"
-      }
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
-  }
+  },
+  "AllowedHosts": "*"
 }