mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-24 09:35:37 -05:00
Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 * fix config changes * fix strictnull checks
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { EDITOR_DEFAULTS, WrappingIndent } from 'vs/editor/common/config/editorOptions';
|
||||
import { EditorOptions, WrappingIndent } from 'vs/editor/common/config/editorOptions';
|
||||
import { createMonacoBaseAPI } from 'vs/editor/common/standalone/standaloneBase';
|
||||
import { createMonacoEditorAPI } from 'vs/editor/standalone/browser/standaloneEditor';
|
||||
import { createMonacoLanguagesAPI } from 'vs/editor/standalone/browser/standaloneLanguages';
|
||||
@@ -11,9 +11,10 @@ import { createMonacoLanguagesAPI } from 'vs/editor/standalone/browser/standalon
|
||||
const global: any = self;
|
||||
|
||||
// Set defaults for standalone editor
|
||||
(<any>EDITOR_DEFAULTS).wrappingIndent = WrappingIndent.None;
|
||||
(<any>EDITOR_DEFAULTS.viewInfo).glyphMargin = false;
|
||||
(<any>EDITOR_DEFAULTS).autoIndent = false;
|
||||
(<any>EditorOptions.wrappingIndent).defaultValue = WrappingIndent.None;
|
||||
(<any>EditorOptions.glyphMargin).defaultValue = false;
|
||||
(<any>EditorOptions.autoIndent).defaultValue = false;
|
||||
(<any>EditorOptions.overviewRulerLanes).defaultValue = 2;
|
||||
|
||||
const api = createMonacoBaseAPI();
|
||||
api.editor = createMonacoEditorAPI();
|
||||
|
||||
Reference in New Issue
Block a user