Relax Language First Line Match (#21586)

* Relax Language First Line Match Fixes #21533 **Bug** The first line pattern for a language currently requires the entire line to match. This does is different from how tools such as textmate use firstLineMatch **Fix** Relax this restriction so that any match is used * Fix failing test
microsoft · Mar 2, 2017 · 6b74e23 · 6b74e23
1 parent 9b91a22
commit 6b74e23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/vs/base/common/mime.ts b/src/vs/base/common/mime.ts
@@ -202,9 +202,8 @@ function guessMimeTypeByFirstline(firstLine: string): string {
 				continue;
 			}
 
-			// Make sure the entire line matches, not just a subpart.
 			let matches = firstLine.match(association.firstline);
-			if (matches && matches.length > 0 && matches[0].length === firstLine.length) {
+			if (matches && matches.length > 0) {
 				return association.mime;
 			}
 		}

diff --git a/src/vs/base/test/common/mime.test.ts b/src/vs/base/test/common/mime.test.ts
@@ -37,7 +37,7 @@ suite('Mime', () => {
 		guess = guessMimeTypes('Randomfile.noregistration', 'RegexesAreNice');
 		assert.deepEqual(guess, ['text/nice-regex', 'text/plain']);
 
-		guess = guessMimeTypes('Randomfile.noregistration', 'RegexesAreNiceee');
+		guess = guessMimeTypes('Randomfile.noregistration', 'RegexesAreNotNice');
 		assert.deepEqual(guess, ['application/unknown']);
 
 		guess = guessMimeTypes('Codefile', 'RegexesAreNice');