From c2e5528ceca5dd273df93b9d995ca7e81d0dde33 Mon Sep 17 00:00:00 2001 From: Rich Chiodo Date: Thu, 23 May 2019 14:22:38 -0700 Subject: [PATCH 1/2] Fix command prompt to look like Spyder --- package-lock.json | 28 +++++++++---------- .../history-react/MainPanel.tsx | 2 ++ src/datascience-ui/history-react/cell.tsx | 4 +-- src/datascience-ui/history-react/code.css | 1 + .../history-react/contentPanel.tsx | 1 + .../history-react/executionCount.css | 1 + 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1bdda9f42adb..a3ecd5d820e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6728,7 +6728,7 @@ }, "event-stream": { "version": "3.3.4", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", "dev": true, "requires": { @@ -12347,7 +12347,7 @@ "dependencies": { "convert-source-map": { "version": "1.6.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", "dev": true, "requires": { @@ -12356,7 +12356,7 @@ }, "execa": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { @@ -12382,7 +12382,7 @@ }, "find-up": { "version": "3.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { @@ -12397,7 +12397,7 @@ }, "get-stream": { "version": "4.1.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { @@ -12406,7 +12406,7 @@ }, "glob": { "version": "7.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { @@ -12420,7 +12420,7 @@ }, "locate-path": { "version": "3.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { @@ -12440,7 +12440,7 @@ }, "os-locale": { "version": "3.1.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { @@ -12451,7 +12451,7 @@ }, "path-exists": { "version": "3.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true }, @@ -12463,7 +12463,7 @@ }, "pkg-dir": { "version": "3.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { @@ -12472,7 +12472,7 @@ }, "pump": { "version": "3.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { @@ -12488,13 +12488,13 @@ }, "resolve-from": { "version": "4.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, "rimraf": { "version": "2.6.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { @@ -13681,7 +13681,7 @@ }, "queue": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz", + "resolved": "http://registry.npmjs.org/queue/-/queue-3.1.0.tgz", "integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=", "dev": true, "requires": { diff --git a/src/datascience-ui/history-react/MainPanel.tsx b/src/datascience-ui/history-react/MainPanel.tsx index f2c507118796..2eb8fbc86240 100644 --- a/src/datascience-ui/history-react/MainPanel.tsx +++ b/src/datascience-ui/history-react/MainPanel.tsx @@ -290,6 +290,7 @@ export class MainPanel extends React.Component 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 (
@@ -309,6 +310,7 @@ export class MainPanel extends React.Component ref={this.saveEditCellRef} gotoCode={noop} delete={noop} + editExecutionCount={executionCount} onCodeCreated={this.editableCodeCreated} onCodeChange={this.codeChange} monacoTheme={this.state.monacoTheme} diff --git a/src/datascience-ui/history-react/cell.tsx b/src/datascience-ui/history-react/cell.tsx index 3d07c770d3fe..c797334c20fe 100644 --- a/src/datascience-ui/history-react/cell.tsx +++ b/src/datascience-ui/history-react/cell.tsx @@ -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'; @@ -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; @@ -187,7 +187,7 @@ export class Cell extends React.Component { return this.props.cellVM.editable ? (
- +
) : (
diff --git a/src/datascience-ui/history-react/code.css b/src/datascience-ui/history-react/code.css index 8657534e3dc0..e5ab31041827 100644 --- a/src/datascience-ui/history-react/code.css +++ b/src/datascience-ui/history-react/code.css @@ -3,6 +3,7 @@ position: relative; width:100%; margin-bottom:16px; + top: -2px; /* Account for spacing removed from the monaco editor */ } .code-area-editable { diff --git a/src/datascience-ui/history-react/contentPanel.tsx b/src/datascience-ui/history-react/contentPanel.tsx index 80ae1a05bbe5..b084d6a4cda2 100644 --- a/src/datascience-ui/history-react/contentPanel.tsx +++ b/src/datascience-ui/history-react/contentPanel.tsx @@ -75,6 +75,7 @@ export class ContentPanel extends React.Component { baseTheme={baseTheme} codeTheme={this.props.codeTheme} showWatermark={false} + editExecutionCount={0} errorBackgroundColor={actualErrorBackgroundColor} gotoCode={() => this.props.gotoCellCode(index)} delete={() => this.props.deleteCell(index)} diff --git a/src/datascience-ui/history-react/executionCount.css b/src/datascience-ui/history-react/executionCount.css index 9473d225fea0..861c10dd984c 100644 --- a/src/datascience-ui/history-react/executionCount.css +++ b/src/datascience-ui/history-react/executionCount.css @@ -3,6 +3,7 @@ font-weight: bold; display:flex; color: var(--code-comment-color); + font-family: var(--code-font-family); } .execution-count-busy-outer { From 17fa17bb22002bd670875a48a678e7acf3796af8 Mon Sep 17 00:00:00 2001 From: Rich Chiodo Date: Thu, 23 May 2019 14:24:23 -0700 Subject: [PATCH 2/2] Add news entry --- news/2 Fixes/5729.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/2 Fixes/5729.md diff --git a/news/2 Fixes/5729.md b/news/2 Fixes/5729.md new file mode 100644 index 000000000000..7de7e25dc8d4 --- /dev/null +++ b/news/2 Fixes/5729.md @@ -0,0 +1 @@ +Adjust input box prompt to look more an IPython console prompt. \ No newline at end of file