ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove Peek Definition error popup (#786)

Browse Source 
* Remove Peek Definition error popup

* Fix broken test case

* Fix bug
This commit is contained in:
Karl Burtram
2019-03-22 16:52:45 -07:00
committed by GitHub
parent 57727409c1
commit eaaff8b8a1
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
View File

@@ -415,17 +415,10 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
definitionResult = GetDefinition(textDocumentPosition, scriptFile, connInfo); definitionResult = GetDefinition(textDocumentPosition, scriptFile, connInfo);
} }
if (definitionResult != null) if (definitionResult != null && !definitionResult.IsErrorResult)
{ {
if (definitionResult.IsErrorResult) await requestContext.SendResult(definitionResult.Locations);
{ succeeded = true;
await requestContext.SendError(definitionResult.Message);
}
else
{
await requestContext.SendResult(definitionResult.Locations);
succeeded = true;
}
} }
else else
{ {

6
test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs
View File

@@ -46,9 +46,9 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.LanguageServer
// request definition // request definition
var definitionTask = await Task.WhenAny(langService.HandleDefinitionRequest(textDocument, requestContext.Object), Task.Delay(TaskTimeout)); var definitionTask = await Task.WhenAny(langService.HandleDefinitionRequest(textDocument, requestContext.Object), Task.Delay(TaskTimeout));
await definitionTask; await definitionTask;
// verify that send result was not called and send error was called // verify that send result was called once and send error was not called
requestContext.Verify(m => m.SendResult(It.IsAny<Location[]>()), Times.Never()); requestContext.Verify(m => m.SendResult(It.IsAny<Location[]>()), Times.Once());
requestContext.Verify(m => m.SendError(It.IsAny<string>(), It.IsAny<int>()), Times.Once()); requestContext.Verify(m => m.SendError(It.IsAny<string>(), It.IsAny<int>()), Times.Never());
} }
/// <summary> /// <summary>