From 0f89211d55cbcc5f4fdbfa6f76ed6cb709c98783 Mon Sep 17 00:00:00 2001
From: Indrek Ardel <indrek@ardel.eu>
Date: Fri, 20 Oct 2017 13:34:15 +0300
Subject: [PATCH] Prioritize first line matches over bundled/non bundled
 cirteria

---
 .../packages/package-with-rb-filetype/grammars/rb.cson        | 1 +
 spec/grammars-spec.coffee                                     | 2 ++
 src/grammar-registry.js                                       | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/fixtures/packages/package-with-rb-filetype/grammars/rb.cson b/spec/fixtures/packages/package-with-rb-filetype/grammars/rb.cson
index 8b4d85412..37aac3d4d 100644
--- a/spec/fixtures/packages/package-with-rb-filetype/grammars/rb.cson
+++ b/spec/fixtures/packages/package-with-rb-filetype/grammars/rb.cson
@@ -1,5 +1,6 @@
 'name': 'Test Ruby'
 'scopeName': 'test.rb'
+'firstLineMatch': '^\\#!.*(?:\\s|\\/)(?:testruby)(?:$|\\s)'
 'fileTypes': [
   'rb'
 ]
diff --git a/spec/grammars-spec.coffee b/spec/grammars-spec.coffee
index 7b70797ba..db716528d 100644
--- a/spec/grammars-spec.coffee
+++ b/spec/grammars-spec.coffee
@@ -120,6 +120,8 @@ describe "the `grammars` global", ->
         atom.grammars.grammarForScopeName('source.ruby').bundledPackage = true
         atom.grammars.grammarForScopeName('test.rb').bundledPackage = false
 
+        expect(atom.grammars.selectGrammar('test.rb', '#!/usr/bin/env ruby').scopeName).toBe 'source.ruby'
+        expect(atom.grammars.selectGrammar('test.rb', '#!/usr/bin/env testruby').scopeName).toBe 'test.rb'
         expect(atom.grammars.selectGrammar('test.rb').scopeName).toBe 'test.rb'
 
     describe "when there is no file path", ->
diff --git a/src/grammar-registry.js b/src/grammar-registry.js
index b1de16ba1..f2994acf1 100644
--- a/src/grammar-registry.js
+++ b/src/grammar-registry.js
@@ -58,10 +58,10 @@ class GrammarRegistry extends FirstMate.GrammarRegistry {
 
     let score = this.getGrammarPathScore(grammar, filePath)
     if ((score > 0) && !grammar.bundledPackage) {
-      score += 0.25
+      score += 0.125
     }
     if (this.grammarMatchesContents(grammar, contents)) {
-      score += 0.125
+      score += 0.25
     }
     return score
   }