Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support %APP_SETTINGS_HOME% in jsonValidation paths

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-01-23 21:17:00 +01:00
parent 4b7f706e19
commit 0a1ed45811
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,13 @@ export function activate(context: ExtensionContext) {
});
// handle content request
client.onRequest(VSCodeContentRequest.type, (uri: string) => {
return workspace.openTextDocument(uri).then(doc => doc.getText());
client.onRequest(VSCodeContentRequest.type, (uriPath: string) => {
var uri = Uri.parse(uriPath);
return workspace.openTextDocument(uri).then(doc => {
return doc.getText();
}, error => {
return Promise.reject(error)
});
});
let disposable = client.start();
@@ -84,6 +89,11 @@ function getSchemaAssociation(context: ExtensionContext) : ISchemaAssociations {
if (url[0] === '.' && url[1] === '.') {
url = context.asAbsolutePath(url);
}
if (fileMatch[0] === '%') {
fileMatch = fileMatch.replace(/%APP_SETTINGS_HOME%/, '/User');
} else if (fileMatch.charAt(0) !== '/' && !fileMatch.match(/\w+:\/\//)) {
fileMatch = '/' + fileMatch;
}
var association = associations[fileMatch];
if (!association) {
association = [];
@@ -94,6 +104,6 @@ function getSchemaAssociation(context: ExtensionContext) : ISchemaAssociations {
});
}
}
})
});
return associations;
}