Merge from vscode de81ccf04849309f843db21130c806a5783678f7 (#4738)

This commit is contained in:
Anthony Dresser
2019-03-28 13:06:16 -07:00
committed by GitHub
parent cc2951265e
commit e6785ffe95
77 changed files with 562 additions and 835 deletions

6
src/vs/monaco.d.ts vendored
View File

@@ -2565,7 +2565,7 @@ declare namespace monaco.editor {
/**
* Control how goto-command work when having multiple results.
*/
many?: 'peek' | 'revealAndPeek' | 'reveal';
multiple?: 'peek' | 'gotoAndPeek' | 'goto';
}
/**
@@ -2608,7 +2608,7 @@ declare namespace monaco.editor {
lineNumbers?: 'on' | 'off' | 'relative' | 'interval' | ((lineNumber: number) => string);
/**
* Render last line number when the file ends with a newline.
* Defaults to true on Windows/Mac and to false on Linux.
* Defaults to true.
*/
renderFinalNewline?: boolean;
/**
@@ -3208,7 +3208,7 @@ declare namespace monaco.editor {
}
export interface InternalGoToLocationOptions {
readonly many: 'peek' | 'revealAndPeek' | 'reveal';
readonly multiple: 'peek' | 'gotoAndPeek' | 'goto';
}
export interface InternalSuggestOptions {