ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-25 17:24:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues in file browser service (#469)

Browse Source 
* fix file browser service bug

* modify filebrowser service

* change filebrowser contract

* fix contract

* fix file browser add/expand event contracts

* remove commented code
This commit is contained in:
Kate Shin
2017-09-28 13:02:57 -07:00
committed by GitHub
parent 3510ad7d5c
commit b46c4b4381
8 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserService.cs
View File

@@ -175,7 +175,7 @@ namespace Microsoft.SqlTools.ServiceLayer.FileBrowser
internal async Task RunFileBrowserOpenTask(FileBrowserOpenParams fileBrowserParams)
{
FileBrowserOpenCompleteParams result = new FileBrowserOpenCompleteParams();
FileBrowserOpenedParams result = new FileBrowserOpenedParams();
try
{
@@ -197,7 +197,14 @@ namespace Microsoft.SqlTools.ServiceLayer.FileBrowser
{
FileBrowserOperation browser = new FileBrowserOperation(conn, fileBrowserParams.ExpandPath, fileBrowserParams.FileFilters);
browser.PopulateFileTree();
if (this.ownerToFileBrowserMap.ContainsKey(fileBrowserParams.OwnerUri))
{
this.ownerToFileBrowserMap.Remove(fileBrowserParams.OwnerUri);
}
this.ownerToFileBrowserMap.Add(fileBrowserParams.OwnerUri, browser);
result.OwnerUri = fileBrowserParams.OwnerUri;
result.FileTree = browser.FileTree;
result.Succeeded = true;
}
@@ -212,18 +219,19 @@ namespace Microsoft.SqlTools.ServiceLayer.FileBrowser
result.Message = ex.Message;
}
await ServiceHost.SendEvent(FileBrowserOpenCompleteNotification.Type, result);
await ServiceHost.SendEvent(FileBrowserOpenedNotification.Type, result);
}
internal async Task RunFileBrowserExpandTask(FileBrowserExpandParams fileBrowserParams)
{
FileBrowserExpandCompleteParams result = new FileBrowserExpandCompleteParams();
FileBrowserExpandedParams result = new FileBrowserExpandedParams();
try
{
if (this.ownerToFileBrowserMap.ContainsKey(fileBrowserParams.OwnerUri))
{
FileBrowserOperation browser = this.ownerToFileBrowserMap[fileBrowserParams.OwnerUri];
browser.ExpandSelectedNode(fileBrowserParams.ExpandPath);
result.OwnerUri = fileBrowserParams.OwnerUri;
result.ExpandedNode = browser.FileTree.SelectedNode;
result.Succeeded = true;
}
@@ -238,12 +246,12 @@ namespace Microsoft.SqlTools.ServiceLayer.FileBrowser
result.Message = ex.Message;
}
await ServiceHost.SendEvent(FileBrowserExpandCompleteNotification.Type, result);
await ServiceHost.SendEvent(FileBrowserExpandedNotification.Type, result);
}
internal async Task RunFileBrowserValidateTask(FileBrowserValidateParams fileBrowserParams)
{
FileBrowserValidateCompleteParams result = new FileBrowserValidateCompleteParams();
FileBrowserValidatedParams result = new FileBrowserValidatedParams();
try
{
@@ -276,7 +284,7 @@ namespace Microsoft.SqlTools.ServiceLayer.FileBrowser
result.Message = ex.Message;
}
await ServiceHost.SendEvent(FileBrowserValidateCompleteNotification.Type, result);
await ServiceHost.SendEvent(FileBrowserValidatedNotification.Type, result);
}
}
}