From d96c8a52411a7b5ca6a338aa8642035e030da979 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Thu, 31 Oct 2019 15:00:55 -0700 Subject: [PATCH 1/2] Adjust line number styles to line up with VSCode --- news/1 Enhancements/8289.md | 1 + .../interactive-common/editor.tsx | 2 +- .../react-common/monacoEditor.css | 18 +----------------- 3 files changed, 3 insertions(+), 18 deletions(-) create mode 100644 news/1 Enhancements/8289.md diff --git a/news/1 Enhancements/8289.md b/news/1 Enhancements/8289.md new file mode 100644 index 000000000000..51c0b0483332 --- /dev/null +++ b/news/1 Enhancements/8289.md @@ -0,0 +1 @@ +Style adjustments to line numbers (color and width) in the `Native Editor`, to line up with VS Code styles. diff --git a/src/datascience-ui/interactive-common/editor.tsx b/src/datascience-ui/interactive-common/editor.tsx index d288c3f87df9..b6b5cffd358f 100644 --- a/src/datascience-ui/interactive-common/editor.tsx +++ b/src/datascience-ui/interactive-common/editor.tsx @@ -115,7 +115,7 @@ export class Editor extends React.Component { readOnly: readOnly, occurrencesHighlight: false, selectionHighlight: false, - lineDecorationsWidth: 0, + lineDecorationsWidth: 5, contextmenu: false, matchBrackets: false, fontSize: this.props.font.size, diff --git a/src/datascience-ui/react-common/monacoEditor.css b/src/datascience-ui/react-common/monacoEditor.css index 3620b9cf97dc..4e41c4ab8579 100644 --- a/src/datascience-ui/react-common/monacoEditor.css +++ b/src/datascience-ui/react-common/monacoEditor.css @@ -107,26 +107,10 @@ padding-right: 4px; } -.monaco-editor .current-line ~ .line-numbers { - color: var(--override-foreground, var(--vscode-editor-foreground)) !important; -} -.monaco-editor .line-numbers { - color: var(--override-foreground, var(--vscode-editor-foreground)) !important; -} - .monaco-editor .margin { background-color: transparent !important; } -.monaco-editor .margin-view-overlays-border-on { - margin-right: 1px; - padding-right: 1px; - background-color: transparent !important; - border-right-color: black; - border-right-style: solid; - border-right-width: 1px; -} - .monaco-editor .parameter-hints-widget > .wrapper { overflow: hidden; -} \ No newline at end of file +} From 3e23df0b9b0fafca85963cb856fdd19b754eb98e Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Thu, 31 Oct 2019 15:26:46 -0700 Subject: [PATCH 2/2] Address code review comments --- src/datascience-ui/interactive-common/editor.tsx | 2 +- .../interactive-common/mainStateController.ts | 2 +- .../native-editor/nativeEditorStateController.ts | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/datascience-ui/interactive-common/editor.tsx b/src/datascience-ui/interactive-common/editor.tsx index b6b5cffd358f..d288c3f87df9 100644 --- a/src/datascience-ui/interactive-common/editor.tsx +++ b/src/datascience-ui/interactive-common/editor.tsx @@ -115,7 +115,7 @@ export class Editor extends React.Component { readOnly: readOnly, occurrencesHighlight: false, selectionHighlight: false, - lineDecorationsWidth: 5, + lineDecorationsWidth: 0, contextmenu: false, matchBrackets: false, fontSize: this.props.font.size, diff --git a/src/datascience-ui/interactive-common/mainStateController.ts b/src/datascience-ui/interactive-common/mainStateController.ts index c17515b9e5b0..2f1ee0b6c6dc 100644 --- a/src/datascience-ui/interactive-common/mainStateController.ts +++ b/src/datascience-ui/interactive-common/mainStateController.ts @@ -913,7 +913,7 @@ export class MainStateController implements IMessageHandler { } // tslint:disable:no-any - private computeEditorOptions(): monacoEditor.editor.IEditorOptions { + protected computeEditorOptions(): monacoEditor.editor.IEditorOptions { const intellisenseOptions = getSettings().intellisenseOptions; const extraSettings = getSettings().extraSettings; if (intellisenseOptions && extraSettings) { diff --git a/src/datascience-ui/native-editor/nativeEditorStateController.ts b/src/datascience-ui/native-editor/nativeEditorStateController.ts index 012a9c916eee..a588637fd79e 100644 --- a/src/datascience-ui/native-editor/nativeEditorStateController.ts +++ b/src/datascience-ui/native-editor/nativeEditorStateController.ts @@ -306,4 +306,17 @@ export class NativeEditorStateController extends MainStateController { } } } + + /** + * Custom editor settings for Native editor. + * + * @protected + * @returns + * @memberof NativeEditorStateController + */ + protected computeEditorOptions() { + const options = super.computeEditorOptions(); + options.lineDecorationsWidth = 5; + return options; + } }