Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-02 23:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

IntelliSense not work in settings.json . Fixes #33069

Browse Source
This commit is contained in:
Martin Aeschlimann
2017-08-29 18:01:32 +02:00
parent 7dc1ddd3e8
commit c0f8d12673
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
extensions/json/client/src/jsonMain.ts
View File

@@ -204,28 +204,30 @@ function getSettings(): Settings {
}
let folders = workspace.workspaceFolders;
folders.forEach(folder => {
let jsonConfig = workspace.getConfiguration('json', folder.uri);
let schemaConfigInfo = jsonConfig.inspect<JSONSchemaSettings[]>('schemas');
let folderSchemas = schemaConfigInfo.workspaceFolderValue;
if (Array.isArray(folderSchemas)) {
folderSchemas.forEach(schema => {
let url = schema.url;
if (!url && schema.schema) {
url = schema.schema.id;
}
if (url && url[0] === '.') {
url = Uri.file(path.normalize(path.join(folder.uri.fsPath, url))).toString();
}
let fileMatch = schema.fileMatch;
if (folders) {
folders.forEach(folder => {
let jsonConfig = workspace.getConfiguration('json', folder.uri);
let schemaConfigInfo = jsonConfig.inspect<JSONSchemaSettings[]>('schemas');
let folderSchemas = schemaConfigInfo.workspaceFolderValue;
if (Array.isArray(folderSchemas)) {
folderSchemas.forEach(schema => {
let url = schema.url;
if (!url && schema.schema) {
url = schema.schema.id;
}
if (url && url[0] === '.') {
url = Uri.file(path.normalize(path.join(folder.uri.fsPath, url))).toString();
}
let fileMatch = schema.fileMatch;
if (fileMatch) {
fileMatch = fileMatch.map(m => path.join(folder.uri.path + '*', m));
}
schemas.push({ url, fileMatch, schema: schema.schema });
});
};
});
if (fileMatch) {
fileMatch = fileMatch.map(m => path.join(folder.uri.path + '*', m));
}
schemas.push({ url, fileMatch, schema: schema.schema });
});
};
});
}
return settings;
}