refactor: 替换 Assemblies 属性为 Packages 属性

在多个文件中进行了以下重构： - `CodeCheckRequest.cs`、`HoverInfoRequest.cs`、`SignatureHelpRequest.cs`、`TabCompletionRequest.cs` 中移除了构造函数和 `Assemblies` 属性，添加了 `Packages` 属性，并将 `Assemblies` 属性替换为 `Packages` 属性。 - `CodeRunner.cs` 中移除了下载 NuGet 包的注释，添加了加载 NuGet 包的代码。 - `CompletitionRequestHandler.cs` 中添加了 `monacoEditorCSharp.DataHelpers` 的引用，并在处理请求的方法中添加了加载 NuGet 包的代码。 - `DownloadNugetPackages.cs` 中修改了加载 NuGet 包的逻辑，添加了对 `netstandard2.1` 的支持，并添加了 `DownloadAllPackages` 方法。 - `Program.cs` 中修改了处理请求的逻辑，添加了对 `Packages` 属性的处理，并将其转换为字符串传递给处理方法。 - `csharpLanguageProvider.js` 中修改了请求的构造逻辑，添加了对 `Packages` 属性的处理，并将其包含在请求中。
gaoconggit · Dec 16, 2024 · 465d601 · 465d601
1 parent 2e8b04a
commit 465d601
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 60 deletions.
diff --git a/MonacoRoslynCompletionProvider/Api/CodeCheckRequest.cs b/MonacoRoslynCompletionProvider/Api/CodeCheckRequest.cs
@@ -1,18 +1,14 @@
-namespace MonacoRoslynCompletionProvider.Api
+using System.Collections.Generic;
+
+namespace MonacoRoslynCompletionProvider.Api
 {
     public class CodeCheckRequest : IRequest
     {
         public CodeCheckRequest()
         { }
 
-        public CodeCheckRequest(string code, string[] assemblies)
-        {
-            this.Code = code;
-            this.Assemblies = assemblies;
-        }
-
         public virtual string Code { get; set; }
 
-        public virtual string[] Assemblies { get; set; }
+        public List<Package> Packages { get; set; }
     }
 }
diff --git a/MonacoRoslynCompletionProvider/Api/CodeRunner.cs b/MonacoRoslynCompletionProvider/Api/CodeRunner.cs
@@ -30,7 +30,7 @@ public static async Task<RunResult> RunProgramCodeAsync(string code, string nuge
 
                 try
                 {
-                    // 下载 NuGet 包
+                    // 加载 NuGet 包
                     var nugetAssemblies = DownloadNugetPackages.LoadPackages(nuget);
 
                     // 解析代码

diff --git a/MonacoRoslynCompletionProvider/Api/HoverInfoRequest.cs b/MonacoRoslynCompletionProvider/Api/HoverInfoRequest.cs
@@ -1,22 +1,17 @@
-namespace MonacoRoslynCompletionProvider.Api
+using System.Collections.Generic;
+
+namespace MonacoRoslynCompletionProvider.Api
 {
     public class HoverInfoRequest : IRequest
     {
         public HoverInfoRequest()
         { }
 
-        public HoverInfoRequest(string code, int position, string[] assemblies) 
-        {
-            this.Code = code;
-            this.Position = position;
-            this.Assemblies = assemblies;
-        }
 
         public virtual string Code { get; set; }
 
         public virtual int Position { get; set; }
 
-        public virtual string[] Assemblies { get; set; }
-
+        public List<Package> Packages { get; set; }
     }
 }
diff --git a/MonacoRoslynCompletionProvider/Api/SignatureHelpRequest.cs b/MonacoRoslynCompletionProvider/Api/SignatureHelpRequest.cs
@@ -1,21 +1,16 @@
-namespace MonacoRoslynCompletionProvider.Api
+using System.Collections.Generic;
+
+namespace MonacoRoslynCompletionProvider.Api
 {
     public class SignatureHelpRequest : IRequest
     {
         public SignatureHelpRequest()
         { }
 
-        public SignatureHelpRequest(string code, int position, string[] assemblies) 
-        {
-            this.Code = code;
-            this.Position = position;
-            this.Assemblies = assemblies;
-        }
-
         public virtual string Code { get; set; }
 
         public virtual int Position { get; set; }
 
-        public virtual string[] Assemblies { get; set; }
+        public List<Package> Packages { get; set; }
     }
 }
diff --git a/MonacoRoslynCompletionProvider/Api/TabCompletionRequest.cs b/MonacoRoslynCompletionProvider/Api/TabCompletionRequest.cs
@@ -1,22 +1,17 @@
-namespace MonacoRoslynCompletionProvider.Api
+using System.Collections.Generic;
+
+namespace MonacoRoslynCompletionProvider.Api
 {
     public class TabCompletionRequest : IRequest
     {
         public TabCompletionRequest()
         { }
 
-        public TabCompletionRequest(string code, int position, string[] assemblies) 
-        {
-            this.Code = code;
-            this.Position = position;
-            this.Assemblies = assemblies;
-        }
-
         public virtual string Code { get; set; }
 
         public virtual int Position { get; set; }
 
-        public virtual string[] Assemblies { get; set; }
 
+        public List<Package> Packages { get; set; }
     }
 }
diff --git a/MonacoRoslynCompletionProvider/CompletitionRequestHandler.cs b/MonacoRoslynCompletionProvider/CompletitionRequestHandler.cs
@@ -12,6 +12,7 @@
 using Microsoft.CodeAnalysis.Host;
 using System;
 using System.Collections.Generic;
+using monacoEditorCSharp.DataHelpers;
 
 namespace MonacoRoslynCompletionProvider
 {
@@ -26,38 +27,46 @@ .. AppDomain.CurrentDomain.GetAssemblies()
             ".\\Dll\\CSRedisCore.dll",
             ".\\Dll\\RestSharp.dll",
         ];
-        public async static Task<TabCompletionResult[]> Handle(TabCompletionRequest tabCompletionRequest)
+        public async static Task<TabCompletionResult[]> Handle(TabCompletionRequest tabCompletionRequest, string nuget)
         {
-            var workspace = CompletionWorkspace.Create(tabCompletionRequest.Assemblies = s_assemblies);
+            // 加载 NuGet 包
+            var nugetAssembliesArray = DownloadNugetPackages.LoadPackages(nuget).Select(a => a.Location).ToArray();
+            var workspace = CompletionWorkspace.Create([.. nugetAssembliesArray, .. s_assemblies]);
             var document = await workspace.CreateDocument(tabCompletionRequest.Code);
             return await document.GetTabCompletion(tabCompletionRequest.Position, CancellationToken.None);
         }
 
-        public async static Task<HoverInfoResult> Handle(HoverInfoRequest hoverInfoRequest)
+        public async static Task<HoverInfoResult> Handle(HoverInfoRequest hoverInfoRequest, string nuget)
         {
-            var workspace = CompletionWorkspace.Create(hoverInfoRequest.Assemblies = s_assemblies);
+            // 加载 NuGet 包
+            var nugetAssembliesArray = DownloadNugetPackages.LoadPackages(nuget).Select(a => a.Location).ToArray();
+
+            var workspace = CompletionWorkspace.Create([.. nugetAssembliesArray, .. s_assemblies]);
             var document = await workspace.CreateDocument(hoverInfoRequest.Code);
             return await document.GetHoverInformation(hoverInfoRequest.Position, CancellationToken.None);
         }
 
-        public async static Task<CodeCheckResult[]> Handle(CodeCheckRequest codeCheckRequest)
+        public async static Task<CodeCheckResult[]> Handle(CodeCheckRequest codeCheckRequest, string nuget)
         {
-            var workspace = CompletionWorkspace.Create(codeCheckRequest.Assemblies = s_assemblies);
+            // 加载 NuGet 包
+            var nugetAssembliesArray = DownloadNugetPackages.LoadPackages(nuget).Select(a => a.Location).ToArray();
+
+            var workspace = CompletionWorkspace.Create([.. nugetAssembliesArray, .. s_assemblies]);
             var document = await workspace.CreateDocument(codeCheckRequest.Code);
             return await document.GetCodeCheckResults(CancellationToken.None);
         }
 
-        public async static Task<SignatureHelpResult> Handle(SignatureHelpRequest signatureHelpRequest)
+        public async static Task<SignatureHelpResult> Handle(SignatureHelpRequest signatureHelpRequest, string nuget)
         {
-            var workspace = CompletionWorkspace.Create(signatureHelpRequest.Assemblies = s_assemblies);
+            var nugetAssembliesArray = DownloadNugetPackages.LoadPackages(nuget).Select(a => a.Location).ToArray();
+            var workspace = CompletionWorkspace.Create([.. nugetAssembliesArray, .. s_assemblies]);
             var document = await workspace.CreateDocument(signatureHelpRequest.Code);
             return await document.GetSignatureHelp(signatureHelpRequest.Position, CancellationToken.None);
         }
 
         //格式化代码
         public static string FormatCode(string sourceCode)
         {
-
             var assemblies = new[]
             {
                 Assembly.Load("Microsoft.CodeAnalysis"),

diff --git a/MonacoRoslynCompletionProvider/NugetHelper/DownloadNugetPackages.cs b/MonacoRoslynCompletionProvider/NugetHelper/DownloadNugetPackages.cs
@@ -46,7 +46,10 @@ public static List<Assembly> LoadPackages(string packages)
                     {
                         try
                         {
-                            if (file.EndsWith(@$"net8.0\{downloadItem}.dll") || file.Contains(@$"netstandard2.0\{downloadItem}.dll"))
+                            var fileName = Path.GetFileName(file);
+                            if (file.EndsWith(@$"net8.0\{fileName}") ||
+                                file.Contains(@$"netstandard2.0\{fileName}") ||
+                                file.Contains(@$"netstandard2.1\{fileName}"))
                             {
                                 var assembly = Assembly.LoadFrom(file);
                                 assemblies.Add(assembly);
@@ -62,7 +65,7 @@ public static List<Assembly> LoadPackages(string packages)
             }
             return assemblies;
         }
-        
+
         public static void DownloadAllPackages(string packages)
         {
             if (!String.IsNullOrWhiteSpace(packages))

diff --git a/SharpPad/Program.cs b/SharpPad/Program.cs
@@ -21,28 +21,32 @@
         if (e.Request.Path.Value?.EndsWith("complete") == true)
         {
             var tabCompletionRequest = JsonSerializer.Deserialize<TabCompletionRequest>(text);
-            var tabCompletionResults = await CompletitionRequestHandler.Handle(tabCompletionRequest);
+            string nugetPackages = string.Join(" ", tabCompletionRequest?.Packages.Select(p => $"{p.Id},{p.Version};{Environment.NewLine}") ?? []);
+            var tabCompletionResults = await CompletitionRequestHandler.Handle(tabCompletionRequest, nugetPackages);
             await JsonSerializer.SerializeAsync(e.Response.Body, tabCompletionResults);
             return;
         }
         else if (e.Request.Path.Value?.EndsWith("signature") == true)
         {
             var signatureHelpRequest = JsonSerializer.Deserialize<SignatureHelpRequest>(text);
-            var signatureHelpResult = await CompletitionRequestHandler.Handle(signatureHelpRequest);
+            string nugetPackages = string.Join(" ", signatureHelpRequest?.Packages.Select(p => $"{p.Id},{p.Version};{Environment.NewLine}") ?? []);
+            var signatureHelpResult = await CompletitionRequestHandler.Handle(signatureHelpRequest, nugetPackages);
             await JsonSerializer.SerializeAsync(e.Response.Body, signatureHelpResult);
             return;
         }
         else if (e.Request.Path.Value?.EndsWith("hover") == true)
         {
             var hoverInfoRequest = JsonSerializer.Deserialize<HoverInfoRequest>(text);
-            var hoverInfoResult = await CompletitionRequestHandler.Handle(hoverInfoRequest);
+            string nugetPackages = string.Join(" ", hoverInfoRequest?.Packages.Select(p => $"{p.Id},{p.Version};{Environment.NewLine}") ?? []);
+            var hoverInfoResult = await CompletitionRequestHandler.Handle(hoverInfoRequest, nugetPackages);
             await JsonSerializer.SerializeAsync(e.Response.Body, hoverInfoResult);
             return;
         }
         else if (e.Request.Path.Value?.EndsWith("codeCheck") == true)
         {
             var codeCheckRequest = JsonSerializer.Deserialize<CodeCheckRequest>(text);
-            var codeCheckResults = await CompletitionRequestHandler.Handle(codeCheckRequest);
+            string nugetPackages = string.Join(" ", codeCheckRequest?.Packages.Select(p => $"{p.Id},{p.Version};{Environment.NewLine}") ?? []);
+            var codeCheckResults = await CompletitionRequestHandler.Handle(codeCheckRequest, nugetPackages);
             await JsonSerializer.SerializeAsync(e.Response.Body, codeCheckResults);
             return;
         }

diff --git a/SharpPad/wwwroot/csharpLanguageProvider.js b/SharpPad/wwwroot/csharpLanguageProvider.js
@@ -9,7 +9,7 @@
         case 'run': endPoint = '/completion/run'; break;
         case 'addPackages': endPoint = '/completion/addPackages'; break;
     }
-    
+
     // 延迟超过1秒后才显示加载中样式
     const notification = document.getElementById('notification');
     const showNotificationDelay = 1000; // 1 second
@@ -18,7 +18,7 @@
         notification.style.backgroundColor = 'rgba(33, 150, 243, 0.9)';
         notification.style.display = 'block';
     }, showNotificationDelay);
-    
+
     try {
         if (type === 'run') {
             // 使用 POST 请求发送代码和包信息
@@ -51,18 +51,21 @@
 
 function registerCsharpProvider() {
 
-    var assemblies = [
-    ];
-
     monaco.languages.registerCompletionItemProvider('csharp', {
         triggerCharacters: [".", " "],
         provideCompletionItems: async (model, position) => {
             let suggestions = [];
 
+            const file = getCurrentFile();
+            const packages = file?.nugetConfig?.packages || [];
+
             let request = {
                 Code: model.getValue(),
                 Position: model.getOffsetAt(position),
-                Assemblies: assemblies
+                Packages: packages.map(p => ({
+                    Id: p.id,
+                    Version: p.version
+                }))
             }
 
             let resultQ = await sendRequest("complete", request);
@@ -88,10 +91,16 @@ function registerCsharpProvider() {
 
         provideSignatureHelp: async (model, position, token, context) => {
 
+            const file = getCurrentFile();
+            const packages = file?.nugetConfig?.packages || [];
+
             let request = {
                 Code: model.getValue(),
                 Position: model.getOffsetAt(position),
-                Assemblies: assemblies
+                Packages: packages.map(p => ({
+                    Id: p.id,
+                    Version: p.version
+                }))
             }
 
             let resultQ = await sendRequest("signature", request);
@@ -130,10 +139,16 @@ function registerCsharpProvider() {
     monaco.languages.registerHoverProvider('csharp', {
         provideHover: async function (model, position) {
 
+            const file = getCurrentFile();
+            const packages = file?.nugetConfig?.packages || [];
+
             let request = {
                 Code: model.getValue(),
                 Position: model.getOffsetAt(position),
-                Assemblies: assemblies
+                Packages: packages.map(p => ({
+                    Id: p.id,
+                    Version: p.version
+                }))
             }
 
             let resultQ = await sendRequest("hover", request);
@@ -157,9 +172,15 @@ function registerCsharpProvider() {
     monaco.editor.onDidCreateModel(function (model) {
         async function validate() {
 
+            const file = getCurrentFile();
+            const packages = file?.nugetConfig?.packages || [];
+
             let request = {
                 Code: model.getValue(),
-                Assemblies: assemblies
+                Packages: packages.map(p => ({
+                    Id: p.id,
+                    Version: p.version
+                }))
             }
 
             let resultQ = await sendRequest("codeCheck", request)