From 220b9dadbb233749e9fcae1b58b88abac5ce4498 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Mon, 22 Apr 2013 18:09:57 -0700
Subject: [PATCH] Don't show null grammar in grammar selector

---
 src/packages/grammar-selector/lib/grammar-selector.coffee    | 2 ++
 .../grammar-selector/spec/grammar-selector-spec.coffee       | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/packages/grammar-selector/lib/grammar-selector.coffee b/src/packages/grammar-selector/lib/grammar-selector.coffee
index 81f678a52..6bf1d5721 100644
--- a/src/packages/grammar-selector/lib/grammar-selector.coffee
+++ b/src/packages/grammar-selector/lib/grammar-selector.coffee
@@ -1,6 +1,7 @@
 SelectList = require 'select-list'
 Editor = require 'editor'
 {$$} = require 'space-pen'
+_ = require 'underscore'
 
 module.exports =
 class GrammarSelector extends SelectList
@@ -36,6 +37,7 @@ class GrammarSelector extends SelectList
 
   populate: ->
     grammars = new Array(syntax.grammars...)
+    grammars = _.reject grammars, (grammar) -> grammar is syntax.nullGrammar
     grammars.sort (grammarA, grammarB) ->
       if grammarA.scopeName is 'text.plain'
         -1
diff --git a/src/packages/grammar-selector/spec/grammar-selector-spec.coffee b/src/packages/grammar-selector/spec/grammar-selector-spec.coffee
index db4fa262c..42466a300 100644
--- a/src/packages/grammar-selector/spec/grammar-selector-spec.coffee
+++ b/src/packages/grammar-selector/spec/grammar-selector-spec.coffee
@@ -1,6 +1,7 @@
 GrammarSelector = require '../lib/grammar-selector'
 RootView = require 'root-view'
 _ = require 'underscore'
+$ = require 'jquery'
 
 describe "GrammarSelector", ->
   [editor, textGrammar, jsGrammar] =  []
@@ -24,8 +25,10 @@ describe "GrammarSelector", ->
       grammarView = rootView.find('.grammar-selector').view()
       expect(grammarView).toExist()
       grammars = syntax.grammars
-      expect(grammarView.list.children('li').length).toBe grammars.length + 1
+      expect(grammarView.list.children('li').length).toBe grammars.length
       expect(grammarView.list.children('li:first').text()).toBe 'Auto Detect'
+      for li in grammarView.list.children('li')
+        expect($(li).text()).not.toBe syntax.nullGrammar.name
 
   describe "when a grammar is selected", ->
     it "sets the new grammar on the editor", ->