Merge from vscode cfc1ab4c5f816765b91fb7ead3c3427a7c8581a3

extensions/search-result/syntaxes/generateTMLanguage.js

@@ -55,6 +55,7 @@ const mappings = [
 	['vb', 'source.asp.vb.net'],
 	['xml', 'text.xml'],
 	['yaml', 'source.yaml'],
+	['yml', 'source.yaml'],
 ];
 
 const scopes = {
@@ -113,8 +114,8 @@ mappings.forEach(([ext, scope, regexp]) =>
 		patterns: [
 			{
 				name: [scopes.resultBlock.result.meta, scopes.resultBlock.result.metaMultiLine].join(' '),
-				begin: '^  ((\\d+) )',
-				while: '^  (?:((\\d+)(:))|((\\d+) ))',
+				begin: '^  (?:\\s*)((\\d+) )',
+				while: '^  (?:\\s*)(?:((\\d+)(:))|((\\d+) ))',
 				beginCaptures: {
 					'0': { name: scopes.resultBlock.result.prefix.meta },
 					'1': { name: scopes.resultBlock.result.prefix.metaContext },
@@ -132,7 +133,7 @@ mappings.forEach(([ext, scope, regexp]) =>
 				patterns: [{ include: scope }]
 			},
 			{
-				begin: '^  ((\\d+)(:))',
+				begin: '^  (?:\\s*)((\\d+)(:))',
 				while: '(?=not)possible',
 				name: [scopes.resultBlock.result.meta, scopes.resultBlock.result.metaSingleLine].join(' '),
 				beginCaptures: {
@@ -214,7 +215,7 @@ const plainText = [
 		}
 	},
 	{
-		match: '^  (?:((\\d+)(:))|((\\d+)( ))(.*))',
+		match: '^  (?:\\s*)(?:((\\d+)(:))|((\\d+)( ))(.*))',
 		name: [scopes.resultBlock.meta, scopes.resultBlock.result.meta].join(' '),
 		captures: {
 			'1': { name: [scopes.resultBlock.result.prefix.meta, scopes.resultBlock.result.prefix.metaMatch].join(' ') },