diff --git a/monaco.d.ts b/monaco.d.ts index 40eb8a1c..6a17a4ef 100644 --- a/monaco.d.ts +++ b/monaco.d.ts @@ -1052,10 +1052,58 @@ declare namespace monaco.editor { run(editor: ICodeEditor): void | Promise; } + /** + * 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. */ @@ -1100,6 +1148,7 @@ declare namespace monaco.editor { } export interface IStandaloneCodeEditor extends ICodeEditor { + updateOptions(newOptions: IEditorOptions & IGlobalEditorOptions): void; addCommand(keybinding: number, handler: ICommandHandler, context?: string): string | null; createContextKey(key: string, defaultValue: T): IContextKey; addAction(descriptor: IActionDescriptor): IDisposable; diff --git a/package-lock.json b/package-lock.json index e008bcd9..5f63dbc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4526,9 +4526,9 @@ "dev": true }, "monaco-editor-core": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.19.0.tgz", - "integrity": "sha512-wD60zpYDhsuJbzzLQigAteK2cA5fkuaDn+4c7NLwm/526OX5eL6MMvLhfvRgrDvLO00SYhFf6vz1y1C8M1hTpQ==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.19.1.tgz", + "integrity": "sha512-eHXtBd+KW17B86EGrlyNuoCXC/rBB29WhshYmcJ9pJG+A0Jf2hrpfcH+UUPOGl7o1hN/lC1uJyyJFkWf9HND9A==", "dev": true }, "monaco-html": { @@ -4544,9 +4544,9 @@ "dev": true }, "monaco-languages": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.9.0.tgz", - "integrity": "sha512-FAP2tF4Kwz5xYEBO3iSoyYAFjnk6IpW9YSMjnkNIR8bqb21uT7pZFSRu3j1MdoG0c+P/LdQH/VSHSXBTI5wdbw==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.9.1.tgz", + "integrity": "sha512-Onh8Axk0WnN4EBKKe2WZWsO0SmN/8G7jjQSCZyREvl5rh3nSuEk0Hrd46E1+Pp3fkNEFBPTB9gPgedHh9QvATw==", "dev": true }, "monaco-typescript": { diff --git a/package.json b/package.json index 8f1b6cae..731359ec 100644 --- a/package.json +++ b/package.json @@ -34,10 +34,10 @@ "gulp-typedoc": "^2.2.2", "mocha": "^6.2.2", "monaco-css": "2.6.0", - "monaco-editor-core": "0.19.0", + "monaco-editor-core": "0.19.1", "monaco-html": "2.6.0", "monaco-json": "2.8.0", - "monaco-languages": "1.9.0", + "monaco-languages": "1.9.1", "monaco-typescript": "3.6.1", "puppeteer": "^1.15.0", "rimraf": "^2.6.3", diff --git a/website/playground/monaco.d.ts.txt b/website/playground/monaco.d.ts.txt index 40eb8a1c..6a17a4ef 100644 --- a/website/playground/monaco.d.ts.txt +++ b/website/playground/monaco.d.ts.txt @@ -1052,10 +1052,58 @@ declare namespace monaco.editor { run(editor: ICodeEditor): void | Promise; } + /** + * 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. */ @@ -1100,6 +1148,7 @@ declare namespace monaco.editor { } export interface IStandaloneCodeEditor extends ICodeEditor { + updateOptions(newOptions: IEditorOptions & IGlobalEditorOptions): void; addCommand(keybinding: number, handler: ICommandHandler, context?: string): string | null; createContextKey(key: string, defaultValue: T): IContextKey; addAction(descriptor: IActionDescriptor): IDisposable;