From a16cece4e56047e4bd60628bfcd3f244a40fad82 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 29 Nov 2021 17:58:02 +0100 Subject: [PATCH] fix $ref's (json pointers start with `#/`) --- .../common/tokenClassificationRegistry.ts | 2 +- .../languageConfigurationExtensionPoint.ts | 20 +++++++++---------- .../contrib/tasks/common/jsonSchema_v2.ts | 2 +- .../themes/common/colorThemeSchema.ts | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/vs/platform/theme/common/tokenClassificationRegistry.ts b/src/vs/platform/theme/common/tokenClassificationRegistry.ts index b74f64dc33bbf..87a87855d9286 100644 --- a/src/vs/platform/theme/common/tokenClassificationRegistry.ts +++ b/src/vs/platform/theme/common/tokenClassificationRegistry.ts @@ -576,7 +576,7 @@ function getStylingSchemeEntry(description?: string, deprecationMessage?: string format: 'color-hex' }, { - $ref: '#definitions/style' + $ref: '#/definitions/style' } ] }; diff --git a/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts b/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts index ce14f4fb16b4a..c87e7db9858b1 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts @@ -480,9 +480,9 @@ const schema: IJSONSchema = { bracketPair: { type: 'array', items: [{ - $ref: '#definitions/openBracket' + $ref: '#/definitions/openBracket' }, { - $ref: '#definitions/closeBracket' + $ref: '#/definitions/closeBracket' }] } }, @@ -517,7 +517,7 @@ const schema: IJSONSchema = { description: nls.localize('schema.brackets', 'Defines the bracket symbols that increase or decrease the indentation.'), type: 'array', items: { - $ref: '#definitions/bracketPair' + $ref: '#/definitions/bracketPair' } }, colorizedBracketPairs: { @@ -525,7 +525,7 @@ const schema: IJSONSchema = { description: nls.localize('schema.colorizedBracketPairs', 'Defines the bracket pairs that are colorized by their nesting level if bracket pair colorization is enabled.'), type: 'array', items: { - $ref: '#definitions/bracketPair' + $ref: '#/definitions/bracketPair' } }, autoClosingPairs: { @@ -534,15 +534,15 @@ const schema: IJSONSchema = { type: 'array', items: { oneOf: [{ - $ref: '#definitions/bracketPair' + $ref: '#/definitions/bracketPair' }, { type: 'object', properties: { open: { - $ref: '#definitions/openBracket' + $ref: '#/definitions/openBracket' }, close: { - $ref: '#definitions/closeBracket' + $ref: '#/definitions/closeBracket' }, notIn: { type: 'array', @@ -566,15 +566,15 @@ const schema: IJSONSchema = { type: 'array', items: { oneOf: [{ - $ref: '#definitions/bracketPair' + $ref: '#/definitions/bracketPair' }, { type: 'object', properties: { open: { - $ref: '#definitions/openBracket' + $ref: '#/definitions/openBracket' }, close: { - $ref: '#definitions/closeBracket' + $ref: '#/definitions/closeBracket' } } }] diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts index 0885bf6c6dd69..71a91f23de68e 100644 --- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts +++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts @@ -38,7 +38,7 @@ const shellCommand: IJSONSchema = { description: nls.localize('JsonSchema.shell', 'Specifies whether the command is a shell command or an external program. Defaults to false if omitted.') }, { - $ref: '#definitions/shellConfiguration' + $ref: '#/definitions/shellConfiguration' } ], deprecationMessage: nls.localize('JsonSchema.tasks.isShellCommand.deprecated', 'The property isShellCommand is deprecated. Use the type property of the task and the shell property in the options instead. See also the 1.14 release notes.') diff --git a/src/vs/workbench/services/themes/common/colorThemeSchema.ts b/src/vs/workbench/services/themes/common/colorThemeSchema.ts index 18b1e596074a5..0b797a38eb6bd 100644 --- a/src/vs/workbench/services/themes/common/colorThemeSchema.ts +++ b/src/vs/workbench/services/themes/common/colorThemeSchema.ts @@ -115,8 +115,8 @@ let textMateScopes = [ ]; export const textmateColorsSchemaId = 'vscode://schemas/textmate-colors'; -export const textmateColorSettingsSchemaId = `${textmateColorsSchemaId}#definitions/settings`; -export const textmateColorGroupSchemaId = `${textmateColorsSchemaId}#definitions/colorGroup`; +export const textmateColorSettingsSchemaId = `${textmateColorsSchemaId}#/definitions/settings`; +export const textmateColorGroupSchemaId = `${textmateColorsSchemaId}#/definitions/colorGroup`; const textmateColorSchema: IJSONSchema = { type: 'array', @@ -129,7 +129,7 @@ const textmateColorSchema: IJSONSchema = { format: 'color-hex' }, { - $ref: '#definitions/settings' + $ref: '#/definitions/settings' } ] }, @@ -191,7 +191,7 @@ const textmateColorSchema: IJSONSchema = { ] }, settings: { - $ref: '#definitions/settings' + $ref: '#/definitions/settings' } }, required: [