update dependencies, fix selection range issue

This commit is contained in:
Martin Aeschlimann 2019-12-17 13:00:17 +01:00
parent 3835b013c3
commit a914f02a54
3 changed files with 17 additions and 32 deletions

34
package-lock.json generated
View file

@ -74,9 +74,9 @@
} }
}, },
"terser": { "terser": {
"version": "4.4.2", "version": "4.4.3",
"resolved": "https://registry.npmjs.org/terser/-/terser-4.4.2.tgz", "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.3.tgz",
"integrity": "sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ==", "integrity": "sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA==",
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "^2.20.0", "commander": "^2.20.0",
@ -91,18 +91,18 @@
"dev": true "dev": true
}, },
"vscode-json-languageservice": { "vscode-json-languageservice": {
"version": "3.4.10", "version": "3.4.11",
"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.4.10.tgz", "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.4.11.tgz",
"integrity": "sha512-0Uy1bgVvnTkTjPOOZUCWFmXR71YgKAGu3XE3bIi9IPwTsn5apiqulOaz1UMs2ldlrHeLgsdHGEkFJnDhxtqyVQ==", "integrity": "sha512-26Qv1SFp6x3XmCqU1BRceRsSKRO3xkQa6/K8ziSRt52/LQPiw5ipSxlGVSlzIoi5LCmQVEqUajhiVEMNlFXhNw==",
"dev": true, "dev": true,
"requires": { "requires": {
"jsonc-parser": "^2.2.0", "jsonc-parser": "^2.2.0",
"vscode-languageserver-textdocument": "^1.0.0-next.4", "vscode-languageserver-textdocument": "^1.0.0-next.5",
"vscode-languageserver-types": "^3.15.0-next.6", "vscode-languageserver-types": "^3.15.0-next.9",
"vscode-nls": "^4.1.1", "vscode-nls": "^4.1.1",
"vscode-uri": "^2.1.0" "vscode-uri": "^2.1.1"
}
}, },
"dependencies": {
"vscode-languageserver-textdocument": { "vscode-languageserver-textdocument": {
"version": "1.0.0-next.5", "version": "1.0.0-next.5",
"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0-next.5.tgz", "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0-next.5.tgz",
@ -114,20 +114,6 @@
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.9.tgz", "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.9.tgz",
"integrity": "sha512-Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw==", "integrity": "sha512-Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw==",
"dev": true "dev": true
}
}
},
"vscode-languageserver-textdocument": {
"version": "1.0.0-next.5",
"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0-next.5.tgz",
"integrity": "sha512-1jp/zAidN/bF/sqPimhBX1orH5G4rzRw63k75TesukJDuxm8yW79ECStWbDSy41BHGOwSGN4M69QFvhancSr5A==",
"dev": true
},
"vscode-languageserver-types": {
"version": "3.14.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
"integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==",
"dev": true
}, },
"vscode-nls": { "vscode-nls": {
"version": "4.1.1", "version": "4.1.1",

View file

@ -26,8 +26,6 @@
"requirejs": "^2.3.6", "requirejs": "^2.3.6",
"typescript": "3.7.3", "typescript": "3.7.3",
"terser": "^4.4.3", "terser": "^4.4.3",
"vscode-json-languageservice": "3.4.10", "vscode-json-languageservice": "3.4.11"
"vscode-languageserver-types": "3.15.0-next.9",
"vscode-languageserver-textdocument": "^1.0.0-next.5"
} }
} }

View file

@ -21,7 +21,7 @@ export class LanguageServiceDefaultsImpl implements monaco.languages.json.Langua
constructor(languageId: string, diagnosticsOptions: monaco.languages.json.DiagnosticsOptions, modeConfiguration: monaco.languages.json.ModeConfiguration) { constructor(languageId: string, diagnosticsOptions: monaco.languages.json.DiagnosticsOptions, modeConfiguration: monaco.languages.json.ModeConfiguration) {
this._languageId = languageId; this._languageId = languageId;
this.setDiagnosticsOptions(diagnosticsOptions); this.setDiagnosticsOptions(diagnosticsOptions);
this.setModeConfiguration(modeConfiguration) this.setModeConfiguration(modeConfiguration);
} }
get onDidChange(): IEvent<monaco.languages.json.LanguageServiceDefaults> { get onDidChange(): IEvent<monaco.languages.json.LanguageServiceDefaults> {
@ -44,20 +44,21 @@ export class LanguageServiceDefaultsImpl implements monaco.languages.json.Langua
this._diagnosticsOptions = options || Object.create(null); this._diagnosticsOptions = options || Object.create(null);
this._onDidChange.fire(this); this._onDidChange.fire(this);
} }
setModeConfiguration(modeConfiguration: monaco.languages.json.ModeConfiguration): void { setModeConfiguration(modeConfiguration: monaco.languages.json.ModeConfiguration): void {
this._modeConfiguration = modeConfiguration || Object.create(null); this._modeConfiguration = modeConfiguration || Object.create(null);
this._onDidChange.fire(this); this._onDidChange.fire(this);
}; };
} }
const diagnosticDefault: monaco.languages.json.DiagnosticsOptions = { const diagnosticDefault: Required<monaco.languages.json.DiagnosticsOptions> = {
validate: true, validate: true,
allowComments: true, allowComments: true,
schemas: [], schemas: [],
enableSchemaRequest: false enableSchemaRequest: false
}; };
const modeConfigurationDefault: monaco.languages.json.ModeConfiguration = { const modeConfigurationDefault: Required<monaco.languages.json.ModeConfiguration> = {
documentFormattingEdits: true, documentFormattingEdits: true,
documentRangeFormattingEdits: true, documentRangeFormattingEdits: true,
completionItems: true, completionItems: true,