Merge pull request #1201 from mholo65/fix/cake-loaded-codecheck-error

Fix diagnostics from loaded cake files shown in the current file

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+## [1.31.1] - _Not Yet Released_
+* Fixed bug where diagnostics from loaded `.cake` files was shown in the current file. (PR: [#1201](https://github.com/OmniSharp/omnisharp-roslyn/pull/1201))
+
 ## [1.31.0] - 2018-05-29
 * Update to Roslyn 2.8.0 packages, adding support for C# 7.3. (PR: [#1182](https://github.com/OmniSharp/omnisharp-roslyn/pull/1182))
 * MSBuild project system no longer stops when a project fails to load. (PR: [#1181](https://github.com/OmniSharp/omnisharp-roslyn/pull/1181))

src/OmniSharp.Cake/Services/MonoScriptGenerationProcess.cs

@@ -95,7 +95,7 @@ public void Start(int port, string workingDirectory)
             process.WaitForExit();
 
             // If OmniSharp bundled Mono runtime, use bootstrap script.
-            var script = Path.Combine(Path.GetDirectoryName(runtime), "run");
+            var script = Path.Combine(Path.GetDirectoryName(runtime), "../run");
             if (File.Exists(script))
             {
                 return (script, "--no-omnisharp ");

src/OmniSharp.Cake/Services/RequestHandlers/Diagnostics/CodeCheckHandler.cs

@@ -1,8 +1,12 @@
-using System.Composition;
+using System;
+using System.Composition;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using OmniSharp.Mef;
 using OmniSharp.Models;
 using OmniSharp.Models.CodeCheck;
+using OmniSharp.Utilities;
 
 namespace OmniSharp.Cake.Services.RequestHandlers.Diagnostics
 {
@@ -18,5 +22,33 @@ public CodeCheckHandler(
 
         public override bool IsValid(CodeCheckRequest request) =>
             !string.IsNullOrEmpty(request.FileName);
+
+        protected override Task<QuickFixResponse> TranslateResponse(QuickFixResponse response, CodeCheckRequest request)
+        {
+            if (response?.QuickFixes == null)
+            {
+                return Task.FromResult(response);
+            }
+
+            var quickFixes = response.QuickFixes.Where(x => PathsAreEqual(x.FileName, request.FileName));
+            response.QuickFixes = quickFixes;
+            return Task.FromResult(response);
+
+            bool PathsAreEqual(string x, string y)
+            {
+                if (x == null && y == null)
+                {
+                    return true;
+                }
+                if (x == null || y == null)
+                {
+                    return false;
+                }
+
+                var comparer = PlatformHelper.IsWindows ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+
+                return Path.GetFullPath(x).Equals(Path.GetFullPath(y), comparer);
+            }
+        }
     }
 }

test-assets/test-projects/CakeProject/error.cake

@@ -0,0 +1,3 @@
+class Foo {
+    public asdf MyProperty { get; set; }
+}

test-assets/test-projects/CakeProject/tools/packages.config

@@ -1,4 +1,4 @@
 <packages>
-    <package id="Cake" version="0.23.0" />
-    <package id="Cake.Bakery" version="0.2.0" />
+    <package id="Cake" version="0.27.2" />
+    <package id="Cake.Bakery" version="0.3.0" />
 </packages>

tests/OmniSharp.Cake.Tests/CakeProjectSystemFacts.cs

@@ -28,9 +28,10 @@ public async Task ShouldGetProjects()
             {
                 var workspaceInfo = await GetWorkspaceInfoAsync(host);
 
-                Assert.Equal(2, workspaceInfo.Projects.Count());
+                Assert.Equal(3, workspaceInfo.Projects.Count());
                 Assert.Contains("build.cake", workspaceInfo.Projects.Select(p => Path.GetFileName(p.Path)));
                 Assert.Contains("foo.cake", workspaceInfo.Projects.Select(p => Path.GetFileName(p.Path)));
+                Assert.Contains("error.cake", workspaceInfo.Projects.Select(p => Path.GetFileName(p.Path)));
             }
         }
 
@@ -43,16 +44,16 @@ public async Task ShouldAddAndRemoveProjects()
                 var tempFile = Path.Combine(testProject.Directory, "temp.cake");
 
                 var workspaceInfo = await GetWorkspaceInfoAsync(host);
-                Assert.Equal(2, workspaceInfo.Projects.Count());
+                Assert.Equal(3, workspaceInfo.Projects.Count());
 
                 await AddFile(host, tempFile);
                 workspaceInfo = await GetWorkspaceInfoAsync(host);
-                Assert.Equal(3, workspaceInfo.Projects.Count());
+                Assert.Equal(4, workspaceInfo.Projects.Count());
                 Assert.Contains("temp.cake", workspaceInfo.Projects.Select(p => Path.GetFileName(p.Path)));
 
                 await RemoveFile(host, tempFile);
                 workspaceInfo = await GetWorkspaceInfoAsync(host);
-                Assert.Equal(2, workspaceInfo.Projects.Count());
+                Assert.Equal(3, workspaceInfo.Projects.Count());
                 Assert.DoesNotContain("temp.cake", workspaceInfo.Projects.Select(p => Path.GetFileName(p.Path)));
             }
         }

tests/OmniSharp.Cake.Tests/CodeCheckFacts.cs

@@ -39,7 +39,18 @@ public async Task ShouldNotCallCodeCheckServiceIfRequestDoesNotSpecifyFileName()
             var diagnostics = await FindDiagnostics(input, includeFileName: false);
             Assert.Null(diagnostics);
         }
-
+
+        [Fact]
+        public async Task ShouldNotIncludeDiagnosticsFromLoadedFilesIfFileNameIsSpecified()
+        {
+            const string input = @"
+#load error.cake
+var target = Argument(""target"", ""Default"");";
+
+            var diagnostics = await FindDiagnostics(input, includeFileName: true);
+            Assert.Empty(diagnostics.QuickFixes);
+        }
+
         private async Task<QuickFixResponse> FindDiagnostics(string contents, bool includeFileName)
         {
             using (var testProject = await TestAssets.Instance.GetTestProjectAsync("CakeProject", shadowCopy : false))