From 7c7ae7a66fcc5b890381426065c3de25e95af3bd Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 17 Jul 2017 18:22:49 +0530
Subject: [PATCH] #30856: Register schema for workspace configuration file -
 Both saved & unsaved - which supports intellisense in the files

---
 extensions/configuration-editing/package.json |  8 ++++
 extensions/json/client/src/jsonMain.ts        |  1 +
 .../common/configurationRegistry.ts           |  2 +-
 .../configuration/node/configuration.ts       | 41 ++++++++++++++++++-
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 365b9aae8f7..54f70a0b137 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -39,6 +39,14 @@
         "fileMatch": "%APP_SETTINGS_HOME%/settings.json",
         "url": "vscode://schemas/settings"
       },
+      {
+        "fileMatch": "%APP_WORKSPACES_HOME%/*/workspace.json",
+        "url": "vscode://schemas/workspaceConfig"
+      },
+      {
+        "fileMatch": "**/*.code-workspace",
+        "url": "vscode://schemas/workspaceConfig"
+      },
       {
         "fileMatch": "%APP_SETTINGS_HOME%/locale.json",
         "url": "vscode://schemas/locale"
diff --git a/extensions/json/client/src/jsonMain.ts b/extensions/json/client/src/jsonMain.ts
index 6180cdfc5c9..773998f347b 100644
--- a/extensions/json/client/src/jsonMain.ts
+++ b/extensions/json/client/src/jsonMain.ts
@@ -125,6 +125,7 @@ function getSchemaAssociation(context: ExtensionContext): ISchemaAssociations {
 						}
 						if (fileMatch[0] === '%') {
 							fileMatch = fileMatch.replace(/%APP_SETTINGS_HOME%/, '/User');
+							fileMatch = fileMatch.replace(/%APP_WORKSPACES_HOME%/, '/Workspaces');
 						} else if (fileMatch.charAt(0) !== '/' && !fileMatch.match(/\w+:\/\//)) {
 							fileMatch = '/' + fileMatch;
 						}
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index fe2a1f5a439..356f78076ae 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -81,7 +81,7 @@ export interface IDefaultConfigurationExtension {
 	defaults: { [key: string]: {} };
 }
 
-const schemaId = 'vscode://schemas/settings';
+export const schemaId = 'vscode://schemas/settings';
 export const editorConfigurationSchemaId = 'vscode://schemas/settings/editor';
 const contributionRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
 
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
index 986e7c82392..592706fa345 100644
--- a/src/vs/workbench/services/configuration/node/configuration.ts
+++ b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -16,6 +16,7 @@ import * as collections from 'vs/base/common/collections';
 import { Disposable, toDisposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { readFile, stat } from 'vs/base/node/pfs';
+import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import * as extfs from 'vs/base/node/extfs';
 import { IWorkspaceContextService, IWorkspace, Workspace, ILegacyWorkspace, LegacyWorkspace } from 'vs/platform/workspace/common/workspace';
 import { FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files';
@@ -30,7 +31,7 @@ import { ConfigurationService as GlobalConfigurationService } from 'vs/platform/
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ExtensionsRegistry, ExtensionMessageCollector } from 'vs/platform/extensions/common/extensionsRegistry';
-import { IConfigurationNode, IConfigurationRegistry, Extensions, editorConfigurationSchemaId, IDefaultConfigurationExtension, validateProperty, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationNode, IConfigurationRegistry, Extensions, editorConfigurationSchemaId, IDefaultConfigurationExtension, validateProperty, ConfigurationScope, schemaId } from 'vs/platform/configuration/common/configurationRegistry';
 import { createHash } from 'crypto';
 import { getWorkspaceLabel, IWorkspacesService } from "vs/platform/workspaces/common/workspaces";
 
@@ -418,6 +419,7 @@ export class WorkspaceServiceImpl extends WorkspaceService {
 	}
 
 	private initializeMulitFolderWorkspace(): TPromise<void> {
+		this.registerWorkspaceConfigSchema();
 		return this.workspaceConfiguration.load(this.workspaceConfigPath)
 			.then(() => {
 				const workspaceConfigurationModel = this.workspaceConfiguration.workspaceConfigurationModel;
@@ -432,6 +434,43 @@ export class WorkspaceServiceImpl extends WorkspaceService {
 			});
 	}
 
+	private registerWorkspaceConfigSchema(): void {
+		const contributionRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
+		if (!contributionRegistry.getSchemaContributions().schemas['vscode://schemas/workspaceConfig']) {
+			contributionRegistry.registerSchema('vscode://schemas/workspaceConfig', {
+				default: {
+					id: 'SOME_UNIQUE_ID',
+					folders: [
+						'file:///'
+					],
+					settings: {
+					}
+				},
+				required: ['id', 'folders'],
+				properties: {
+					'id': {
+						type: 'string',
+						description: nls.localize('workspaceConfig.id', "Unique workspace id"),
+						minLength: 1
+					},
+					'folders': {
+						minItems: 1,
+						uniqueItems: true,
+						items: {
+							type: 'string'
+						}
+					},
+					'settings': {
+						type: 'object',
+						default: {},
+						description: nls.localize('workspaceSettings.description', "Configure workspace settings"),
+						$ref: schemaId
+					}
+				}
+			});
+		}
+	}
+
 	private initializeSingleFolderWorkspace(): TPromise<void> {
 		return stat(this.folderPath.fsPath)
 			.then(workspaceStat => {
-- 
GitLab