From eaaff8b8a1bd87ae1b299cda100dc2e47011e543 Mon Sep 17 00:00:00 2001
From: Karl Burtram <karlb@microsoft.com>
Date: Fri, 22 Mar 2019 16:52:45 -0700
Subject: [PATCH] Remove Peek Definition error popup (#786)

* Remove Peek Definition error popup

* Fix broken test case

* Fix bug
---
 .../LanguageServices/LanguageService.cs             | 13 +++----------
 .../LanguageServer/PeekDefinitionTests.cs           |  6 +++---
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
index 78cc0311..603037bf 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
@@ -415,17 +415,10 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
                         definitionResult = GetDefinition(textDocumentPosition, scriptFile, connInfo);
                     }
                     
-                    if (definitionResult != null)
+                    if (definitionResult != null && !definitionResult.IsErrorResult)
                     {
-                        if (definitionResult.IsErrorResult)
-                        {
-                            await requestContext.SendError(definitionResult.Message);
-                        }
-                        else
-                        {
-                            await requestContext.SendResult(definitionResult.Locations);
-                            succeeded = true;
-                        }
+                        await requestContext.SendResult(definitionResult.Locations);
+                        succeeded = true;
                     }
                     else
                     {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs
index bd930448..6224cc8c 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs
@@ -46,9 +46,9 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.LanguageServer
             // request definition
             var definitionTask = await Task.WhenAny(langService.HandleDefinitionRequest(textDocument, requestContext.Object), Task.Delay(TaskTimeout));
             await definitionTask;
-            // verify that send result was not called and send error was called
-            requestContext.Verify(m => m.SendResult(It.IsAny<Location[]>()), Times.Never());
-            requestContext.Verify(m => m.SendError(It.IsAny<string>(), It.IsAny<int>()), Times.Once());
+            // verify that send result was called once and send error was not called
+            requestContext.Verify(m => m.SendResult(It.IsAny<Location[]>()), Times.Once());
+            requestContext.Verify(m => m.SendError(It.IsAny<string>(), It.IsAny<int>()), Times.Never());
         }
 
         /// <summary>