mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from vscode 7eaf220cafb9d9e901370ffce02229171cbf3ea6
This commit is contained in:
committed by
Anthony Dresser
parent
39d9eed585
commit
a63578e6f7
12
src/vs/monaco.d.ts
vendored
12
src/vs/monaco.d.ts
vendored
@@ -3068,7 +3068,7 @@ declare namespace monaco.editor {
|
||||
* Enable rendering of whitespace.
|
||||
* Defaults to none.
|
||||
*/
|
||||
renderWhitespace?: 'none' | 'boundary' | 'selection' | 'all';
|
||||
renderWhitespace?: 'none' | 'boundary' | 'selection' | 'trailing' | 'all';
|
||||
/**
|
||||
* Enable rendering of control characters.
|
||||
* Defaults to false.
|
||||
@@ -4056,7 +4056,7 @@ declare namespace monaco.editor {
|
||||
renderLineHighlight: IEditorOption<EditorOption.renderLineHighlight, 'all' | 'line' | 'none' | 'gutter'>;
|
||||
renderLineHighlightOnlyWhenFocus: IEditorOption<EditorOption.renderLineHighlightOnlyWhenFocus, boolean>;
|
||||
renderValidationDecorations: IEditorOption<EditorOption.renderValidationDecorations, 'on' | 'off' | 'editable'>;
|
||||
renderWhitespace: IEditorOption<EditorOption.renderWhitespace, 'all' | 'none' | 'boundary' | 'selection'>;
|
||||
renderWhitespace: IEditorOption<EditorOption.renderWhitespace, 'all' | 'none' | 'boundary' | 'selection' | 'trailing'>;
|
||||
revealHorizontalRightPadding: IEditorOption<EditorOption.revealHorizontalRightPadding, number>;
|
||||
roundedSelection: IEditorOption<EditorOption.roundedSelection, boolean>;
|
||||
rulers: IEditorOption<EditorOption.rulers, {}>;
|
||||
@@ -4418,6 +4418,14 @@ declare namespace monaco.editor {
|
||||
overflowWidgetsDomNode?: HTMLElement;
|
||||
}
|
||||
|
||||
export interface IDiffEditorConstructionOptions extends IDiffEditorOptions {
|
||||
/**
|
||||
* Place overflow widgets inside an external DOM node.
|
||||
* Defaults to an internal DOM node.
|
||||
*/
|
||||
overflowWidgetsDomNode?: HTMLElement;
|
||||
}
|
||||
|
||||
/**
|
||||
* A rich code editor.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user