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

Fixes #2324: [json] Inline schema in settings don't work

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-01-28 17:16:56 +01:00
parent 0c72437701
commit 5168697dfd
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/json/server/src/server.ts
View File

@@ -22,6 +22,7 @@ import {IWorkspaceContextService, ITelemetryService, JSONSchemaService, ISchemaC
import {parse as parseJSON, ObjectASTNode, JSONDocument} from './jsonParser';
import {JSONCompletion} from './jsonCompletion';
import {JSONHover} from './jsonHover';
import {IJSONSchema} from './json-toolbox/jsonSchema';
import {JSONDocumentSymbols} from './jsonDocumentSymbols';
import {format as formatJSON} from './jsonFormatter';
import {schemaContributions} from './configuration';
@@ -142,9 +143,9 @@ interface Settings {
}
interface JSONSchemaSettings {
fileMatch: string[],
url: string,
schema?: any;
fileMatch?: string[],
url?: string,
schema?: IJSONSchema;
}
let jsonConfigurationSettings : JSONSchemaSettings[] = void 0;
@@ -179,8 +180,14 @@ function updateConfiguration() {
}
if (jsonConfigurationSettings) {
jsonConfigurationSettings.forEach((schema) => {
if (schema.url && (schema.fileMatch || schema.schema)) {
if (schema.fileMatch) {
let url = schema.url;
if (!url && schema.schema) {
url = schema.schema.id;
if (!url) {
url = 'vscode://schemas/custom/' + encodeURIComponent(schema.fileMatch.join('&'));
}
}
if (!Strings.startsWith(url, 'http://') && !Strings.startsWith(url, 'https://') && !Strings.startsWith(url, 'file://')) {
let resourceURL = workspaceContext.toResource(url);
if (resourceURL) {