mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Refresh master with initial release/0.24 snapshot (#332)
* Initial port of release/0.24 source code * Fix additional headers * Fix a typo in launch.json
This commit is contained in:
@@ -19,6 +19,16 @@ import { createMonacoEditorAPI } from 'vs/editor/standalone/browser/standaloneEd
|
||||
import { createMonacoLanguagesAPI } from 'vs/editor/standalone/browser/standaloneLanguages';
|
||||
import { EDITOR_DEFAULTS, WrappingIndent } from 'vs/editor/common/config/editorOptions';
|
||||
|
||||
var global: any = self;
|
||||
global.monaco = exports;
|
||||
|
||||
// When missing, polyfill the native promise
|
||||
// with our winjs-based polyfill
|
||||
import { PolyfillPromise } from 'vs/base/common/winjs.polyfill.promise';
|
||||
if (typeof global.Promise === 'undefined') {
|
||||
global.Promise = PolyfillPromise;
|
||||
}
|
||||
|
||||
// Set defaults for standalone editor
|
||||
(<any>EDITOR_DEFAULTS).wrappingIndent = WrappingIndent.None;
|
||||
(<any>EDITOR_DEFAULTS.contribInfo).folding = false;
|
||||
@@ -34,9 +44,6 @@ for (let prop in base) {
|
||||
exports.editor = createMonacoEditorAPI();
|
||||
exports.languages = createMonacoLanguagesAPI();
|
||||
|
||||
var global: any = self;
|
||||
global.monaco = exports;
|
||||
|
||||
if (typeof global.require !== 'undefined' && typeof global.require.config === 'function') {
|
||||
global.require.config({
|
||||
ignoreDuplicateModules: [
|
||||
|
||||
Reference in New Issue
Block a user