From d491308684ed180049d389fd2c285da6bc546bf7 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 27 Jul 2016 18:05:48 +0200
Subject: [PATCH] [json] Improved snippets proposals for extension developments

---
 src/vs/editor/common/services/modeServiceImpl.ts        | 6 +++---
 src/vs/platform/extensions/common/extensionsRegistry.ts | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts
index 8ed2e15bce8..bec6633e2fe 100644
--- a/src/vs/editor/common/services/modeServiceImpl.ts
+++ b/src/vs/editor/common/services/modeServiceImpl.ts
@@ -31,10 +31,9 @@ interface IModeConfigurationMap { [modeId: string]: any; }
 let languagesExtPoint = ExtensionsRegistry.registerExtensionPoint<ILanguageExtensionPoint[]>('languages', {
 	description: nls.localize('vscode.extension.contributes.languages', 'Contributes language declarations.'),
 	type: 'array',
-	defaultSnippets: [{ body: [{ id: '', aliases: [], extensions: [] }] }],
 	items: {
 		type: 'object',
-		defaultSnippets: [{ body: { id: '', extensions: [] } }],
+		defaultSnippets: [{ body: { id: '{{languageId}}', aliases: ['{{label}}'], extensions: ['{{extension}}'], configuration: './language-configuration.json'} }],
 		properties: {
 			id: {
 				description: nls.localize('vscode.extension.contributes.languages.id', 'ID of the language.'),
@@ -82,7 +81,8 @@ let languagesExtPoint = ExtensionsRegistry.registerExtensionPoint<ILanguageExten
 			},
 			configuration: {
 				description: nls.localize('vscode.extension.contributes.languages.configuration', 'A relative path to a file containing configuration options for the language.'),
-				type: 'string'
+				type: 'string',
+				default: './language-configuration.json'
 			}
 		}
 	}
diff --git a/src/vs/platform/extensions/common/extensionsRegistry.ts b/src/vs/platform/extensions/common/extensionsRegistry.ts
index 0b2be9cb597..cdaf27c2c70 100644
--- a/src/vs/platform/extensions/common/extensionsRegistry.ts
+++ b/src/vs/platform/extensions/common/extensionsRegistry.ts
@@ -249,7 +249,8 @@ const schema: IJSONSchema = {
 			description: nls.localize('vscode.extension.activationEvents', 'Activation events for the VS Code extension.'),
 			type: 'array',
 			items: {
-				type: 'string'
+				type: 'string',
+				defaultSnippets: [{ label: 'onLanguage', body: 'onLanguage:{{languageId}}'}, {label: 'onCommand', body: 'onCommand:{{commandId}}'}, {label: 'onDebug', body: 'onDebug:{{type}}'}, {label: 'workspaceContains', body: 'workspaceContains:{{fileName}}'}],
 			}
 		},
 		extensionDependencies: {