Wire up to combobox

Author: rchiodo

src/client/datascience/jupyter/jupyterExecution.ts

@@ -12,6 +12,7 @@ import { CancellationToken, Event, EventEmitter, Uri } from 'vscode';
 
 import { ILiveShareApi, IWorkspaceService } from '../../common/application/types';
 import { Cancellation, CancellationError } from '../../common/cancellation';
+import { PYTHON_LANGUAGE } from '../../common/constants';
 import { traceInfo } from '../../common/logger';
 import { IFileSystem, TemporaryDirectory } from '../../common/platform/types';
 import { IProcessServiceFactory, IPythonExecutionFactory, SpawnOptions } from '../../common/process/types';
@@ -232,7 +233,7 @@ export class JupyterExecutionBase implements IJupyterExecution {
  private async enumerateInterpreterVersions() : Promise<IRunnableJupyter[]> {
  // Find all interpreters that support jupyter notebook. That's the minimum required to start.
  const interpreters = await this.interpreterService.getInterpreters();
- const possible = await Promise.all(interpreters.map(this.getInterpreterVersion));
+ const possible = await Promise.all(interpreters.map(this.getInterpreterVersion.bind(this)));
  return possible.filter(p => p !== undefined) as IRunnableJupyter[];
  }
 
@@ -567,7 +568,7 @@ export class JupyterExecutionBase implements IJupyterExecution {
 
  // For each get its details as we will likely need them
  const specDetails = await Promise.all(specs.map(async s => {
- if (s && s.path && s.path.length > 0 && await fs.pathExists(s.path)) {
+ if (s && s.language === PYTHON_LANGUAGE && s.path && s.path.length > 0 && await fs.pathExists(s.path)) {
  return this.interpreterService.getInterpreterDetails(s.path);
  }
  }));

src/client/datascience/jupyter/runnableJupyterCache.ts

@@ -40,7 +40,7 @@ export class RunnableJupyterCache implements IRunnableJupyterCache {
  const current = await this.interpreterService.getActiveInterpreter(resource);
 
  // Find the closest match
- if (current && current.version) {
+ if (current) {
  let bestScore = -1;
  for (const entry of versions) {
  let currentScore = 0;
@@ -50,7 +50,7 @@ export class RunnableJupyterCache implements IRunnableJupyterCache {
  // Interpreter based (local)
  const interpreter = entry.interpreter;
  const version = interpreter ? interpreter.version : undefined;
- if (version) {
+ if (version && current.version) {
  if (version.major === current.version.major) {
  currentScore += 4;
  if (version.minor === current.version.minor) {
@@ -61,6 +61,11 @@ export class RunnableJupyterCache implements IRunnableJupyterCache {
  }
  }
  }
+ const name = entry.name;
+ if (current.displayName === name) {
+ // This is likely an exact match
+ currentScore += 8;
+ }
  // Kernel based (remote)
  const kernelSpec = entry.spec;
  if (kernelSpec) {

src/datascience-ui/history-react/mainPanelState.ts

@@ -62,8 +62,8 @@ export function generateTestState(inputBlockToggled : (id: string) => void, file
  tokenizerLoaded: true,
  editorOptions: {},
  currentExecutionCount: 0,
- runnableVersions: [],
- currentRunnableVersion: -1
+ runnableVersions: [{ name: 'My Jupyter', type: 'local' }],
+ currentRunnableVersion: 0
  };
 }
 

src/datascience-ui/history-react/toolbarPanel.tsx

@@ -45,8 +45,8 @@ export class ToolbarPanel extends React.Component<IToolbarPanelProps> {
  const { runnableVersions, currentVersion } = this.generateRunnableVersions();
  return(
  <div id='toolbar-panel'>
- <ComboBox values={runnableVersions} currentValue={currentVersion} onChange={this.changeRunnable} />
  <MenuBar baseTheme={this.props.baseTheme}>
+ <ComboBox values={runnableVersions} currentValue={currentVersion} onChange={this.changeRunnable} />
  <ImageButton baseTheme={this.props.baseTheme} onClick={this.props.clearAll} tooltip={getLocString('DataScience.clearAll', 'Remove All Cells')}>
  <Image baseTheme={this.props.baseTheme} class='image-button-image' image={ImageName.Cancel}/>
  </ImageButton>

src/datascience-ui/react-common/comboBox.css

@@ -0,0 +1,15 @@
+.combobox-container {
+ background-color: var(--vscode-editor-background);
+}
+
+.combobox__control {
+ background-color: var(--vscode-editor-background);
+}
+
+.combobox__value-indicator {
+ background-color: var(--vscode-editor-background);
+}
+
+.combobox__indicators {
+ background-color: var(--vscode-editor-background);
+}

src/datascience-ui/react-common/comboBox.tsx

@@ -4,9 +4,12 @@
 'use strict';
 
 import * as React from 'react';
-import Select from 'react-select/lib/Select';
+// tslint:disable-next-line: import-name match-default-export-name
+import Select from 'react-select';
 import { ValueType } from 'react-select/lib/types';
 
+import './comboBox.css';
+
 interface IComboBoxProps {
  values: { value: string; label: string }[];
  currentValue: number;
@@ -21,7 +24,12 @@ export class ComboBox extends React.Component<IComboBoxProps> {
  public render() {
  const currentValue = this.props.values.length > this.props.currentValue ? this.props.values[this.props.currentValue] : undefined ;
  return (
- <Select value={currentValue} options={this.props.values} onChange={this.props.onChange}/>
+ <Select
+ classNamePrefix='combobox'
+ className='combobox-container'
+ value={currentValue}
+ options={this.props.values}
+ onChange={this.props.onChange}/>
  );
  }