Skip to content

Commit 9d9f685

Browse files
author
Paul van Brenk
committed
Fix logic
1 parent 1407286 commit 9d9f685

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

Nodejs/Product/Nodejs/Repl/NpmReplCommand.cs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ public async Task<ExecutionResult> Execute(IReplWindow window, string arguments)
5858
foreach (var project in loadedProjects)
5959
{
6060
var hierarchy = (IVsHierarchy)project;
61-
object extObject;
6261

63-
var projectResult = hierarchy.GetProperty(VSConstants.VSITEMID_ROOT, (int)__VSHPROPID.VSHPROPID_ExtObject, out extObject);
62+
var projectResult = hierarchy.GetProperty(VSConstants.VSITEMID_ROOT, (int)__VSHPROPID.VSHPROPID_ExtObject, out var extObject);
6463
if (!ErrorHandler.Succeeded(projectResult))
6564
{
6665
continue;
@@ -112,20 +111,18 @@ public async Task<ExecutionResult> Execute(IReplWindow window, string arguments)
112111
}
113112

114113
Tuple<string, IVsHierarchy> projectInfo;
114+
NodejsProjectNode nodejsProject = null;
115115
if (string.IsNullOrEmpty(projectPath) && projectNameToDirectoryDictionary.Count == 1)
116116
{
117117
projectInfo = projectNameToDirectoryDictionary.Values.First();
118118
}
119-
else
120-
{
121-
projectNameToDirectoryDictionary.TryGetValue(projectPath, out projectInfo);
122-
}
123-
124-
NodejsProjectNode nodejsProject = null;
125-
projectPath = projectInfo.Item1;
126-
if (projectInfo.Item2 != null)
119+
else if (projectNameToDirectoryDictionary.TryGetValue(projectPath, out projectInfo))
127120
{
128-
nodejsProject = projectInfo.Item2.GetProject().GetNodejsProject();
121+
projectPath = projectInfo.Item1;
122+
if (projectInfo.Item2 != null)
123+
{
124+
nodejsProject = projectInfo.Item2.GetProject().GetNodejsProject();
125+
}
129126
}
130127

131128
var isGlobalCommand = false;

0 commit comments

Comments
 (0)