Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions news/2 Fixes/5729.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Adjust input box prompt to look more an IPython console prompt.
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/datascience-ui/history-react/MainPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ export class MainPanel extends React.Component<IMainPanelProps, IMainPanelState>
const errorBackgroundColor = getSettings().errorBackgroundColor;
const actualErrorBackgroundColor = errorBackgroundColor ? errorBackgroundColor : '#FFFFFF';
const maxTextSize = maxOutputSize && maxOutputSize < 10000 && maxOutputSize > 0 ? maxOutputSize : undefined;
const executionCount = this.getInputExecutionCount(this.state.cellVMs);

return (
<div className='edit-panel'>
Expand All @@ -309,6 +310,7 @@ export class MainPanel extends React.Component<IMainPanelProps, IMainPanelState>
ref={this.saveEditCellRef}
gotoCode={noop}
delete={noop}
editExecutionCount={executionCount}
onCodeCreated={this.editableCodeCreated}
onCodeChange={this.codeChange}
monacoTheme={this.state.monacoTheme}
Expand Down
4 changes: 2 additions & 2 deletions src/datascience-ui/history-react/cell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import './cell.css';
import { CellButton } from './cellButton';
import { Code } from './code';
import { CollapseButton } from './collapseButton';
import { CommandPrompt } from './commandPrompt';
import { ExecutionCount } from './executionCount';
import { Image, ImageName } from './image';
import { InputHistory } from './inputHistory';
Expand All @@ -41,6 +40,7 @@ interface ICellProps {
errorBackgroundColor: string;
monacoTheme: string | undefined;
editorOptions: monacoEditor.editor.IEditorOptions;
editExecutionCount: number;
gotoCode(): void;
delete(): void;
submitNewCode(code: string): void;
Expand Down Expand Up @@ -187,7 +187,7 @@ export class Cell extends React.Component<ICellProps> {
return this.props.cellVM.editable ?
(
<div className='controls-div'>
<CommandPrompt />
<ExecutionCount isBusy={busy} count={this.props.editExecutionCount.toString()} visible={this.isCodeCell()} />
</div>
) : (
<div className='controls-div'>
Expand Down
1 change: 1 addition & 0 deletions src/datascience-ui/history-react/code.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
position: relative;
width:100%;
margin-bottom:16px;
top: -2px; /* Account for spacing removed from the monaco editor */
}

.code-area-editable {
Expand Down
1 change: 1 addition & 0 deletions src/datascience-ui/history-react/contentPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export class ContentPanel extends React.Component<IContentPanelProps> {
baseTheme={baseTheme}
codeTheme={this.props.codeTheme}
showWatermark={false}
editExecutionCount={0}
errorBackgroundColor={actualErrorBackgroundColor}
gotoCode={() => this.props.gotoCellCode(index)}
delete={() => this.props.deleteCell(index)}
Expand Down
1 change: 1 addition & 0 deletions src/datascience-ui/history-react/executionCount.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
font-weight: bold;
display:flex;
color: var(--code-comment-color);
font-family: var(--code-font-family);
}

.execution-count-busy-outer {
Expand Down