From 8f21d86c0021b3c94fa0b6db50298b88ee844b13 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 12 Nov 2018 11:32:19 +0100 Subject: [PATCH] Fix some types --- src/vs/editor/common/config/editorOptions.ts | 6 ++---- src/vs/editor/common/modes.ts | 6 +++--- src/vs/monaco.d.ts | 12 +++++------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index f1ca050c5e4..cc3971d0b35 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -23,16 +23,14 @@ export interface IEditorScrollbarOptions { arrowSize?: number; /** * Render vertical scrollbar. - * Accepted values: 'auto', 'visible', 'hidden'. * Defaults to 'auto'. */ - vertical?: string; + vertical?: 'auto' | 'visible' | 'hidden'; /** * Render horizontal scrollbar. - * Accepted values: 'auto', 'visible', 'hidden'. * Defaults to 'auto'. */ - horizontal?: string; + horizontal?: 'auto' | 'visible' | 'hidden'; /** * Cast horizontal and vertical shadows when the content is scrolled. * Defaults to true. diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 2fc62a5083c..e44102a8347 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -418,7 +418,7 @@ export interface CompletionItem { * this completion. When `falsy` the [label](#CompletionItem.label) * is used. */ - insertText: string; + insertText?: string; /** * Addition rules (as bitmask) that should be applied when inserting * this completion. @@ -633,8 +633,8 @@ export interface SignatureHelpContext { */ export interface SignatureHelpProvider { - readonly signatureHelpTriggerCharacters: ReadonlyArray; - readonly signatureHelpRetriggerCharacters: ReadonlyArray; + readonly signatureHelpTriggerCharacters?: ReadonlyArray; + readonly signatureHelpRetriggerCharacters?: ReadonlyArray; /** * Provide help for the signature at the given position and document. diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 54c4976e825..57cb12ab89d 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -2392,16 +2392,14 @@ declare namespace monaco.editor { arrowSize?: number; /** * Render vertical scrollbar. - * Accepted values: 'auto', 'visible', 'hidden'. * Defaults to 'auto'. */ - vertical?: string; + vertical?: 'auto' | 'visible' | 'hidden'; /** * Render horizontal scrollbar. - * Accepted values: 'auto', 'visible', 'hidden'. * Defaults to 'auto'. */ - horizontal?: string; + horizontal?: 'auto' | 'visible' | 'hidden'; /** * Cast horizontal and vertical shadows when the content is scrolled. * Defaults to true. @@ -4765,7 +4763,7 @@ declare namespace monaco.languages { * this completion. When `falsy` the [label](#CompletionItem.label) * is used. */ - insertText: string; + insertText?: string; /** * Addition rules (as bitmask) that should be applied when inserting * this completion. @@ -4941,8 +4939,8 @@ declare namespace monaco.languages { * the [parameter hints](https://code.visualstudio.com/docs/editor/intellisense)-feature. */ export interface SignatureHelpProvider { - readonly signatureHelpTriggerCharacters: ReadonlyArray; - readonly signatureHelpRetriggerCharacters: ReadonlyArray; + readonly signatureHelpTriggerCharacters?: ReadonlyArray; + readonly signatureHelpRetriggerCharacters?: ReadonlyArray; /** * Provide help for the signature at the given position and document. */ -- GitLab