mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-17 02:51:36 -05:00
Vscode merge (#4582)
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd * fix issues with merges * bump node version in azpipe * replace license headers * remove duplicate launch task * fix build errors * fix build errors * fix tslint issues * working through package and linux build issues * more work * wip * fix packaged builds * working through linux build errors * wip * wip * wip * fix mac and linux file limits * iterate linux pipeline * disable editor typing * revert series to parallel * remove optimize vscode from linux * fix linting issues * revert testing change * add work round for new node * readd packaging for extensions * fix issue with angular not resolving decorator dependencies
This commit is contained in:
74
src/vs/monaco.d.ts
vendored
74
src/vs/monaco.d.ts
vendored
@@ -380,6 +380,7 @@ declare namespace monaco {
|
||||
}
|
||||
|
||||
export interface IKeyboardEvent {
|
||||
readonly _standardKeyboardEventBrand: true;
|
||||
readonly browserEvent: KeyboardEvent;
|
||||
readonly target: HTMLElement;
|
||||
readonly ctrlKey: boolean;
|
||||
@@ -922,6 +923,11 @@ declare namespace monaco.editor {
|
||||
*/
|
||||
export function setTheme(themeName: string): void;
|
||||
|
||||
/**
|
||||
* Clears all cached font measurements and triggers re-measurement.
|
||||
*/
|
||||
export function remeasureFonts(): void;
|
||||
|
||||
export type BuiltinTheme = 'vs' | 'vs-dark' | 'hc-black';
|
||||
|
||||
export interface IStandaloneThemeData {
|
||||
@@ -1381,7 +1387,7 @@ declare namespace monaco.editor {
|
||||
/**
|
||||
* The text to replace with. This can be null to emulate a simple delete.
|
||||
*/
|
||||
text: string;
|
||||
text: string | null;
|
||||
/**
|
||||
* This indicates that this operation has "insert" semantics.
|
||||
* i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
|
||||
@@ -1421,6 +1427,7 @@ declare namespace monaco.editor {
|
||||
export class TextModelResolvedOptions {
|
||||
_textModelResolvedOptionsBrand: void;
|
||||
readonly tabSize: number;
|
||||
readonly indentSize: number;
|
||||
readonly insertSpaces: boolean;
|
||||
readonly defaultEOL: DefaultEndOfLine;
|
||||
readonly trimAutoWhitespace: boolean;
|
||||
@@ -1428,6 +1435,7 @@ declare namespace monaco.editor {
|
||||
|
||||
export interface ITextModelUpdateOptions {
|
||||
tabSize?: number;
|
||||
indentSize?: number;
|
||||
insertSpaces?: boolean;
|
||||
trimAutoWhitespace?: boolean;
|
||||
}
|
||||
@@ -1714,10 +1722,6 @@ declare namespace monaco.editor {
|
||||
* Normalize a string containing whitespace according to indentation rules (converts to spaces or to tabs).
|
||||
*/
|
||||
normalizeIndentation(str: string): string;
|
||||
/**
|
||||
* Get what is considered to be one indent (e.g. a tab character or 4 spaces, etc.).
|
||||
*/
|
||||
getOneIndent(): string;
|
||||
/**
|
||||
* Change the options of this model.
|
||||
*/
|
||||
@@ -2278,6 +2282,7 @@ declare namespace monaco.editor {
|
||||
|
||||
export interface IModelOptionsChangedEvent {
|
||||
readonly tabSize: boolean;
|
||||
readonly indentSize: boolean;
|
||||
readonly insertSpaces: boolean;
|
||||
readonly trimAutoWhitespace: boolean;
|
||||
}
|
||||
@@ -2433,6 +2438,7 @@ declare namespace monaco.editor {
|
||||
* Controls if Find in Selection flag is turned on when multiple lines of text are selected in the editor.
|
||||
*/
|
||||
autoFindInSelection: boolean;
|
||||
addExtraSpaceOnTop?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2541,6 +2547,25 @@ declare namespace monaco.editor {
|
||||
* Enable using global storage for remembering suggestions.
|
||||
*/
|
||||
shareSuggestSelections?: boolean;
|
||||
/**
|
||||
* Enable or disable icons in suggestions. Defaults to true.
|
||||
*/
|
||||
showIcons?: boolean;
|
||||
/**
|
||||
* Max suggestions to show in suggestions. Defaults to 12.
|
||||
*/
|
||||
maxVisibleSuggestions?: boolean;
|
||||
/**
|
||||
* Names of suggestion types to filter.
|
||||
*/
|
||||
filteredTypes?: Record<string, boolean>;
|
||||
}
|
||||
|
||||
export interface IGotoLocationOptions {
|
||||
/**
|
||||
* Control how goto-command work when having multiple results.
|
||||
*/
|
||||
many?: 'peek' | 'revealAndPeek' | 'reveal';
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2581,6 +2606,11 @@ declare namespace monaco.editor {
|
||||
* Defaults to true.
|
||||
*/
|
||||
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.
|
||||
*/
|
||||
renderFinalNewline?: boolean;
|
||||
/**
|
||||
* Should the corresponding line be selected when clicking on the line number?
|
||||
* Defaults to true.
|
||||
@@ -2812,6 +2842,10 @@ declare namespace monaco.editor {
|
||||
* Suggest options.
|
||||
*/
|
||||
suggest?: ISuggestOptions;
|
||||
/**
|
||||
*
|
||||
*/
|
||||
gotoLocation?: IGotoLocationOptions;
|
||||
/**
|
||||
* Enable quick suggestions (shadow suggestions)
|
||||
* Defaults to true.
|
||||
@@ -2830,11 +2864,6 @@ declare namespace monaco.editor {
|
||||
* Parameter hint options.
|
||||
*/
|
||||
parameterHints?: IEditorParameterHintOptions;
|
||||
/**
|
||||
* Render icons in suggestions box.
|
||||
* Defaults to true.
|
||||
*/
|
||||
iconsInSuggestions?: boolean;
|
||||
/**
|
||||
* Options for auto closing brackets.
|
||||
* Defaults to language defined behavior.
|
||||
@@ -3169,6 +3198,7 @@ declare namespace monaco.editor {
|
||||
export interface InternalEditorFindOptions {
|
||||
readonly seedSearchStringFromSelection: boolean;
|
||||
readonly autoFindInSelection: boolean;
|
||||
readonly addExtraSpaceOnTop: boolean;
|
||||
}
|
||||
|
||||
export interface InternalEditorHoverOptions {
|
||||
@@ -3177,12 +3207,19 @@ declare namespace monaco.editor {
|
||||
readonly sticky: boolean;
|
||||
}
|
||||
|
||||
export interface InternalGoToLocationOptions {
|
||||
readonly many: 'peek' | 'revealAndPeek' | 'reveal';
|
||||
}
|
||||
|
||||
export interface InternalSuggestOptions {
|
||||
readonly filterGraceful: boolean;
|
||||
readonly snippets: 'top' | 'bottom' | 'inline' | 'none';
|
||||
readonly snippetsPreventQuickSuggestions: boolean;
|
||||
readonly localityBonus: boolean;
|
||||
readonly shareSuggestSelections: boolean;
|
||||
readonly showIcons: boolean;
|
||||
readonly maxVisibleSuggestions: number;
|
||||
readonly filteredTypes: Record<string, boolean>;
|
||||
}
|
||||
|
||||
export interface InternalParameterHintOptions {
|
||||
@@ -3217,6 +3254,7 @@ declare namespace monaco.editor {
|
||||
readonly ariaLabel: string;
|
||||
readonly renderLineNumbers: RenderLineNumbersType;
|
||||
readonly renderCustomLineNumbers: ((lineNumber: number) => string) | null;
|
||||
readonly renderFinalNewline: boolean;
|
||||
readonly selectOnLineNumbers: boolean;
|
||||
readonly glyphMargin: boolean;
|
||||
readonly revealHorizontalRightPadding: number;
|
||||
@@ -3256,7 +3294,6 @@ declare namespace monaco.editor {
|
||||
};
|
||||
readonly quickSuggestionsDelay: number;
|
||||
readonly parameterHints: InternalParameterHintOptions;
|
||||
readonly iconsInSuggestions: boolean;
|
||||
readonly formatOnType: boolean;
|
||||
readonly formatOnPaste: boolean;
|
||||
readonly suggestOnTriggerCharacters: boolean;
|
||||
@@ -3268,6 +3305,7 @@ declare namespace monaco.editor {
|
||||
readonly suggestLineHeight: number;
|
||||
readonly tabCompletion: 'on' | 'off' | 'onlySnippets';
|
||||
readonly suggest: InternalSuggestOptions;
|
||||
readonly gotoLocation: InternalGoToLocationOptions;
|
||||
readonly selectionHighlight: boolean;
|
||||
readonly occurrencesHighlight: boolean;
|
||||
readonly codeLens: boolean;
|
||||
@@ -4271,12 +4309,12 @@ declare namespace monaco.languages {
|
||||
/**
|
||||
* Set the tokens provider for a language (manual implementation).
|
||||
*/
|
||||
export function setTokensProvider(languageId: string, provider: TokensProvider | EncodedTokensProvider): IDisposable;
|
||||
export function setTokensProvider(languageId: string, provider: TokensProvider | EncodedTokensProvider | Thenable<TokensProvider | EncodedTokensProvider>): IDisposable;
|
||||
|
||||
/**
|
||||
* Set the tokens provider for a language (monarch implementation).
|
||||
*/
|
||||
export function setMonarchTokensProvider(languageId: string, languageDef: IMonarchLanguage): IDisposable;
|
||||
export function setMonarchTokensProvider(languageId: string, languageDef: IMonarchLanguage | Thenable<IMonarchLanguage>): IDisposable;
|
||||
|
||||
/**
|
||||
* Register a reference provider (used by e.g. reference search).
|
||||
@@ -4554,7 +4592,7 @@ declare namespace monaco.languages {
|
||||
/**
|
||||
* The string that appears on the last line and closes the doc comment (e.g. ' * /').
|
||||
*/
|
||||
close: string;
|
||||
close?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -4968,7 +5006,7 @@ declare namespace monaco.languages {
|
||||
/**
|
||||
* The highlight kind, default is [text](#DocumentHighlightKind.Text).
|
||||
*/
|
||||
kind: DocumentHighlightKind;
|
||||
kind?: DocumentHighlightKind;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -5167,7 +5205,6 @@ declare namespace monaco.languages {
|
||||
* the formatting-feature.
|
||||
*/
|
||||
export interface DocumentFormattingEditProvider {
|
||||
displayName?: string;
|
||||
/**
|
||||
* Provide formatting edits for a whole document.
|
||||
*/
|
||||
@@ -5179,7 +5216,6 @@ declare namespace monaco.languages {
|
||||
* the formatting-feature.
|
||||
*/
|
||||
export interface DocumentRangeFormattingEditProvider {
|
||||
displayName?: string;
|
||||
/**
|
||||
* Provide formatting edits for a range in a document.
|
||||
*
|
||||
@@ -5211,7 +5247,7 @@ declare namespace monaco.languages {
|
||||
*/
|
||||
export interface ILink {
|
||||
range: IRange;
|
||||
url?: string;
|
||||
url?: Uri | string;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -5303,7 +5339,7 @@ declare namespace monaco.languages {
|
||||
/**
|
||||
* Provide ranges that should be selected from the given position.
|
||||
*/
|
||||
provideSelectionRanges(model: editor.ITextModel, position: Position, token: CancellationToken): ProviderResult<SelectionRange[]>;
|
||||
provideSelectionRanges(model: editor.ITextModel, positions: Position[], token: CancellationToken): ProviderResult<SelectionRange[][]>;
|
||||
}
|
||||
|
||||
export interface FoldingContext {
|
||||
|
||||
Reference in New Issue
Block a user