mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-04 17:23:45 -05:00
Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)
* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 * update distro * fix layering * update distro * fix tests
This commit is contained in:
@@ -77,10 +77,58 @@ export interface IActionDescriptor {
|
||||
run(editor: ICodeEditor): void | Promise<void>;
|
||||
}
|
||||
|
||||
/**
|
||||
* Options which apply for all editors.
|
||||
*/
|
||||
export interface IGlobalEditorOptions {
|
||||
/**
|
||||
* The number of spaces a tab is equal to.
|
||||
* This setting is overridden based on the file contents when `detectIndentation` is on.
|
||||
* Defaults to 4.
|
||||
*/
|
||||
tabSize?: number;
|
||||
/**
|
||||
* Insert spaces when pressing `Tab`.
|
||||
* This setting is overridden based on the file contents when detectIndentation` is on.
|
||||
* Defaults to true.
|
||||
*/
|
||||
insertSpaces?: boolean;
|
||||
/**
|
||||
* Controls whether `tabSize` and `insertSpaces` will be automatically detected when a file is opened based on the file contents.
|
||||
* Defaults to true.
|
||||
*/
|
||||
detectIndentation?: boolean;
|
||||
/**
|
||||
* Remove trailing auto inserted whitespace.
|
||||
* Defaults to true.
|
||||
*/
|
||||
trimAutoWhitespace?: boolean;
|
||||
/**
|
||||
* Special handling for large files to disable certain memory intensive features.
|
||||
* Defaults to true.
|
||||
*/
|
||||
largeFileOptimizations?: boolean;
|
||||
/**
|
||||
* Controls whether completions should be computed based on words in the document.
|
||||
* Defaults to true.
|
||||
*/
|
||||
wordBasedSuggestions?: boolean;
|
||||
/**
|
||||
* Keep peek editors open even when double clicking their content or when hitting `Escape`.
|
||||
* Defaults to false.
|
||||
*/
|
||||
stablePeek?: boolean;
|
||||
/**
|
||||
* Lines above this length will not be tokenized for performance reasons.
|
||||
* Defaults to 20000.
|
||||
*/
|
||||
maxTokenizationLineLength?: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* The options to create an editor.
|
||||
*/
|
||||
export interface IStandaloneEditorConstructionOptions extends IEditorConstructionOptions {
|
||||
export interface IStandaloneEditorConstructionOptions extends IEditorConstructionOptions, IGlobalEditorOptions {
|
||||
/**
|
||||
* The initial model associated with this code editor.
|
||||
*/
|
||||
@@ -125,6 +173,7 @@ export interface IDiffEditorConstructionOptions extends IDiffEditorOptions {
|
||||
}
|
||||
|
||||
export interface IStandaloneCodeEditor extends ICodeEditor {
|
||||
updateOptions(newOptions: IEditorOptions & IGlobalEditorOptions): void;
|
||||
addCommand(keybinding: number, handler: ICommandHandler, context?: string): string | null;
|
||||
createContextKey<T>(key: string, defaultValue: T): IContextKey<T>;
|
||||
addAction(descriptor: IActionDescriptor): IDisposable;
|
||||
@@ -337,7 +386,7 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
public updateOptions(newOptions: IEditorOptions): void {
|
||||
public updateOptions(newOptions: IEditorOptions & IGlobalEditorOptions): void {
|
||||
applyConfigurationValues(this._configurationService, newOptions, false);
|
||||
super.updateOptions(newOptions);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user