maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #2446: [json] Unable to load schema jsconfig.schema.json

Browse source
This commit is contained in:
Martin Aeschlimann 2016-01-28 10:56:21 +01:00
parent c2ffc3ffc2
commit db40c87ba8
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extensions/json/src/jsonMain.ts
View file

@ -51,14 +51,14 @@ export function activate(context: ExtensionContext) {
} }
// Create the language client and start the client. // Create the language client and start the client.
var client = new LanguageClient('JSON Server', serverOptions, clientOptions); let client = new LanguageClient('JSON Server', serverOptions, clientOptions);
client.onNotification(TelemetryNotification.type, (e) => { client.onNotification(TelemetryNotification.type, (e) => {
// to be done // to be done
}); });
// handle content request // handle content request
client.onRequest(VSCodeContentRequest.type, (uriPath: string) => { client.onRequest(VSCodeContentRequest.type, (uriPath: string) => {
var uri = Uri.parse(uriPath); let uri = Uri.parse(uriPath);
return workspace.openTextDocument(uri).then(doc => { return workspace.openTextDocument(uri).then(doc => {
return doc.getText(); return doc.getText();
}, error => { }, error => {
@ -76,24 +76,24 @@ export function activate(context: ExtensionContext) {
} }
function getSchemaAssociation(context: ExtensionContext) : ISchemaAssociations { function getSchemaAssociation(context: ExtensionContext) : ISchemaAssociations {
var associations : ISchemaAssociations = {}; let associations : ISchemaAssociations = {};
extensions.all.forEach(extension => { extensions.all.forEach(extension => {
var packageJSON = extension.packageJSON; let packageJSON = extension.packageJSON;
if (packageJSON && packageJSON.contributes && packageJSON.contributes.jsonValidation) { if (packageJSON && packageJSON.contributes && packageJSON.contributes.jsonValidation) {
var jsonValidation = packageJSON.contributes.jsonValidation; let jsonValidation = packageJSON.contributes.jsonValidation;
if (Array.isArray(jsonValidation)) { if (Array.isArray(jsonValidation)) {
jsonValidation.forEach(jv => { jsonValidation.forEach(jv => {
var {fileMatch, url} = jv; let {fileMatch, url} = jv;
if (fileMatch && url) { if (fileMatch && url) {
if (url[0] === '.' && url[1] === '/') { if (url[0] === '.' && url[1] === '/') {
url = path.join(extension.extensionPath, url); url = Uri.file(path.join(extension.extensionPath, url)).toString();
} }
if (fileMatch[0] === '%') { if (fileMatch[0] === '%') {
fileMatch = fileMatch.replace(/%APP_SETTINGS_HOME%/, '/User'); fileMatch = fileMatch.replace(/%APP_SETTINGS_HOME%/, '/User');
} else if (fileMatch.charAt(0) !== '/' && !fileMatch.match(/\w+:\/\//)) { } else if (fileMatch.charAt(0) !== '/' && !fileMatch.match(/\w+:\/\//)) {
fileMatch = '/' + fileMatch; fileMatch = '/' + fileMatch;
} }
var association = associations[fileMatch]; let association = associations[fileMatch];
if (!association) { if (!association) {
association = []; association = [];
associations[fileMatch] = association; associations[fileMatch] = association;