Merge pull request microsoft#1404 from zooba/interactive

Interactive window
soycacan · Jul 6, 2016 · 0714753 · 0714753
2 parents 5a94181 + 8202c9f
commit 0714753
Show file tree

Hide file tree

Showing 70 changed files with 149 additions and 214 deletions.
diff --git a/Build/Common.Build.VSSDK.RoslynWorkarounds.targets b/Build/Common.Build.VSSDK.RoslynWorkarounds.targets
diff --git a/Build/Common.Build.VSSDK.targets b/Build/Common.Build.VSSDK.targets
@@ -205,6 +205,4 @@
              Query="/vsx11:PackageManifest/vsx11:Installation/@InstalledByMsi"
              Value="false" />
   </Target>
-
-  <Import Project="Common.Build.VSSDK.RoslynWorkarounds.targets" Condition="$(VSTarget) == '15.0'" />
 </Project>
diff --git a/Common/Tests/Utilities.UI/UI/InteractiveWindow.cs b/Common/Tests/Utilities.UI/UI/InteractiveWindow.cs
@@ -32,8 +32,8 @@
 using Microsoft.VisualStudio.Repl;
 #endif
 #if DEV14_OR_LATER
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Shell;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Shell;
 #else
 using IInteractiveWindow = Microsoft.VisualStudio.Repl.IReplWindow;
 using InteractiveWindowProvider = Microsoft.VisualStudio.Repl.IReplWindowProvider;

diff --git a/Common/Tests/Utilities.UI/UI/ReplWindowProxy.cs b/Common/Tests/Utilities.UI/UI/ReplWindowProxy.cs
@@ -33,8 +33,8 @@
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Operations;
 #if DEV14_OR_LATER
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Shell;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Shell;
 #else
 using Microsoft.VisualStudio.Repl;
 using IInteractiveWindow = Microsoft.VisualStudio.Repl.IReplWindow;

diff --git a/Common/Tests/Utilities/Mocks/MockReplWindow.cs b/Common/Tests/Utilities/Mocks/MockReplWindow.cs
@@ -23,7 +23,7 @@
 #if NTVS_FEATURE_INTERACTIVEWINDOW
 using Microsoft.NodejsTools.Repl;
 #elif DEV14_OR_LATER
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 #else
 using Microsoft.VisualStudio.Repl;
 #endif

diff --git a/Common/Tests/Utilities/TestUtilities.csproj b/Common/Tests/Utilities/TestUtilities.csproj
@@ -70,8 +70,6 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <Reference Include="Microsoft.Office.Tools.v4.0.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Tools.Applications.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.$(VSTarget)" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.$(VSTarget)" />
     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />

diff --git a/Python/Product/Django/Django.csproj b/Python/Product/Django/Django.csproj
@@ -143,12 +143,8 @@
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-      <Private>false</Private>
-    </Reference>
+    <Reference Include="Microsoft.PythonTools.InteractiveWindow" />
+    <Reference Include="Microsoft.PythonTools.VsInteractiveWindow" />
   </ItemGroup>
   <ItemDefinitionGroup>
     <ZipProject>

diff --git a/Python/Product/EnvironmentsListHost/EnvironmentsListHost.csproj b/Python/Product/EnvironmentsListHost/EnvironmentsListHost.csproj
@@ -62,12 +62,8 @@
       <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.Windows.Design.Host.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Settings.$(VSTarget), Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86" />
-    <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-      <Private>false</Private>
-    </Reference>
+    <Reference Include="Microsoft.PythonTools.InteractiveWindow" />
+    <Reference Include="Microsoft.PythonTools.VsInteractiveWindow" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">

diff --git a/Python/Product/PythonTools/Microsoft.PythonTools.VsInteractiveWindow.pkgdef b/Python/Product/PythonTools/Microsoft.PythonTools.VsInteractiveWindow.pkgdef
diff --git a/Python/Product/PythonTools/PythonTools.csproj b/Python/Product/PythonTools/PythonTools.csproj
@@ -105,6 +105,8 @@
     <ProjectReference2 Include="..\TestAdapter\TestAdapter.csproj" />
     <ProjectReference2 Include="..\TestAdapter.Analysis\TestAdapter.Analysis.csproj" />
     <ProjectReference2 Include="..\XamlDesignerSupport\XamlDesignerSupport.csproj" />
+    <Reference Include="Microsoft.PythonTools.InteractiveWindow" />
+    <Reference Include="Microsoft.PythonTools.VsInteractiveWindow" />
     <Reference Include="Microsoft.VisualStudio.Threading, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
@@ -233,12 +235,6 @@
     <Reference Include="Microsoft.VisualStudio.Settings.$(VSTarget), Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86">
       <Private>false</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.InteractiveWindow">
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.VsInteractiveWindow">
-      <Private>false</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="PythonTools\CodeCoverage\CoverageExporter.cs" />
@@ -700,6 +696,20 @@
       <IncludeInVSIX>true</IncludeInVSIX>
       <VSIXSubPath>.</VSIXSubPath>
     </Content>
+    <Content Include="$(BuildRoot)\Python\References\Dev$(VSTarget)\Microsoft.PythonTools.InteractiveWindow.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>.</VSIXSubPath>
+    </Content>
+    <Content Include="$(BuildRoot)\Python\References\Dev$(VSTarget)\Microsoft.PythonTools.VsInteractiveWindow.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>.</VSIXSubPath>
+    </Content>
+    <Content Include="Microsoft.PythonTools.VsInteractiveWindow.pkgdef">
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="NoInterpreters.mht">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>

diff --git a/Python/Product/PythonTools/PythonTools.vsct b/Python/Product/PythonTools/PythonTools.vsct
@@ -901,7 +901,7 @@ permissions and limitations under the License.
       <IDSymbol name="groupAzureDiagnostics" value="400" />
     </GuidSymbol>
 
-    <GuidSymbol name="guidInteractiveWindowCmdSet" value="{00B8868B-F9F5-4970-A048-410B05508506}">
+    <GuidSymbol name="guidInteractiveWindowCmdSet" value="{F27554FA-3DF4-4649-A81C-1B97C932E78B}">
       <IDSymbol name="InteractiveToolbarGroup" value="0x1053"/>
     </GuidSymbol>
   </Symbols>

diff --git a/Python/Product/PythonTools/PythonTools/Commands/ExecuteInReplCommand.cs b/Python/Product/PythonTools/PythonTools/Commands/ExecuteInReplCommand.cs
@@ -26,8 +26,9 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudioTools;
 using Microsoft.VisualStudio.Imaging;
-using Microsoft.VisualStudio.InteractiveWindow.Shell;
+using Microsoft.PythonTools.InteractiveWindow.Shell;
 using Microsoft.PythonTools.Infrastructure;
+using Microsoft.PythonTools.InteractiveWindow;
 
 namespace Microsoft.PythonTools.Commands {
     /// <summary>
@@ -124,7 +125,7 @@ public override async void DoCommand(object sender, EventArgs e) {
 
             // The interpreter may take some time to startup, do this off the UI thread.
             await ThreadHelper.JoinableTaskFactory.RunAsync(async () => {
-                await eval.ResetAsync();
+                await ((IInteractiveEvaluator)eval).ResetAsync();
 
                 window.InteractiveWindow.WriteLine(string.Format("Running {0}", config.ScriptName));
 

diff --git a/Python/Product/PythonTools/PythonTools/Commands/OpenDebugReplCommand.cs b/Python/Product/PythonTools/PythonTools/Commands/OpenDebugReplCommand.cs
@@ -18,7 +18,7 @@
 using Microsoft.PythonTools.Navigation;
 using Microsoft.PythonTools.Repl;
 using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.InteractiveWindow.Shell;
+using Microsoft.PythonTools.InteractiveWindow.Shell;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudioTools;

diff --git a/Python/Product/PythonTools/PythonTools/Commands/SendToReplCommand.cs b/Python/Product/PythonTools/PythonTools/Commands/SendToReplCommand.cs
@@ -22,7 +22,7 @@
 using Microsoft.PythonTools.Parsing;
 using Microsoft.PythonTools.Repl;
 using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text;

diff --git a/Python/Product/PythonTools/PythonTools/Editor/ReplWindowCreationListener.cs b/Python/Product/PythonTools/PythonTools/Editor/ReplWindowCreationListener.cs
@@ -20,8 +20,8 @@
 using Microsoft.PythonTools.Language;
 using Microsoft.PythonTools.Repl;
 using Microsoft.VisualStudio.ComponentModelHost;
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Shell;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Shell;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;

diff --git a/Python/Product/PythonTools/PythonTools/Extensions.cs b/Python/Product/PythonTools/PythonTools/Extensions.cs
@@ -39,7 +39,7 @@
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Debugger.Interop;
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Language.StandardClassification;
 using Microsoft.VisualStudio.Shell;

diff --git a/Python/Product/PythonTools/PythonTools/Intellisense/CompletionAnalysis.cs b/Python/Product/PythonTools/PythonTools/Intellisense/CompletionAnalysis.cs
@@ -21,7 +21,7 @@
 using Microsoft.PythonTools.Infrastructure;
 using Microsoft.PythonTools.Interpreter;
 using Microsoft.PythonTools.Repl;
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Language.StandardClassification;
 using Microsoft.VisualStudio.Text;

diff --git a/Python/Product/PythonTools/PythonTools/Intellisense/IntellisenseController.cs b/Python/Product/PythonTools/PythonTools/Intellisense/IntellisenseController.cs
@@ -26,7 +26,7 @@
 using Microsoft.PythonTools.Repl;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Text;

diff --git a/Python/Product/PythonTools/PythonTools/Intellisense/NormalCompletionAnalysis.cs b/Python/Product/PythonTools/PythonTools/Intellisense/NormalCompletionAnalysis.cs
@@ -22,7 +22,7 @@
 using Microsoft.PythonTools.Infrastructure;
 using Microsoft.PythonTools.Interpreter;
 using Microsoft.PythonTools.Repl;
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Language.StandardClassification;
 using Microsoft.VisualStudio.Text;

diff --git a/Python/Product/PythonTools/PythonTools/Intellisense/ProjectAnalyzer.cs b/Python/Product/PythonTools/PythonTools/Intellisense/ProjectAnalyzer.cs
@@ -31,7 +31,7 @@
 using Microsoft.PythonTools.Parsing.Ast;
 using Microsoft.PythonTools.Projects;
 using Microsoft.PythonTools.Repl;
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;

diff --git a/Python/Product/PythonTools/PythonTools/InterpreterList/InterpreterListToolWindow.cs b/Python/Product/PythonTools/PythonTools/InterpreterList/InterpreterListToolWindow.cs
@@ -30,7 +30,7 @@
 using Microsoft.PythonTools.Project;
 using Microsoft.PythonTools.Repl;
 using Microsoft.VisualStudio.Imaging;
-using Microsoft.VisualStudio.InteractiveWindow.Shell;
+using Microsoft.PythonTools.InteractiveWindow.Shell;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 

diff --git a/Python/Product/PythonTools/PythonTools/Navigation/CodeWindowManager.cs b/Python/Product/PythonTools/PythonTools/Navigation/CodeWindowManager.cs
@@ -24,7 +24,7 @@
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text;

diff --git a/Python/Product/PythonTools/PythonTools/Navigation/EditFilter.cs b/Python/Product/PythonTools/PythonTools/Navigation/EditFilter.cs
@@ -33,7 +33,7 @@
 using Microsoft.VisualStudio.Editor;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.OLE.Interop;
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;

diff --git a/Python/Product/PythonTools/PythonTools/Project/CustomCommand.cs b/Python/Product/PythonTools/PythonTools/Project/CustomCommand.cs
@@ -641,18 +641,18 @@ private async Task<bool> RunInRepl(IPythonProject project, CommandStartInfo star
                     if (startInfo.IsScript) {
                         interactive.WriteLine(string.Format("Executing {0} {1}", Path.GetFileName(filename), arguments));
                         Debug.WriteLine("Executing {0} {1}", filename, arguments);
-                        result = await pyEvaluator.ExecuteFileAsync(filename, arguments);
+                        await pyEvaluator.ExecuteFileAsync(filename, arguments);
                     } else if (startInfo.IsModule) {
                         interactive.WriteLine(string.Format("Executing -m {0} {1}", filename, arguments));
                         Debug.WriteLine("Executing -m {0} {1}", filename, arguments);
-                        result = await pyEvaluator.ExecuteModuleAsync(filename, arguments);
+                        await pyEvaluator.ExecuteModuleAsync(filename, arguments);
                     } else if (startInfo.IsCode) {
                         Debug.WriteLine("Executing -c \"{0}\"", filename, arguments);
-                        result = await pyEvaluator.ExecuteCodeAsync(filename);
+                        await pyEvaluator.ExecuteCodeAsync(filename);
                     } else {
                         interactive.WriteLine(string.Format("Executing {0} {1}", Path.GetFileName(filename), arguments));
                         Debug.WriteLine("Executing {0} {1}", filename, arguments);
-                        result = await pyEvaluator.ExecuteProcessAsync(filename, arguments);
+                        await pyEvaluator.ExecuteProcessAsync(filename, arguments);
                     }
 
                     if (resetRepl) {

diff --git a/Python/Product/PythonTools/PythonTools/PythonAnalysisClassifierProvider.cs b/Python/Product/PythonTools/PythonTools/PythonAnalysisClassifierProvider.cs
@@ -20,7 +20,7 @@
 using System.Windows.Media;
 using Microsoft.PythonTools.Options;
 using Microsoft.PythonTools.Project;
-using Microsoft.VisualStudio.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow;
 using Microsoft.VisualStudio.Language.StandardClassification;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text;

diff --git a/Python/Product/PythonTools/PythonTools/Repl/DebugReplFrameCommand.cs b/Python/Product/PythonTools/PythonTools/Repl/DebugReplFrameCommand.cs
@@ -24,8 +24,8 @@
 using Microsoft.VisualStudio.Text.Classification;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.Utilities;
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Commands;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Commands;
 
 namespace Microsoft.PythonTools.Repl {
     [Export(typeof(IInteractiveWindowCommand))]

diff --git a/Python/Product/PythonTools/PythonTools/Repl/DebugReplFrameDownCommand.cs b/Python/Product/PythonTools/PythonTools/Repl/DebugReplFrameDownCommand.cs
@@ -17,8 +17,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Commands;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Commands;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Utilities;

diff --git a/Python/Product/PythonTools/PythonTools/Repl/DebugReplFrameUpCommand.cs b/Python/Product/PythonTools/PythonTools/Repl/DebugReplFrameUpCommand.cs
@@ -17,8 +17,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Commands;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Commands;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Utilities;

diff --git a/Python/Product/PythonTools/PythonTools/Repl/DebugReplFramesCommand.cs b/Python/Product/PythonTools/PythonTools/Repl/DebugReplFramesCommand.cs
@@ -22,8 +22,8 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Utilities;
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Commands;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Commands;
 
 namespace Microsoft.PythonTools.Repl {
     [Export(typeof(IInteractiveWindowCommand))]

diff --git a/Python/Product/PythonTools/PythonTools/Repl/DebugReplGoCommand.cs b/Python/Product/PythonTools/PythonTools/Repl/DebugReplGoCommand.cs
@@ -17,8 +17,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Commands;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Commands;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Utilities;

diff --git a/Python/Product/PythonTools/PythonTools/Repl/DebugReplProcessCommand.cs b/Python/Product/PythonTools/PythonTools/Repl/DebugReplProcessCommand.cs
@@ -18,8 +18,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Commands;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Commands;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Utilities;

diff --git a/Python/Product/PythonTools/PythonTools/Repl/DebugReplProcessesCommand.cs b/Python/Product/PythonTools/PythonTools/Repl/DebugReplProcessesCommand.cs
@@ -17,8 +17,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.InteractiveWindow;
-using Microsoft.VisualStudio.InteractiveWindow.Commands;
+using Microsoft.PythonTools.InteractiveWindow;
+using Microsoft.PythonTools.InteractiveWindow.Commands;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Utilities;