vscode-json-languageservice 3.2.0 → 3.2.1

package/CHANGELOG.md

@@ -1,9 +1,11 @@
-3.2.0 / 
+3.2.0 / 2018-09-27
 ==================
  * New API `LanguageServiceParams.ClientCapabilities` to define what LSP capabilities the client supports.
  * For the best experiences, clients should always use `LanguageServiceParams.ClientCapabilities.LATEST`, which has all the latest LSP cpabilities enabled.
- * `LanguageServiceParams.ClientCapabilities` can allow `MarkupKind.Markdown` as valid documentationFormat (used by completions if schemas use `markdownDescription` or `markdownEnumDescriptions`)
+ * `LanguageServiceParams.ClientCapabilities` can allow `MarkupKind.Markdown` as valid documentationFormat (used by completions if schemas use `markdownDescription` or `markdownEnumDescriptions`).
  * snippets can now provide the description also in markdown format.
+ * Bundled draft-07-schema with descriptions.
+ * Propose `examples` in code completions.
 
 3.1.5 / 2018-08-14
 ==================

package/README.md

@@ -4,6 +4,7 @@ JSON language service extracted from VSCode to be reused, e.g in the Monaco edit
 [![npm Package](https://img.shields.io/npm/v/vscode-json-languageservice.svg?style=flat-square)](https://www.npmjs.org/package/vscode-json-languageservice)
 [![NPM Downloads](https://img.shields.io/npm/dm/vscode-json-languageservice.svg)](https://npmjs.org/package/vscode-json-languageservice)
 [![Build Status](https://travis-ci.org/Microsoft/vscode-json-languageservice.svg?branch=master)](https://travis-ci.org/Microsoft/vscode-json-languageservice)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 Why?
 ----

package/lib/esm/parser/jsonParser.js

@@ -449,16 +449,18 @@ function validate(node, schema, validationResult, matchingSchemas) {
         var testBranch = function (schema) {
             var subValidationResult = new ValidationResult();
             var subMatchingSchemas = matchingSchemas.newSub();
-            validate(node, schema, subValidationResult, subMatchingSchemas);
+            validate(node, asSchema(schema), subValidationResult, subMatchingSchemas);
             validationResult.merge(subValidationResult);
             validationResult.propertiesMatches += subValidationResult.propertiesMatches;
             validationResult.propertiesValueMatches += subValidationResult.propertiesValueMatches;
             matchingSchemas.merge(subMatchingSchemas);
         };
         var testCondition = function (ifSchema, thenSchema, elseSchema) {
+            var subSchema = asSchema(ifSchema);
             var subValidationResult = new ValidationResult();
             var subMatchingSchemas = matchingSchemas.newSub();
-            validate(node, ifSchema, subValidationResult, subMatchingSchemas);
+            validate(node, subSchema, subValidationResult, subMatchingSchemas);
+            matchingSchemas.merge(subMatchingSchemas);
             if (!subValidationResult.hasProblems()) {
                 if (thenSchema) {
                     testBranch(thenSchema);

package/lib/esm/services/jsonCompletion.js

@@ -623,10 +623,10 @@ var JSONCompletion = /** @class */ (function () {
     JSONCompletion.prototype.getInsertTextForValue = function (value, separatorAfter) {
         var text = JSON.stringify(value, null, '\t');
         if (text === '{}') {
-            return '{\n\t$1\n}' + separatorAfter;
+            return '{$1}' + separatorAfter;
         }
         else if (text === '[]') {
-            return '[\n\t$1\n]' + separatorAfter;
+            return '[$1]' + separatorAfter;
         }
         return this.getInsertTextForPlainText(text + separatorAfter);
     };
@@ -744,10 +744,10 @@ var JSONCompletion = /** @class */ (function () {
                         value = '"$1"';
                         break;
                     case 'object':
-                        value = '{\n\t$1\n}';
+                        value = '{$1}';
                         break;
                     case 'array':
-                        value = '[\n\t$1\n]';
+                        value = '[$1]';
                         break;
                     case 'number':
                     case 'integer':

package/lib/esm/services/jsonSchemaService.js

@@ -251,7 +251,12 @@ var JSONSchemaService = /** @class */ (function () {
             var errors = jsonErrors.length ? [localize('json.schema.invalidFormat', 'Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset)] : [];
             return new UnresolvedSchema(schemaContent, errors);
         }, function (error) {
-            var errorMessage = localize('json.schema.unabletoload', 'Unable to load schema from \'{0}\': {1}', toDisplayString(url), error.toString());
+            var errorMessage = error.toString();
+            var errorSplit = error.toString().split('Error: ');
+            if (errorSplit.length > 1) {
+                // more concise error message, URL and context are attached by caller anyways
+                errorMessage = errorSplit[1];
+            }
             return new UnresolvedSchema({}, [errorMessage]);
         });
     };

package/lib/umd/parser/jsonParser.js

@@ -464,16 +464,18 @@ var __extends = (this && this.__extends) || (function () {
             var testBranch = function (schema) {
                 var subValidationResult = new ValidationResult();
                 var subMatchingSchemas = matchingSchemas.newSub();
-                validate(node, schema, subValidationResult, subMatchingSchemas);
+                validate(node, asSchema(schema), subValidationResult, subMatchingSchemas);
                 validationResult.merge(subValidationResult);
                 validationResult.propertiesMatches += subValidationResult.propertiesMatches;
                 validationResult.propertiesValueMatches += subValidationResult.propertiesValueMatches;
                 matchingSchemas.merge(subMatchingSchemas);
             };
             var testCondition = function (ifSchema, thenSchema, elseSchema) {
+                var subSchema = asSchema(ifSchema);
                 var subValidationResult = new ValidationResult();
                 var subMatchingSchemas = matchingSchemas.newSub();
-                validate(node, ifSchema, subValidationResult, subMatchingSchemas);
+                validate(node, subSchema, subValidationResult, subMatchingSchemas);
+                matchingSchemas.merge(subMatchingSchemas);
                 if (!subValidationResult.hasProblems()) {
                     if (thenSchema) {
                         testBranch(thenSchema);

package/lib/umd/services/jsonCompletion.js

@@ -633,10 +633,10 @@
         JSONCompletion.prototype.getInsertTextForValue = function (value, separatorAfter) {
             var text = JSON.stringify(value, null, '\t');
             if (text === '{}') {
-                return '{\n\t$1\n}' + separatorAfter;
+                return '{$1}' + separatorAfter;
             }
             else if (text === '[]') {
-                return '[\n\t$1\n]' + separatorAfter;
+                return '[$1]' + separatorAfter;
             }
             return this.getInsertTextForPlainText(text + separatorAfter);
         };
@@ -754,10 +754,10 @@
                             value = '"$1"';
                             break;
                         case 'object':
-                            value = '{\n\t$1\n}';
+                            value = '{$1}';
                             break;
                         case 'array':
-                            value = '[\n\t$1\n]';
+                            value = '[$1]';
                             break;
                         case 'number':
                         case 'integer':

package/lib/umd/services/jsonSchemaService.js

@@ -261,7 +261,12 @@
                 var errors = jsonErrors.length ? [localize('json.schema.invalidFormat', 'Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset)] : [];
                 return new UnresolvedSchema(schemaContent, errors);
             }, function (error) {
-                var errorMessage = localize('json.schema.unabletoload', 'Unable to load schema from \'{0}\': {1}', toDisplayString(url), error.toString());
+                var errorMessage = error.toString();
+                var errorSplit = error.toString().split('Error: ');
+                if (errorSplit.length > 1) {
+                    // more concise error message, URL and context are attached by caller anyways
+                    errorMessage = errorSplit[1];
+                }
                 return new UnresolvedSchema({}, [errorMessage]);
             });
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",