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/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; + } } 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 +}