ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-19 09:35:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change to scope file tree to the known path if root folders dont return correctly (#816)

Browse Source 
* Change to scope file tree to the known path if root folders dont return correctly.

* Fixing a typo (duplicate assignment)
This commit is contained in:
udeeshagautam
2019-05-25 09:53:11 -07:00
committed by GitHub
parent b30926b273
commit 758eefe749
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserOperation.cs
View File

@@ -160,7 +160,19 @@ namespace Microsoft.SqlTools.ServiceLayer.FileBrowser
{
this.fileTree.SelectedNode = lastNode;
}
throw new FileBrowserException(string.Format(SR.InvalidPathError, this.expandPath));
// If root folders returned from sys.dm_os_enumerate_filesystem don't match the folders present, expandPath might not be found
// Bug: https://github.com/microsoft/azuredatastudio/issues/4767
// Workaround : scope file browser tree to expandPath explicitly
try
{
this.ScopeFileTreeToPath(expandPath);
return;
}
catch
{
throw new FileBrowserException(string.Format(SR.InvalidPathError, this.expandPath));
}
}
}
@@ -204,7 +216,7 @@ namespace Microsoft.SqlTools.ServiceLayer.FileBrowser
}
public List<FileTreeNode> GetChildren(string filePath)
{
{
List<FileTreeNode> children = new List<FileTreeNode>();
foreach (var file in EnumerateFilesInFolder(Enumerator, connection, filePath))
{
@@ -248,6 +260,26 @@ namespace Microsoft.SqlTools.ServiceLayer.FileBrowser
return false;
}
/// <summary>
/// Creates file tree for a scoped path
/// Removes the top level file tree so only use this if you intend to do that
/// </summary>
/// <param name="expandPath">path to consider at top level node for tree</param>
private void ScopeFileTreeToPath(string expandPath)
{
this.fileTree = new FileTree();
FileTreeNode node = new FileTreeNode()
{
Name = expandPath,
FullPath = expandPath,
IsExpanded = true
};
this.fileTree.RootNode.AddChildNode(node);
node.Children = this.GetChildren(node.FullPath);
this.fileTree.SelectedNode = node;
}
/// <summary>
/// Compares a file name to the user specified mask using a regular expression
/// </summary>