monaco-editor 0.16.1 → 0.16.2

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Monaco Editor Changelog
 
+## [0.16.2] (19.03.2018)
+* Fixes for HTML and JSON (https://github.com/Microsoft/monaco-editor/issues/1367, https://github.com/Microsoft/monaco-editor/issues/1254)
+
 ## [0.16.1] (14.03.2018)
 * Fixes issue with context menu (https://github.com/Microsoft/monaco-editor/issues/1357)
 

package/dev/vs/language/html/htmlWorker.js

@@ -15066,13 +15066,50 @@ define('vscode-uri', ['vscode-uri/index'], function (main) { return main; });
 //# sourceMappingURL=htmlLanguageService.js.map;
 define('vscode-html-languageservice', ['vscode-html-languageservice/htmlLanguageService'], function (main) { return main; });
 
-define('vs/language/html/htmlWorker',["require", "exports", "vscode-html-languageservice", "vscode-languageserver-types"], function (require, exports, htmlService, ls) {
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+define('vs/language/html/fillers/polyfills',["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    function polyfill() {
+        // Object.assign, for IE11
+        if (typeof Object['assign'] != 'function') {
+            Object.defineProperty(Object, "assign", {
+                value: function assign(destination, sources) {
+                    'use strict';
+                    if (destination !== null) {
+                        for (var i = 1; i < arguments.length; i++) {
+                            var source = arguments[i];
+                            if (source) {
+                                for (var key in source) {
+                                    if (Object.prototype.hasOwnProperty.call(source, key)) {
+                                        destination[key] = source[key];
+                                    }
+                                }
+                            }
+                        }
+                        ;
+                    }
+                    return destination;
+                },
+                writable: true,
+                configurable: true
+            });
+        }
+    }
+    exports.polyfill = polyfill;
+});
+
+define('vs/language/html/htmlWorker',["require", "exports", "vscode-html-languageservice", "vscode-languageserver-types", "./fillers/polyfills"], function (require, exports, htmlService, ls, poli) {
     /*---------------------------------------------------------------------------------------------
      *  Copyright (c) Microsoft Corporation. All rights reserved.
      *  Licensed under the MIT License. See License.txt in the project root for license information.
      *--------------------------------------------------------------------------------------------*/
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
+    poli.polyfill();
     var HTMLWorker = /** @class */ (function () {
         function HTMLWorker(ctx, createData) {
             this._ctx = ctx;

package/dev/vs/language/json/jsonMode.js

@@ -1651,7 +1651,7 @@ define('vs/language/json/languageFeatures',["require", "exports", "vscode-langua
                 return worker.doValidation(resource.toString()).then(function (diagnostics) {
                     var markers = diagnostics.map(function (d) { return toDiagnostics(resource, d); });
                     var model = monaco.editor.getModel(resource);
-                    if (model.getModeId() === languageId) {
+                    if (model && model.getModeId() === languageId) {
                         monaco.editor.setModelMarkers(model, languageId, markers);
                     }
                 });

package/esm/vs/editor/editor.api.d.ts

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Type definitions for monaco-editor v0.16.1
+ * Type definitions for monaco-editor v0.16.2
  * Released under the MIT license
 *-----------------------------------------------------------*/
 /*---------------------------------------------------------------------------------------------

package/esm/vs/language/html/fillers/polyfills.js

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+export function polyfill() {
+    // Object.assign, for IE11
+    if (typeof Object['assign'] != 'function') {
+        Object.defineProperty(Object, "assign", {
+            value: function assign(destination, sources) {
+                'use strict';
+                if (destination !== null) {
+                    for (var i = 1; i < arguments.length; i++) {
+                        var source = arguments[i];
+                        if (source) {
+                            for (var key in source) {
+                                if (Object.prototype.hasOwnProperty.call(source, key)) {
+                                    destination[key] = source[key];
+                                }
+                            }
+                        }
+                    }
+                    ;
+                }
+                return destination;
+            },
+            writable: true,
+            configurable: true
+        });
+    }
+}

package/esm/vs/language/html/htmlWorker.js

@@ -5,6 +5,8 @@
 'use strict';
 import * as htmlService from './_deps/vscode-html-languageservice/htmlLanguageService.js';
 import * as ls from './_deps/vscode-languageserver-types/main.js';
+import * as poli from './fillers/polyfills.js';
+poli.polyfill();
 var HTMLWorker = /** @class */ (function () {
     function HTMLWorker(ctx, createData) {
         this._ctx = ctx;

package/esm/vs/language/json/languageFeatures.js

@@ -77,7 +77,7 @@ var DiagnosticsAdapter = /** @class */ (function () {
             return worker.doValidation(resource.toString()).then(function (diagnostics) {
                 var markers = diagnostics.map(function (d) { return toDiagnostics(resource, d); });
                 var model = monaco.editor.getModel(resource);
-                if (model.getModeId() === languageId) {
+                if (model && model.getModeId() === languageId) {
                     monaco.editor.setModelMarkers(model, languageId, markers);
                 }
             });

package/min/vs/editor/editor.main.js

@@ -2045,14 +2045,14 @@ define("vs/language/typescript/monaco.contribution",["require","exports","vs/edi
 define("vs/language/css/monaco.contribution",["require","exports","vs/editor/editor.api"],function(o,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var t=monaco.Emitter,n=function(){function e(e,n){this._onDidChange=new t,this._languageId=e,this.setDiagnosticsOptions(n)}return Object.defineProperty(e.prototype,"onDidChange",{get:function(){return this._onDidChange.event},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"languageId",{get:function(){return this._languageId},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"diagnosticsOptions",{get:function(){return this._diagnosticsOptions},enumerable:!0,configurable:!0}),e.prototype.setDiagnosticsOptions=function(e){this._diagnosticsOptions=e||Object.create(null),this._onDidChange.fire(this)},e}(),i={validate:!0,lint:{compatibleVendorPrefixes:"ignore",vendorPrefix:"warning",duplicateProperties:"warning",emptyRules:"warning",importStatement:"ignore",boxModel:"ignore",universalSelector:"ignore",zeroUnits:"ignore",fontFaceProperties:"warning",hexColorLength:"error",argumentsInColorFunction:"error",unknownProperties:"warning",ieHack:"ignore",unknownVendorSpecificProperties:"ignore",propertyIgnoredDueToDisplay:"warning",important:"ignore",float:"ignore",idSelector:"ignore"}},r=new(e.LanguageServiceDefaultsImpl=n)("css",i),s=new n("scss",i),a=new n("less",i);function u(){return new Promise(function(e,n){o(["./cssMode"],e,n)})}monaco.languages.css={cssDefaults:r,lessDefaults:a,scssDefaults:s},monaco.languages.onLanguage("less",function(){u().then(function(e){return e.setupMode(a)})}),monaco.languages.onLanguage("scss",function(){u().then(function(e){return e.setupMode(s)})}),monaco.languages.onLanguage("css",function(){u().then(function(e){return e.setupMode(r)})})});
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-json version: 2.5.0(d9372e494455263f6e92265cc27bdd615e597e6f)
+ * monaco-json version: 2.5.1(b4d1a1e6b28e15a0f913a6ed6f733af32cd67470)
  * Released under the MIT license
  * https://github.com/Microsoft/monaco-json/blob/master/LICENSE.md
  *-----------------------------------------------------------------------------*/
 define("vs/language/json/monaco.contribution",["require","exports","vs/editor/editor.api"],function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o=monaco.Emitter,n=function(){function e(e,n){this._onDidChange=new o,this._languageId=e,this.setDiagnosticsOptions(n)}return Object.defineProperty(e.prototype,"onDidChange",{get:function(){return this._onDidChange.event},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"languageId",{get:function(){return this._languageId},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"diagnosticsOptions",{get:function(){return this._diagnosticsOptions},enumerable:!0,configurable:!0}),e.prototype.setDiagnosticsOptions=function(e){this._diagnosticsOptions=e||Object.create(null),this._onDidChange.fire(this)},e}(),i=new(e.LanguageServiceDefaultsImpl=n)("json",{validate:!0,allowComments:!0,schemas:[],enableSchemaRequest:!1});monaco.languages.json={jsonDefaults:i},monaco.languages.register({id:"json",extensions:[".json",".bowerrc",".jshintrc",".jscsrc",".eslintrc",".babelrc"],aliases:["JSON","json"],mimetypes:["application/json"]}),monaco.languages.onLanguage("json",function(){new Promise(function(e,n){t(["./jsonMode"],e,n)}).then(function(e){return e.setupMode(i)})})});
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-html version: 2.5.0(7df6821309bcfbb236e3b749e6308a2fff72b46c)
+ * monaco-html version: 2.5.1(22c0d87c2360bcfd43c81508bc230815dc86fb4d)
  * Released under the MIT license
  * https://github.com/Microsoft/monaco-html/blob/master/LICENSE.md
  *-----------------------------------------------------------------------------*/

package/min/vs/language/html/htmlMode.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-html version: 2.5.0(7df6821309bcfbb236e3b749e6308a2fff72b46c)
+ * monaco-html version: 2.5.1(22c0d87c2360bcfd43c81508bc230815dc86fb4d)
  * Released under the MIT license
  * https://github.com/Microsoft/monaco-html/blob/master/LICENSE.md
  *-----------------------------------------------------------------------------*/