Fix build errors after merge

Author: rchiodo

src/client/datascience/interactive-window/interactiveWindowProvider.ts

@@ -96,7 +96,7 @@ export class InteractiveWindowProvider implements IInteractiveWindowProvider, IA
  resource,
  uri: serverURI,
  useDefaultConfig,
- purpose: Identifiers.InteractiveWindowPurpose
+ purpose: Identifiers.HistoryPurpose
  };
  }
 
@@ -156,6 +156,9 @@ export class InteractiveWindowProvider implements IInteractiveWindowProvider, IA
  sync.count -= 1;
  sync.waitable.resolve();
  this.pendingSyncs.delete(key);
+ }
+ }
+ }
 
  private onInteractiveWindowClosed = (interactiveWindow: IInteractiveWindow) => {
  if (this.activeInteractiveWindow === interactiveWindow) {
@@ -175,7 +178,7 @@ export class InteractiveWindowProvider implements IInteractiveWindowProvider, IA
  this.pendingSyncs.set(key, { count: this.postOffice.peerCount, waitable });
 
  // Make sure all providers have an active InteractiveWindow
- await this.postOffice.postCommand(LiveShareCommands.InteractiveWindowCreate, this.id, resource, key);
+ await this.postOffice.postCommand(LiveShareCommands.interactiveWindowCreate, this.id, resource, key);
 
  // Wait for the waitable to be signaled or the peer count on the post office to change
  await waitable.promise;

src/test/datascience/interactiveWindowCommandListener.unit.test.ts

@@ -18,8 +18,8 @@ import { IFileSystem } from '../../client/common/platform/types';
 import { IConfigurationService, IDisposable, ILogger } from '../../client/common/types';
 import { generateCells } from '../../client/datascience/cellFactory';
 import { Commands } from '../../client/datascience/constants';
-import { InteractiveWindowCommandListener } from '../../client/datascience/InteractiveWindow/InteractiveWindowCommandlistener';
-import { InteractiveWindowProvider } from '../../client/datascience/InteractiveWindow/InteractiveWindowProvider';
+import { InteractiveWindowCommandListener } from '../../client/datascience/interactive-window/interactiveWindowCommandlistener';
+import { InteractiveWindowProvider } from '../../client/datascience/interactive-window/interactiveWindowProvider';
 import { JupyterExecutionFactory } from '../../client/datascience/jupyter/jupyterExecutionFactory';
 import { JupyterExporter } from '../../client/datascience/jupyter/jupyterExporter';
 import { JupyterImporter } from '../../client/datascience/jupyter/jupyterImporter';
@@ -169,8 +169,8 @@ suite('InteractiveWindow command listener', async () => {
  // mocks doesn't work with resolving things that also have promises, so use typemoq instead.
  interactiveWindow.setup(s => s.previewNotebook(TypeMoq.It.isAny())).returns(() => Promise.resolve());
 
- when(InteractiveWindowProvider.getActive()).thenReturn(interactiveWindow.object);
- when(InteractiveWindowProvider.getOrCreateActive()).thenResolve(interactiveWindow.object);
+ when(interactiveWindowProvider.getActive()).thenReturn(interactiveWindow.object);
+ when(interactiveWindowProvider.getOrCreateActive()).thenResolve(interactiveWindow.object);
  when(notebookImporter.importFromFile(anything())).thenResolve('imported');
  const metadata: nbformat.INotebookMetadata = {
  language_info: {
@@ -204,7 +204,7 @@ suite('InteractiveWindow command listener', async () => {
 
  const result = new InteractiveWindowCommandListener(
  disposableRegistry,
- instance(InteractiveWindowProvider),
+ instance(interactiveWindowProvider),
  instance(notebookExporter),
  instance(jupyterExecution),
  documentManager,

src/test/datascience/interactiveWindowTestHelpers.tsx

@@ -10,9 +10,9 @@ import { CancellationToken } from 'vscode';
 
 import { EXTENSION_ROOT_DIR } from '../../client/common/constants';
 import { IDataScienceSettings } from '../../client/common/types';
-import { InteractiveWindowMessages } from '../../client/datascience/interactiveWindow/interactiveWindowTypes';
+import { InteractiveWindowMessages } from '../../client/datascience/interactive-window/interactiveWindowTypes';
 import { IInteractiveWindow, IRunnableJupyterCache } from '../../client/datascience/types';
-import { MainPanel } from '../../datascience-ui/interactiveWindow-react/MainPanel';
+import { MainPanel } from '../../datascience-ui/history-react/MainPanel';
 import { ImageButton } from '../../datascience-ui/react-common/imageButton';
 import { updateSettings } from '../../datascience-ui/react-common/settingsReactSide';
 import { DataScienceIocContainer } from './dataScienceIocContainer';