From a908dd5c29691fd139516a45cb1b8be6eb144cf3 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sun, 10 Feb 2013 14:58:43 -0800
Subject: [PATCH] Don't apply whitespace in emoji matches

---
 src/packages/gfm.tmbundle/Syntaxes/gfm.cson    | 2 +-
 src/packages/gfm.tmbundle/spec/gfm-spec.coffee | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/packages/gfm.tmbundle/Syntaxes/gfm.cson b/src/packages/gfm.tmbundle/Syntaxes/gfm.cson
index 30a11c07b..71756f91d 100644
--- a/src/packages/gfm.tmbundle/Syntaxes/gfm.cson
+++ b/src/packages/gfm.tmbundle/Syntaxes/gfm.cson
@@ -29,7 +29,7 @@
     'name': 'markup.heading.gfm'
   }
   {
-    'match': '\\:[^\\:]+\\:'
+    'match': '\\:[^\\:\\s]+\\:'
     'name': 'variable.emoji.gfm'
   }
   {
diff --git a/src/packages/gfm.tmbundle/spec/gfm-spec.coffee b/src/packages/gfm.tmbundle/spec/gfm-spec.coffee
index 70e24d913..1ff79e62f 100644
--- a/src/packages/gfm.tmbundle/spec/gfm-spec.coffee
+++ b/src/packages/gfm.tmbundle/spec/gfm-spec.coffee
@@ -60,6 +60,9 @@ describe "GitHub Flavored Markdown grammar", ->
     expect(tokens[0]).toEqual value: "this is ", scopes: ["source.gfm"]
     expect(tokens[1]).toEqual value: ":no_good:", scopes: ["source.gfm", "variable.emoji.gfm"]
 
+    {tokens} = grammar.tokenizeLine("this is :no good:")
+    expect(tokens[0]).toEqual value: "this is :no good:", scopes: ["source.gfm"]
+
   it "tokenizes a ``` code block```", ->
     {tokens, ruleStack} = grammar.tokenizeLine("```coffeescript")
     expect(tokens[0]).toEqual value: "```coffeescript", scopes: ["source.gfm", "support.gfm"]