vscode-json-languageservice
Advanced tools
Comparing version 1.1.8-next.2 to 1.1.8
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports"], factory); | ||
@@ -7,0 +8,0 @@ } |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
define(["require", "exports", 'vscode-languageserver-types', './services/jsonCompletion', './services/jsonHover', './services/jsonValidation', './services/jsonDocumentSymbols', './parser/jsonParser', './services/configuration', './services/jsonSchemaService', './services/jsonFormatter'], factory); | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports", "vscode-languageserver-types", "./services/jsonCompletion", "./services/jsonHover", "./services/jsonValidation", "./services/jsonDocumentSymbols", "./parser/jsonParser", "./services/configuration", "./services/jsonSchemaService", "./services/jsonFormatter"], factory); | ||
} | ||
@@ -14,3 +15,3 @@ })(function (require, exports) { | ||
'use strict'; | ||
var vscode_languageserver_types_1 = require('vscode-languageserver-types'); | ||
var vscode_languageserver_types_1 = require("vscode-languageserver-types"); | ||
exports.TextDocument = vscode_languageserver_types_1.TextDocument; | ||
@@ -26,10 +27,10 @@ exports.Position = vscode_languageserver_types_1.Position; | ||
exports.MarkedString = vscode_languageserver_types_1.MarkedString; | ||
var jsonCompletion_1 = require('./services/jsonCompletion'); | ||
var jsonHover_1 = require('./services/jsonHover'); | ||
var jsonValidation_1 = require('./services/jsonValidation'); | ||
var jsonDocumentSymbols_1 = require('./services/jsonDocumentSymbols'); | ||
var jsonParser_1 = require('./parser/jsonParser'); | ||
var configuration_1 = require('./services/configuration'); | ||
var jsonSchemaService_1 = require('./services/jsonSchemaService'); | ||
var jsonFormatter_1 = require('./services/jsonFormatter'); | ||
var jsonCompletion_1 = require("./services/jsonCompletion"); | ||
var jsonHover_1 = require("./services/jsonHover"); | ||
var jsonValidation_1 = require("./services/jsonValidation"); | ||
var jsonDocumentSymbols_1 = require("./services/jsonDocumentSymbols"); | ||
var jsonParser_1 = require("./parser/jsonParser"); | ||
var configuration_1 = require("./services/configuration"); | ||
var jsonSchemaService_1 = require("./services/jsonSchemaService"); | ||
var jsonFormatter_1 = require("./services/jsonFormatter"); | ||
function getLanguageService(params) { | ||
@@ -36,0 +37,0 @@ var promise = params.promiseConstructor || Promise; |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports"], factory); | ||
@@ -7,0 +8,0 @@ } |
@@ -7,7 +7,8 @@ var __extends = (this && this.__extends) || function (d, b) { | ||
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
define(["require", "exports", 'jsonc-parser', 'vscode-nls'], factory); | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports", "jsonc-parser", "vscode-nls"], factory); | ||
} | ||
@@ -20,4 +21,4 @@ })(function (require, exports) { | ||
'use strict'; | ||
var Json = require('jsonc-parser'); | ||
var nls = require('vscode-nls'); | ||
var Json = require("jsonc-parser"); | ||
var nls = require("vscode-nls"); | ||
var localize = nls.loadMessageBundle(); | ||
@@ -209,3 +210,3 @@ var ASTNode = (function () { | ||
function NullASTNode(parent, name, start, end) { | ||
_super.call(this, parent, 'null', name, start, end); | ||
return _super.call(this, parent, 'null', name, start, end) || this; | ||
} | ||
@@ -221,4 +222,5 @@ NullASTNode.prototype.getValue = function () { | ||
function BooleanASTNode(parent, name, value, start, end) { | ||
_super.call(this, parent, 'boolean', name, start, end); | ||
this.value = value; | ||
var _this = _super.call(this, parent, 'boolean', name, start, end) || this; | ||
_this.value = value; | ||
return _this; | ||
} | ||
@@ -234,4 +236,5 @@ BooleanASTNode.prototype.getValue = function () { | ||
function ArrayASTNode(parent, name, start, end) { | ||
_super.call(this, parent, 'array', name, start, end); | ||
this.items = []; | ||
var _this = _super.call(this, parent, 'array', name, start, end) || this; | ||
_this.items = []; | ||
return _this; | ||
} | ||
@@ -328,5 +331,6 @@ ArrayASTNode.prototype.getChildNodes = function () { | ||
function NumberASTNode(parent, name, start, end) { | ||
_super.call(this, parent, 'number', name, start, end); | ||
this.isInteger = true; | ||
this.value = Number.NaN; | ||
var _this = _super.call(this, parent, 'number', name, start, end) || this; | ||
_this.isInteger = true; | ||
_this.value = Number.NaN; | ||
return _this; | ||
} | ||
@@ -395,5 +399,6 @@ NumberASTNode.prototype.getValue = function () { | ||
function StringASTNode(parent, name, isKey, start, end) { | ||
_super.call(this, parent, 'string', name, start, end); | ||
this.isKey = isKey; | ||
this.value = ''; | ||
var _this = _super.call(this, parent, 'string', name, start, end) || this; | ||
_this.isKey = isKey; | ||
_this.value = ''; | ||
return _this; | ||
} | ||
@@ -437,7 +442,8 @@ StringASTNode.prototype.getValue = function () { | ||
function PropertyASTNode(parent, key) { | ||
_super.call(this, parent, 'property', null, key.start); | ||
this.key = key; | ||
key.parent = this; | ||
var _this = _super.call(this, parent, 'property', null, key.start) || this; | ||
_this.key = key; | ||
key.parent = _this; | ||
key.location = key.value; | ||
this.colonOffset = -1; | ||
_this.colonOffset = -1; | ||
return _this; | ||
} | ||
@@ -469,4 +475,5 @@ PropertyASTNode.prototype.getChildNodes = function () { | ||
function ObjectASTNode(parent, name, start, end) { | ||
_super.call(this, parent, 'object', name, start, end); | ||
this.properties = []; | ||
var _this = _super.call(this, parent, 'object', name, start, end) || this; | ||
_this.properties = []; | ||
return _this; | ||
} | ||
@@ -473,0 +480,0 @@ ObjectASTNode.prototype.getChildNodes = function () { |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
define(["require", "exports", 'vscode-nls'], factory); | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports", "vscode-nls"], factory); | ||
} | ||
@@ -14,3 +15,3 @@ })(function (require, exports) { | ||
'use strict'; | ||
var nls = require('vscode-nls'); | ||
var nls = require("vscode-nls"); | ||
var localize = nls.loadMessageBundle(); | ||
@@ -17,0 +18,0 @@ exports.schemaContributions = { |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
define(["require", "exports", 'vscode-languageserver-types', 'vscode-nls'], factory); | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports", "vscode-languageserver-types", "vscode-nls"], factory); | ||
} | ||
@@ -14,4 +15,4 @@ })(function (require, exports) { | ||
'use strict'; | ||
var vscode_languageserver_types_1 = require('vscode-languageserver-types'); | ||
var nls = require('vscode-nls'); | ||
var vscode_languageserver_types_1 = require("vscode-languageserver-types"); | ||
var nls = require("vscode-nls"); | ||
var localize = nls.loadMessageBundle(); | ||
@@ -21,3 +22,2 @@ var JSONCompletion = (function () { | ||
if (contributions === void 0) { contributions = []; } | ||
this.templateVarIdCounter = 0; | ||
this.schemaService = schemaService; | ||
@@ -129,3 +129,3 @@ this.contributions = contributions; | ||
if ((!schema && currentWord.length > 0 && document.getText().charAt(offset - currentWord.length - 1) !== '"')) { | ||
collector.add({ kind: 10 /* Property */, label: _this.getLabelForValue(currentWord), insertText: _this.getInsertTextForProperty(currentWord, null, false, isLast_1), documentation: '' }); | ||
collector.add({ kind: vscode_languageserver_types_1.CompletionItemKind.Property, label: _this.getLabelForValue(currentWord), insertText: _this.getInsertTextForProperty(currentWord, null, false, isLast_1), documentation: '' }); | ||
} | ||
@@ -187,3 +187,3 @@ } | ||
var propertySchema = schemaProperties_1[key]; | ||
collector.add({ kind: 10 /* Property */, label: key, insertText: _this.getInsertTextForProperty(key, propertySchema, addValue, isLast), filterText: _this.getFilterTextForValue(key), documentation: propertySchema.description || '' }); | ||
collector.add({ kind: vscode_languageserver_types_1.CompletionItemKind.Property, label: key, insertText: _this.getInsertTextForProperty(key, propertySchema, addValue, isLast), filterText: _this.getFilterTextForValue(key), documentation: propertySchema.description || '' }); | ||
}); | ||
@@ -199,3 +199,3 @@ } | ||
var key = p.key.value; | ||
collector.add({ kind: 10 /* Property */, label: key, insertText: _this.getInsertTextForValue(key), filterText: _this.getFilterTextForValue(key), documentation: '' }); | ||
collector.add({ kind: vscode_languageserver_types_1.CompletionItemKind.Property, label: key, insertText: _this.getInsertTextForValue(key), filterText: _this.getFilterTextForValue(key), documentation: '' }); | ||
}); | ||
@@ -225,3 +225,3 @@ }; | ||
else if (node.type === 'object') { | ||
collector.add({ kind: 10 /* Property */, label: '$schema', insertText: this.getInsertTextForProperty('$schema', null, true, isLast), documentation: '', filterText: this.getFilterTextForValue("$schema") }); | ||
collector.add({ kind: vscode_languageserver_types_1.CompletionItemKind.Property, label: '$schema', insertText: this.getInsertTextForProperty('$schema', null, true, isLast), documentation: '', filterText: this.getFilterTextForValue("$schema") }); | ||
} | ||
@@ -421,3 +421,3 @@ }; | ||
var schemaIds = this.schemaService.getRegisteredSchemaIds(function (schema) { return schema === 'http' || schema === 'https'; }); | ||
schemaIds.forEach(function (schemaId) { return collector.add({ kind: 9 /* Module */, label: _this.getLabelForValue(schemaId), filterText: JSON.stringify(schemaId), insertText: _this.getInsertTextForValue(schemaId), documentation: '' }); }); | ||
schemaIds.forEach(function (schemaId) { return collector.add({ kind: vscode_languageserver_types_1.CompletionItemKind.Module, label: _this.getLabelForValue(schemaId), filterText: JSON.stringify(schemaId), insertText: _this.getInsertTextForValue(schemaId), documentation: '' }); }); | ||
}; | ||
@@ -465,5 +465,3 @@ JSONCompletion.prototype.getLabelForValue = function (value) { | ||
case 'string': | ||
snippet = snippet.substr(1, snippet.length - 2); // remove quotes | ||
snippet = snippet.replace(/^(\w+:.*)$/, String(this.templateVarIdCounter++) + ':$1'); // add pseudo variable id to prevent clash with named snippet variables | ||
return '"{{' + snippet + '}}"'; | ||
return '"{{' + snippet.substr(1, snippet.length - 2) + '}}"'; | ||
case 'number': | ||
@@ -482,9 +480,9 @@ case 'integer': | ||
if (!type) { | ||
return 12 /* Value */; | ||
return vscode_languageserver_types_1.CompletionItemKind.Value; | ||
} | ||
switch (type) { | ||
case 'string': return 12 /* Value */; | ||
case 'object': return 9 /* Module */; | ||
case 'property': return 10 /* Property */; | ||
default: return 12 /* Value */; | ||
case 'string': return vscode_languageserver_types_1.CompletionItemKind.Value; | ||
case 'object': return vscode_languageserver_types_1.CompletionItemKind.Module; | ||
case 'property': return vscode_languageserver_types_1.CompletionItemKind.Property; | ||
default: return vscode_languageserver_types_1.CompletionItemKind.Value; | ||
} | ||
@@ -491,0 +489,0 @@ }; |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
define(["require", "exports", '../utils/strings', 'vscode-languageserver-types'], factory); | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports", "../utils/strings", "vscode-languageserver-types"], factory); | ||
} | ||
@@ -14,4 +15,4 @@ })(function (require, exports) { | ||
'use strict'; | ||
var Strings = require('../utils/strings'); | ||
var vscode_languageserver_types_1 = require('vscode-languageserver-types'); | ||
var Strings = require("../utils/strings"); | ||
var vscode_languageserver_types_1 = require("vscode-languageserver-types"); | ||
var JSONDocumentSymbols = (function () { | ||
@@ -36,3 +37,3 @@ function JSONDocumentSymbols() { | ||
var location_1 = vscode_languageserver_types_1.Location.create(document.uri, vscode_languageserver_types_1.Range.create(document.positionAt(item.start), document.positionAt(item.end))); | ||
result_1.push({ name: property.value.getValue(), kind: 12 /* Function */, location: location_1 }); | ||
result_1.push({ name: property.value.getValue(), kind: vscode_languageserver_types_1.SymbolKind.Function, location: location_1 }); | ||
} | ||
@@ -70,13 +71,13 @@ } | ||
case 'object': | ||
return 2 /* Module */; | ||
return vscode_languageserver_types_1.SymbolKind.Module; | ||
case 'string': | ||
return 15 /* String */; | ||
return vscode_languageserver_types_1.SymbolKind.String; | ||
case 'number': | ||
return 16 /* Number */; | ||
return vscode_languageserver_types_1.SymbolKind.Number; | ||
case 'array': | ||
return 18 /* Array */; | ||
return vscode_languageserver_types_1.SymbolKind.Array; | ||
case 'boolean': | ||
return 17 /* Boolean */; | ||
return vscode_languageserver_types_1.SymbolKind.Boolean; | ||
default: | ||
return 13 /* Variable */; | ||
return vscode_languageserver_types_1.SymbolKind.Variable; | ||
} | ||
@@ -83,0 +84,0 @@ }; |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
define(["require", "exports", 'jsonc-parser', 'vscode-languageserver-types'], factory); | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports", "jsonc-parser", "vscode-languageserver-types"], factory); | ||
} | ||
@@ -14,4 +15,4 @@ })(function (require, exports) { | ||
'use strict'; | ||
var Json = require('jsonc-parser'); | ||
var vscode_languageserver_types_1 = require('vscode-languageserver-types'); | ||
var Json = require("jsonc-parser"); | ||
var vscode_languageserver_types_1 = require("vscode-languageserver-types"); | ||
function format(document, range, options) { | ||
@@ -18,0 +19,0 @@ var documentText = document.getText(); |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
define(["require", "exports", 'vscode-languageserver-types'], factory); | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports", "vscode-languageserver-types"], factory); | ||
} | ||
@@ -14,3 +15,3 @@ })(function (require, exports) { | ||
'use strict'; | ||
var vscode_languageserver_types_1 = require('vscode-languageserver-types'); | ||
var vscode_languageserver_types_1 = require("vscode-languageserver-types"); | ||
var JSONHover = (function () { | ||
@@ -69,3 +70,3 @@ function JSONHover(schemaService, contributions, promiseConstructor) { | ||
if (description_1) { | ||
return createHover([vscode_languageserver_types_1.MarkedString.fromPlainText(description_1)]); | ||
return createHover([{ language: 'string', value: description_1 }]); | ||
} | ||
@@ -72,0 +73,0 @@ } |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
define(["require", "exports", 'jsonc-parser', 'vscode-uri', '../utils/strings', 'vscode-nls'], factory); | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports", "jsonc-parser", "vscode-uri", "../utils/strings", "vscode-nls"], factory); | ||
} | ||
@@ -14,6 +15,6 @@ })(function (require, exports) { | ||
'use strict'; | ||
var Json = require('jsonc-parser'); | ||
var vscode_uri_1 = require('vscode-uri'); | ||
var Strings = require('../utils/strings'); | ||
var nls = require('vscode-nls'); | ||
var Json = require("jsonc-parser"); | ||
var vscode_uri_1 = require("vscode-uri"); | ||
var Strings = require("../utils/strings"); | ||
var nls = require("vscode-nls"); | ||
var localize = nls.loadMessageBundle(); | ||
@@ -332,3 +333,3 @@ var FilePatternAssociation = (function () { | ||
for (var _i = 0; _i < arguments.length; _i++) { | ||
entries[_i - 0] = arguments[_i]; | ||
entries[_i] = arguments[_i]; | ||
} | ||
@@ -345,3 +346,3 @@ for (var _a = 0, entries_1 = entries; _a < entries_1.length; _a++) { | ||
for (var _i = 0; _i < arguments.length; _i++) { | ||
maps[_i - 0] = arguments[_i]; | ||
maps[_i] = arguments[_i]; | ||
} | ||
@@ -361,3 +362,3 @@ for (var _a = 0, maps_1 = maps; _a < maps_1.length; _a++) { | ||
for (var _i = 0; _i < arguments.length; _i++) { | ||
arrays[_i - 0] = arguments[_i]; | ||
arrays[_i] = arguments[_i]; | ||
} | ||
@@ -364,0 +365,0 @@ for (var _a = 0, arrays_1 = arrays; _a < arrays_1.length; _a++) { |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
define(["require", "exports"], factory); | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports", "vscode-languageserver-types"], factory); | ||
} | ||
@@ -14,2 +15,3 @@ })(function (require, exports) { | ||
'use strict'; | ||
var vscode_languageserver_types_1 = require("vscode-languageserver-types"); | ||
var JSONValidation = (function () { | ||
@@ -59,3 +61,3 @@ function JSONValidation(jsonSchemaService, promiseConstructor) { | ||
diagnostics.push({ | ||
severity: idx >= jsonDocument.errors.length ? 2 /* Warning */ : 1 /* Error */, | ||
severity: idx >= jsonDocument.errors.length ? vscode_languageserver_types_1.DiagnosticSeverity.Warning : vscode_languageserver_types_1.DiagnosticSeverity.Error, | ||
range: range, | ||
@@ -62,0 +64,0 @@ message: error.message |
(function (factory) { | ||
if (typeof module === 'object' && typeof module.exports === 'object') { | ||
var v = factory(require, exports); if (v !== undefined) module.exports = v; | ||
if (typeof module === "object" && typeof module.exports === "object") { | ||
var v = factory(require, exports); | ||
if (v !== undefined) module.exports = v; | ||
} | ||
else if (typeof define === 'function' && define.amd) { | ||
else if (typeof define === "function" && define.amd) { | ||
define(["require", "exports"], factory); | ||
@@ -7,0 +8,0 @@ } |
{ | ||
"name": "vscode-json-languageservice", | ||
"version": "1.1.8-next.2", | ||
"version": "1.1.8", | ||
"description": "Language service for JSON", | ||
@@ -26,6 +26,6 @@ "main": "./lib/jsonLanguageService.js", | ||
"dependencies": { | ||
"vscode-languageserver-types": "^1.0.3", | ||
"vscode-languageserver-types": "^1.0.2", | ||
"vscode-nls": "^1.0.4", | ||
"jsonc-parser": "^0.2.3", | ||
"vscode-uri": "^1.0.0" | ||
"vscode-uri": "^0.0.6" | ||
}, | ||
@@ -32,0 +32,0 @@ "scripts": { |
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
152015
2944
1
+ Addedvscode-uri@0.0.6(transitive)
- Removedvscode-uri@1.0.8(transitive)
Updatedvscode-uri@^0.0.6