Skip to content

switch an instance of GetFile to TryGetFile #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2019
Merged

switch an instance of GetFile to TryGetFile #848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/PowerShellEditorServices/Workspace/Workspace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@ private void RecursivelyFindReferences(
GetBaseFilePath(
scriptFile.FilePath);

ScriptFile referencedFile;
foreach (string referencedFileName in scriptFile.ReferencedFiles)
{
string resolvedScriptPath =
Expand All @@ -429,12 +428,9 @@ private void RecursivelyFindReferences(
referencedFileName,
resolvedScriptPath));

// Make sure file exists before trying to get the file
if (File.Exists(resolvedScriptPath))
// Get the referenced file if it's not already in referencedScriptFiles
if (this.TryGetFile(resolvedScriptPath, out ScriptFile referencedFile))
{
// Get the referenced file if it's not already in referencedScriptFiles
referencedFile = this.GetFile(resolvedScriptPath);

// Normalize the resolved script path and add it to the
// referenced files list if it isn't there already
resolvedScriptPath = resolvedScriptPath.ToLower();
Expand Down