From 6c0fe2014e7a7d596ac1af21f25bf2fc17da8a75 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 7 Mar 2016 10:06:46 +0100
Subject: [PATCH] Fixes #3594: copy over filenamePatterns when validating
 language extension point

---
 src/vs/editor/common/services/modeService.ts  | 11 +++++++++
 .../editor/common/services/modeServiceImpl.ts | 23 +++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/vs/editor/common/services/modeService.ts b/src/vs/editor/common/services/modeService.ts
index fdb585a44d2..c7c2975b47e 100644
--- a/src/vs/editor/common/services/modeService.ts
+++ b/src/vs/editor/common/services/modeService.ts
@@ -36,6 +36,17 @@ export interface ILanguageExtensionPoint {
 	configuration?: string;
 }
 
+export interface IValidLanguageExtensionPoint {
+	id: string;
+	extensions: string[];
+	filenames: string[];
+	filenamePatterns: string[];
+	firstLine: string;
+	aliases: string[];
+	mimetypes: string[];
+	configuration: string;
+}
+
 export interface IModeService {
 	serviceId: ServiceIdentifier<any>;
 
diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts
index b08ec95e090..58dd9fb69c8 100644
--- a/src/vs/editor/common/services/modeServiceImpl.ts
+++ b/src/vs/editor/common/services/modeServiceImpl.ts
@@ -32,7 +32,7 @@ import {IRichEditConfiguration, RichEditSupport} from 'vs/editor/common/modes/su
 import {ISuggestContribution, SuggestSupport} from 'vs/editor/common/modes/supports/suggestSupport';
 import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService';
 import {LanguagesRegistry} from 'vs/editor/common/services/languagesRegistry';
-import {ILanguageExtensionPoint, IModeLookupResult, IModeService} from 'vs/editor/common/services/modeService';
+import {ILanguageExtensionPoint, IValidLanguageExtensionPoint, IModeLookupResult, IModeService} from 'vs/editor/common/services/modeService';
 import {IModelService} from 'vs/editor/common/services/modelService';
 import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceEventTypes} from 'vs/platform/configuration/common/configuration';
 
@@ -520,7 +520,7 @@ export class MainThreadModeServiceImpl extends ModeServiceImpl {
 		this._hasInitialized = false;
 
 		languagesExtPoint.setHandler((extensions:IExtensionPointUser<ILanguageExtensionPoint[]>[]) => {
-			let allValidLanguages: ILanguageExtensionPoint[] = [];
+			let allValidLanguages: IValidLanguageExtensionPoint[] = [];
 
 			for (let i = 0, len = extensions.length; i < len; i++) {
 				let extension = extensions[i];
@@ -531,15 +531,18 @@ export class MainThreadModeServiceImpl extends ModeServiceImpl {
 				}
 
 				for (let j = 0, lenJ = extension.value.length; j < lenJ; j++) {
-					if (isValidLanguageExtensionPoint(extension.value[j], extension.collector)) {
+					let ext = extension.value[j];
+					if (isValidLanguageExtensionPoint(ext, extension.collector)) {
+						let configuration = (ext.configuration ? paths.join(extension.description.extensionFolderPath, ext.configuration) : ext.configuration);
 						allValidLanguages.push({
-							id: extension.value[j].id,
-							extensions: extension.value[j].extensions,
-							filenames: extension.value[j].filenames,
-							firstLine: extension.value[j].firstLine,
-							aliases: extension.value[j].aliases,
-							mimetypes: extension.value[j].mimetypes,
-							configuration: extension.value[j].configuration ? paths.join(extension.description.extensionFolderPath, extension.value[j].configuration) : extension.value[j].configuration
+							id: ext.id,
+							extensions: ext.extensions,
+							filenames: ext.filenames,
+							filenamePatterns: ext.filenamePatterns,
+							firstLine: ext.firstLine,
+							aliases: ext.aliases,
+							mimetypes: ext.mimetypes,
+							configuration: configuration
 						});
 					}
 				}
-- 
GitLab