rename allowTrailingsCommas -> allowTrailingCommas

aeschli · aeschli · commit cb70fd5ef0d0 · 2019-09-20T11:31:11.000+02:00
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "jsonc-parser": "^2.1.1",
     "request-light": "^0.2.4",
-    "vscode-json-languageservice": "^3.3.3",
+    "vscode-json-languageservice": "^3.3.4",
     "vscode-languageserver": "^5.3.0-next.8",
     "vscode-nls": "^4.1.1",
     "vscode-uri": "^2.0.3"
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
@@ -73,10 +73,10 @@ request-light@^0.2.4:
     https-proxy-agent "^2.2.1"
     vscode-nls "^4.0.0"
 
-vscode-json-languageservice@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.3.3.tgz#f7e512a2cd5e82fecbebf507d6fceaea47661297"
-  integrity sha512-5vL3OXTUuQpn6+tGd47dopio+7WwbtIZ07zfYMzAUX8eVWPZjfEsLeSWmQk5Xw+vwgu+j5zC4koz5UofLDGGRA==
+vscode-json-languageservice@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.3.4.tgz#4ff67580491d3a5dc469f4a78643f20adff0278d"
+  integrity sha512-/nuI4uDBfxyVyeGtBdYwP/tIaXYKOoymUOSozYKLzsmrDmu555gZpzc11LrARa96z92wSaa5hfjTtNMAoM2mxw==
   dependencies:
     jsonc-parser "^2.1.1"
     vscode-languageserver-types "^3.15.0-next.2"
diff --git a/src/vs/base/common/jsonSchema.ts b/src/vs/base/common/jsonSchema.ts
@@ -61,7 +61,7 @@ export interface IJSONSchema {
 	markdownDescription?: string; // VSCode extension
 	doNotSuggest?: boolean; // VSCode extension
 	allowComments?: boolean; // VSCode extension
-	allowsTrailingCommas?: boolean; // VSCode extension
+	allowTrailingCommas?: boolean; // VSCode extension
 }
 
 export interface IJSONSchemaMap {
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -170,7 +170,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			properties: {}
 		};
 		this.configurationContributors = [this.defaultOverridesConfigurationNode];
-		this.editorConfigurationSchema = { properties: {}, patternProperties: {}, additionalProperties: false, errorMessage: 'Unknown editor configuration setting', allowsTrailingCommas: true, allowComments: true };
+		this.editorConfigurationSchema = { properties: {}, patternProperties: {}, additionalProperties: false, errorMessage: 'Unknown editor configuration setting', allowTrailingCommas: true, allowComments: true };
 		this.configurationProperties = {};
 		this.excludedConfigurationProperties = {};
 		this.computeOverridePropertyPattern();
diff --git a/src/vs/workbench/api/common/configurationExtensionPoint.ts b/src/vs/workbench/api/common/configurationExtensionPoint.ts
@@ -238,7 +238,7 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten
 const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
 jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
 	allowComments: true,
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	default: {
 		folders: [
 			{
diff --git a/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts b/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts
@@ -359,7 +359,7 @@ export class LanguageConfigurationFileHandler {
 const schemaId = 'vscode://schemas/language-configuration';
 const schema: IJSONSchema = {
 	allowComments: true,
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	default: {
 		comments: {
 			blockComment: ['/*', '*/'],
diff --git a/src/vs/workbench/contrib/debug/common/debugSchemas.ts b/src/vs/workbench/contrib/debug/common/debugSchemas.ts
@@ -137,7 +137,7 @@ export const launchSchema: IJSONSchema = {
 	id: launchSchemaId,
 	type: 'object',
 	title: nls.localize('app.launch.json.title', "Launch"),
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	allowComments: true,
 	required: [],
 	default: { version: '0.2.0', configurations: [], compounds: [] },
diff --git a/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts b/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts
@@ -11,7 +11,7 @@ export const ExtensionsConfigurationSchemaId = 'vscode://schemas/extensions';
 export const ExtensionsConfigurationSchema: IJSONSchema = {
 	id: ExtensionsConfigurationSchemaId,
 	allowComments: true,
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	type: 'object',
 	title: localize('app.extensions.json.title', "Extensions"),
 	additionalProperties: false,
diff --git a/src/vs/workbench/contrib/localizations/browser/localizations.contribution.ts b/src/vs/workbench/contrib/localizations/browser/localizations.contribution.ts
@@ -232,7 +232,7 @@ function registerLocaleDefinitionSchema(languages: string[]): void {
 	jsonRegistry.registerSchema(localeDefinitionFileSchemaId, {
 		id: localeDefinitionFileSchemaId,
 		allowComments: true,
-		allowsTrailingCommas: true,
+		allowTrailingCommas: true,
 		description: 'Locale Definition file',
 		type: 'object',
 		default: {
diff --git a/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts b/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts
@@ -28,7 +28,7 @@ const languageScopeSchemaId = 'vscode://schemas/snippets';
 const languageScopeSchema: IJSONSchema = {
 	id: languageScopeSchemaId,
 	allowComments: true,
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	defaultSnippets: [{
 		label: nls.localize('snippetSchema.json.default', "Empty snippet"),
 		body: { '${1:snippetName}': { 'prefix': '${2:prefix}', 'body': '${3:snippet}', 'description': '${4:description}' } }
@@ -64,7 +64,7 @@ const globalSchemaId = 'vscode://schemas/global-snippets';
 const globalSchema: IJSONSchema = {
 	id: globalSchemaId,
 	allowComments: true,
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	defaultSnippets: [{
 		label: nls.localize('snippetSchema.json.default', "Empty snippet"),
 		body: { '${1:snippetName}': { 'scope': '${2:scope}', 'prefix': '${3:prefix}', 'body': '${4:snippet}', 'description': '${5:description}' } }
diff --git a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
@@ -260,7 +260,7 @@ let schema: IJSONSchema = {
 	id: schemaId,
 	description: 'Task definition file',
 	type: 'object',
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	allowComments: true,
 	default: {
 		version: '2.0.0',
diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
@@ -507,17 +507,17 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 	private registerConfigurationSchemas(): void {
 		if (this.workspace) {
 			const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
-			const allSettingsSchema: IJSONSchema = { properties: allSettings.properties, patternProperties: allSettings.patternProperties, additionalProperties: true, allowsTrailingCommas: true, allowComments: true };
-			const userSettingsSchema: IJSONSchema = this.remoteUserConfiguration ? { properties: { ...applicationSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowsTrailingCommas: true, allowComments: true } : allSettingsSchema;
-			const machineSettingsSchema: IJSONSchema = { properties: { ...machineSettings.properties, ...machineOverridableSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowsTrailingCommas: true, allowComments: true };
-			const workspaceSettingsSchema: IJSONSchema = { properties: { ...machineOverridableSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowsTrailingCommas: true, allowComments: true };
+			const allSettingsSchema: IJSONSchema = { properties: allSettings.properties, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
+			const userSettingsSchema: IJSONSchema = this.remoteUserConfiguration ? { properties: { ...applicationSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true } : allSettingsSchema;
+			const machineSettingsSchema: IJSONSchema = { properties: { ...machineSettings.properties, ...machineOverridableSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
+			const workspaceSettingsSchema: IJSONSchema = { properties: { ...machineOverridableSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
 
 			jsonRegistry.registerSchema(defaultSettingsSchemaId, allSettingsSchema);
 			jsonRegistry.registerSchema(userSettingsSchemaId, userSettingsSchema);
 			jsonRegistry.registerSchema(machineSettingsSchemaId, machineSettingsSchema);
 
 			if (WorkbenchState.WORKSPACE === this.getWorkbenchState()) {
-				const folderSettingsSchema: IJSONSchema = { properties: { ...machineOverridableSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowsTrailingCommas: true, allowComments: true };
+				const folderSettingsSchema: IJSONSchema = { properties: { ...machineOverridableSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
 				jsonRegistry.registerSchema(workspaceSettingsSchemaId, workspaceSettingsSchema);
 				jsonRegistry.registerSchema(folderSettingsSchemaId, folderSettingsSchema);
 			} else {
diff --git a/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
@@ -603,7 +603,7 @@ let schema: IJSONSchema = {
 	id: schemaId,
 	type: 'array',
 	title: nls.localize('keybindings.json.title', "Keybindings configuration"),
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	allowComments: true,
 	definitions: {
 		'editorGroupsSchema': {
diff --git a/src/vs/workbench/services/themes/common/colorThemeSchema.ts b/src/vs/workbench/services/themes/common/colorThemeSchema.ts
@@ -192,7 +192,7 @@ export const colorThemeSchemaId = 'vscode://schemas/color-theme';
 const colorThemeSchema: IJSONSchema = {
 	type: 'object',
 	allowComments: true,
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	properties: {
 		colors: {
 			description: nls.localize('schema.workbenchColors', 'Colors in the workbench'),
diff --git a/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts b/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
@@ -12,7 +12,7 @@ const schemaId = 'vscode://schemas/icon-theme';
 const schema: IJSONSchema = {
 	type: 'object',
 	allowComments: true,
-	allowsTrailingCommas: true,
+	allowTrailingCommas: true,
 	definitions: {
 		folderExpanded: {
 			type: 'string',

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export interface IJSONSchema {`
`61`	`61`	`markdownDescription?: string; // VSCode extension`
`62`	`62`	`doNotSuggest?: boolean; // VSCode extension`
`63`	`63`	`allowComments?: boolean; // VSCode extension`
`64`		`- allowsTrailingCommas?: boolean; // VSCode extension`
	`64`	`+ allowTrailingCommas?: boolean; // VSCode extension`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`export interface IJSONSchemaMap {`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten`
`238`	`238`	`const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);`
`239`	`239`	`jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {`
`240`	`240`	`allowComments: true,`
`241`		`- allowsTrailingCommas: true,`
	`241`	`+ allowTrailingCommas: true,`
`242`	`242`	`default: {`
`243`	`243`	`folders: [`
`244`	`244`	`{`