From 7150f70333e63104cf1a25826d4d6c5491314e3e Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 13:16:28 -0800
Subject: [PATCH 001/133] editor stats package genesis

---
 src/packages/editor-stats/index.coffee        |  9 +++
 .../editor-stats/src/editor-stats-view.coffee | 58 +++++++++++++++++++
 .../editor-stats/stylesheets/editor-stats.css |  9 +++
 3 files changed, 76 insertions(+)
 create mode 100644 src/packages/editor-stats/index.coffee
 create mode 100644 src/packages/editor-stats/src/editor-stats-view.coffee
 create mode 100644 src/packages/editor-stats/stylesheets/editor-stats.css

diff --git a/src/packages/editor-stats/index.coffee b/src/packages/editor-stats/index.coffee
new file mode 100644
index 000000000..60a97582e
--- /dev/null
+++ b/src/packages/editor-stats/index.coffee
@@ -0,0 +1,9 @@
+DeferredAtomPackage = require 'deferred-atom-package'
+
+module.exports =
+class EditorStats extends DeferredAtomPackage
+  loadEvents: ['editor-stats:toggle']
+
+  instanceClass: 'editor-stats/src/editor-stats-view'
+
+  onLoadEvent: (event, instance) -> instance.toggle()
diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
new file mode 100644
index 000000000..480a34017
--- /dev/null
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -0,0 +1,58 @@
+{$$$} = require 'space-pen'
+ScrollView = require 'scroll-view'
+$ = require 'jquery'
+_ = require 'underscore'
+
+module.exports =
+class EditorStatsView extends ScrollView
+  time = (date) ->
+    date.setTime(date.getTime() + 6e4)
+    hour = date.getHours()
+    minute = date.getMinutes()
+    "#{hour}:#{minute}"
+
+  @activate: (rootView, state) ->
+    @instance = new EditorStatsView(rootView, state?.eventLog)
+
+  @content: (rootView) ->
+    @div class: 'editor-stats', tabindex: -1
+
+  @serialize: ->
+    @instance.serialize()
+
+  eventlog: [],
+
+  initialize: (@rootView, @eventLog = {}) ->
+    super
+
+    date = new Date()
+    future = new Date(date.getTime() + 36e5)
+    @eventlog[time(date)] = 0
+
+    while date <= future
+      @eventlog[time(date)] = 0
+
+    @rootView.on 'keyup', @track
+    @rootView.on 'mousedown', @track
+
+  track: =>
+    date = new Date
+    @eventlog[time(date)] += 1
+    console.log @eventlog
+
+  toggle: ->
+    if @hasParent()
+      @detach()
+    else
+      @attach()
+
+  attach: ->
+    @rootView.append @
+    @focus()
+
+  detach: ->
+    super()
+    @rootView.focus()
+
+  serialize: ->
+    eventLog: @eventLog
\ No newline at end of file
diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
new file mode 100644
index 000000000..827da6667
--- /dev/null
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -0,0 +1,9 @@
+.editor-stats {
+  position: absolute;
+  height: 200px;
+  width: 100%;
+  bottom: 0;
+  left: 0;
+  z-index: 99;
+  background: #1d1f21;
+}
\ No newline at end of file

From fd7358cb9ad42d71413256f016fc1d57a4b2a1d4 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 13:21:01 -0800
Subject: [PATCH 002/133] maintain the event log length at 60 items

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 480a34017..72873c6ea 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -37,7 +37,11 @@ class EditorStatsView extends ScrollView
 
   track: =>
     date = new Date
-    @eventlog[time(date)] += 1
+    times = time date
+    @eventlog[times] ||= 0
+    @eventlog[times] += 1
+
+    @eventlog.shift() if @eventlog.length > 60
     console.log @eventlog
 
   toggle: ->

From e3831dddbae28ca0c75e269771ebed63dd6af1c6 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 13:38:00 -0800
Subject: [PATCH 003/133] cancel command

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 72873c6ea..861d8cb0b 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -25,6 +25,8 @@ class EditorStatsView extends ScrollView
   initialize: (@rootView, @eventLog = {}) ->
     super
 
+    @command 'core:cancel', @detach
+
     date = new Date()
     future = new Date(date.getTime() + 36e5)
     @eventlog[time(date)] = 0

From 740d929cdd6a3526ce8dd1a093648c1b6b02b128 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 13:38:19 -0800
Subject: [PATCH 004/133] expose d3 to the view

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 861d8cb0b..555dbfd3f 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -11,6 +11,8 @@ class EditorStatsView extends ScrollView
     minute = date.getMinutes()
     "#{hour}:#{minute}"
 
+  d3 = require 'd3.v3'
+
   @activate: (rootView, state) ->
     @instance = new EditorStatsView(rootView, state?.eventLog)
 

From b065a67605075374d8bd1664c57b85231ff8a024 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 13:38:38 -0800
Subject: [PATCH 005/133] fat arrow detach

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 555dbfd3f..16c12bc6f 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -58,7 +58,7 @@ class EditorStatsView extends ScrollView
     @rootView.append @
     @focus()
 
-  detach: ->
+  detach: =>
     super()
     @rootView.focus()
 

From f6c9dc1b1c100194553ed594db0501d0c65c2a8c Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 13:38:57 -0800
Subject: [PATCH 006/133] append svg element

---
 .../editor-stats/src/editor-stats-view.coffee        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 16c12bc6f..a35de475e 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -39,6 +39,17 @@ class EditorStatsView extends ScrollView
     @rootView.on 'keyup', @track
     @rootView.on 'mousedown', @track
 
+  append: ->
+    w = @.width()
+    h = @.height()
+    [pt, pl, pb, pr] = [0,0,0,0]
+
+    d3.select(@.get(0)).append('svg')
+      .attr('width', w)
+      .attr('height', h)
+    .append('g')
+      .attr('transform', "translate(#{pl},#{pt})")
+
   track: =>
     date = new Date
     times = time date
@@ -57,6 +68,7 @@ class EditorStatsView extends ScrollView
   attach: ->
     @rootView.append @
     @focus()
+    @append()
 
   detach: =>
     super()

From 7b586d85f8cb75599cde3887f2f765792399f345 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 13:39:06 -0800
Subject: [PATCH 007/133] update drawing on every event

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index a35de475e..279392ec1 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -50,6 +50,12 @@ class EditorStatsView extends ScrollView
     .append('g')
       .attr('transform', "translate(#{pl},#{pt})")
 
+  draw: ->
+    w = @.width()
+    h = @.height()
+    [pt, pl, pb, pr] = [0,0,0,0]
+
+
   track: =>
     date = new Date
     times = time date
@@ -57,7 +63,7 @@ class EditorStatsView extends ScrollView
     @eventlog[times] += 1
 
     @eventlog.shift() if @eventlog.length > 60
-    console.log @eventlog
+    @draw()
 
   toggle: ->
     if @hasParent()

From 3cb4519230097ecd6393981506e57cea6a60ce1c Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 13:56:44 -0800
Subject: [PATCH 008/133] store x and y scales

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 ++
 src/packages/editor-stats/stylesheets/editor-stats.css | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 279392ec1..ab2f7abaf 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -12,6 +12,8 @@ class EditorStatsView extends ScrollView
     "#{hour}:#{minute}"
 
   d3 = require 'd3.v3'
+  x  = d3.scale.ordinal().domain d3.range(60)
+  y  = d3.scale.linear()
 
   @activate: (rootView, state) ->
     @instance = new EditorStatsView(rootView, state?.eventLog)
diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
index 827da6667..9e01e5b7a 100644
--- a/src/packages/editor-stats/stylesheets/editor-stats.css
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -1,6 +1,6 @@
 .editor-stats {
   position: absolute;
-  height: 200px;
+  height: 50px;
   width: 100%;
   bottom: 0;
   left: 0;

From 4b0a7a135d3aab2e83f6b5af5d9899c515e780ea Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 13:56:53 -0800
Subject: [PATCH 009/133] append the bars

---
 .../editor-stats/src/editor-stats-view.coffee   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index ab2f7abaf..283b0c0bc 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -57,6 +57,23 @@ class EditorStatsView extends ScrollView
     h = @.height()
     [pt, pl, pb, pr] = [0,0,0,0]
 
+    data = d3.entries @eventlog
+    max  = d3.max data, (d) -> d.value
+
+    x.rangeRoundBands [0, w - pl - pr], 0.1
+    y.domain([0, max]).range [h, 0]
+
+    vis = d3.select('svg g')
+
+    bars = vis.selectAll('g.bar')
+      .data(data)
+    .enter().append('g')
+      .attr('transform', (d, i) -> "translate(#{x(i)}, 0)")
+
+    bars.append('rect')
+      .attr('width', x.rangeBand())
+      .attr('height', (d, i) -> y(d.value))
+
 
   track: =>
     date = new Date

From e9ba5f8f8567ca31ad147e4c0c491be688c1bc08 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 14:57:47 -0800
Subject: [PATCH 010/133] update working smoothly

---
 .../editor-stats/src/editor-stats-view.coffee | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 283b0c0bc..cb8f59909 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -38,19 +38,8 @@ class EditorStatsView extends ScrollView
     while date <= future
       @eventlog[time(date)] = 0
 
-    @rootView.on 'keyup', @track
-    @rootView.on 'mousedown', @track
-
-  append: ->
-    w = @.width()
-    h = @.height()
-    [pt, pl, pb, pr] = [0,0,0,0]
-
-    d3.select(@.get(0)).append('svg')
-      .attr('width', w)
-      .attr('height', h)
-    .append('g')
-      .attr('transform', "translate(#{pl},#{pt})")
+    @rootView.on 'keydown', @track
+    @rootView.on 'mouseup', @track
 
   draw: ->
     w = @.width()
@@ -63,17 +52,32 @@ class EditorStatsView extends ScrollView
     x.rangeRoundBands [0, w - pl - pr], 0.1
     y.domain([0, max]).range [h, 0]
 
-    vis = d3.select('svg g')
+    vis = d3.select(@.get(0)).append('svg')
+      .attr('width', w)
+      .attr('height', h)
+    .append('g')
+      .attr('transform', "translate(#{pl},#{pt})")
 
-    bars = vis.selectAll('g.bar')
+    bars = vis.selectAll('rect.bar')
       .data(data)
-    .enter().append('g')
-      .attr('transform', (d, i) -> "translate(#{x(i)}, 0)")
-
-    bars.append('rect')
+    .enter().append('rect')
+      .attr('x', (d, i) => x i)
+      .attr('y', (d) -> y d.value)
+      .attr('height', (d) -> h - y(d.value))
       .attr('width', x.rangeBand())
-      .attr('height', (d, i) -> y(d.value))
 
+    update = =>
+      newdata = d3.entries @eventlog
+      max  = d3.max newdata, (d) -> d.value
+
+      x.rangeRoundBands [0, w - pl - pr], 0.1
+      y.domain([0, max]).range [h, 0]
+
+      bars.data(newdata).transition()
+        .attr('height', (d, i) ->  h - y(d.value))
+        .attr('y', (d, i) -> y(d.value))
+
+    setInterval update, 5000
 
   track: =>
     date = new Date
@@ -81,8 +85,7 @@ class EditorStatsView extends ScrollView
     @eventlog[times] ||= 0
     @eventlog[times] += 1
 
-    @eventlog.shift() if @eventlog.length > 60
-    @draw()
+    @eventlog.shift() if @eventlog.length > 59
 
   toggle: ->
     if @hasParent()
@@ -93,7 +96,7 @@ class EditorStatsView extends ScrollView
   attach: ->
     @rootView.append @
     @focus()
-    @append()
+    @draw()
 
   detach: =>
     super()

From 168f08611c63ee036313367a2d5bdf1d3b0419df Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 15:44:09 -0800
Subject: [PATCH 011/133] color dem bars

---
 src/packages/editor-stats/stylesheets/editor-stats.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
index 9e01e5b7a..d298ab9d9 100644
--- a/src/packages/editor-stats/stylesheets/editor-stats.css
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -6,4 +6,9 @@
   left: 0;
   z-index: 99;
   background: #1d1f21;
+  border-top: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+.editor-stats rect.bar {
+  fill: rgba(255, 255, 255, 0.1);
 }
\ No newline at end of file

From 57c9412d99d4cf16b66b9444d6cc67cbb6b71971 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 15:44:16 -0800
Subject: [PATCH 012/133] fix scales

---
 .../editor-stats/src/editor-stats-view.coffee | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index cb8f59909..66e47dcf5 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -5,6 +5,8 @@ _ = require 'underscore'
 
 module.exports =
 class EditorStatsView extends ScrollView
+  hours = 2
+
   time = (date) ->
     date.setTime(date.getTime() + 6e4)
     hour = date.getHours()
@@ -12,7 +14,7 @@ class EditorStatsView extends ScrollView
     "#{hour}:#{minute}"
 
   d3 = require 'd3.v3'
-  x  = d3.scale.ordinal().domain d3.range(60)
+  x  = d3.scale.ordinal().domain d3.range(hours * 60)
   y  = d3.scale.linear()
 
   @activate: (rootView, state) ->
@@ -32,25 +34,25 @@ class EditorStatsView extends ScrollView
     @command 'core:cancel', @detach
 
     date = new Date()
-    future = new Date(date.getTime() + 36e5)
+    future = new Date(date.getTime() + (36e5 * hours))
     @eventlog[time(date)] = 0
 
-    while date <= future
+    while date < future
       @eventlog[time(date)] = 0
 
+    console.log @eventlog
     @rootView.on 'keydown', @track
     @rootView.on 'mouseup', @track
 
   draw: ->
     w = @.width()
     h = @.height()
-    [pt, pl, pb, pr] = [0,0,0,0]
+    [pt, pl, pb, pr] = [5,0,0,0]
 
     data = d3.entries @eventlog
-    max  = d3.max data, (d) -> d.value
 
     x.rangeRoundBands [0, w - pl - pr], 0.1
-    y.domain([0, max]).range [h, 0]
+    y.range [h, 0]
 
     vis = d3.select(@.get(0)).append('svg')
       .attr('width', w)
@@ -61,17 +63,16 @@ class EditorStatsView extends ScrollView
     bars = vis.selectAll('rect.bar')
       .data(data)
     .enter().append('rect')
-      .attr('x', (d, i) => x i)
+      .attr('x', (d, i) -> console.log x(0); x(i))
       .attr('y', (d) -> y d.value)
-      .attr('height', (d) -> h - y(d.value))
       .attr('width', x.rangeBand())
+      .attr('class', 'bar')
 
     update = =>
       newdata = d3.entries @eventlog
       max  = d3.max newdata, (d) -> d.value
 
-      x.rangeRoundBands [0, w - pl - pr], 0.1
-      y.domain([0, max]).range [h, 0]
+      y.domain [0, max]
 
       bars.data(newdata).transition()
         .attr('height', (d, i) ->  h - y(d.value))
@@ -84,8 +85,7 @@ class EditorStatsView extends ScrollView
     times = time date
     @eventlog[times] ||= 0
     @eventlog[times] += 1
-
-    @eventlog.shift() if @eventlog.length > 59
+    @eventlog.shift() if @eventlog.length > (hours * 60)
 
   toggle: ->
     if @hasParent()

From aa5660ba81c451e27145462f1854c180b30e5783 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Tue, 29 Jan 2013 15:46:19 -0800
Subject: [PATCH 013/133] syntax yo

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 66e47dcf5..996968724 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -5,7 +5,7 @@ _ = require 'underscore'
 
 module.exports =
 class EditorStatsView extends ScrollView
-  hours = 2
+  hours = 6
 
   time = (date) ->
     date.setTime(date.getTime() + 6e4)
@@ -63,7 +63,7 @@ class EditorStatsView extends ScrollView
     bars = vis.selectAll('rect.bar')
       .data(data)
     .enter().append('rect')
-      .attr('x', (d, i) -> console.log x(0); x(i))
+      .attr('x', (d, i) -> x i)
       .attr('y', (d) -> y d.value)
       .attr('width', x.rangeBand())
       .attr('class', 'bar')
@@ -76,7 +76,7 @@ class EditorStatsView extends ScrollView
 
       bars.data(newdata).transition()
         .attr('height', (d, i) ->  h - y(d.value))
-        .attr('y', (d, i) -> y(d.value))
+        .attr('y', (d, i) -> y d.value)
 
     setInterval update, 5000
 

From 29b3a1d5828415a28a4d747dea345a409065ca91 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 09:00:16 -0800
Subject: [PATCH 014/133] add keymap for editor stats

---
 src/packages/editor-stats/keymaps/editor-stats.cson | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/packages/editor-stats/keymaps/editor-stats.cson

diff --git a/src/packages/editor-stats/keymaps/editor-stats.cson b/src/packages/editor-stats/keymaps/editor-stats.cson
new file mode 100644
index 000000000..1364f2098
--- /dev/null
+++ b/src/packages/editor-stats/keymaps/editor-stats.cson
@@ -0,0 +1,5 @@
+'body, .editor-stats':
+  'meta-alt-s': 'editor-stats:toggle'
+
+'.editor-stats':
+  'meta-alt-s': 'editor-stats:toggle'

From 0c878c5e7da508ce14f4298dec2ba913deaad041 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 09:00:40 -0800
Subject: [PATCH 015/133] put editor stats in the document flow so it doesn't
 overlap the status bar

---
 .../editor-stats/src/editor-stats-view.coffee | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 996968724..037c449b2 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -5,7 +5,7 @@ _ = require 'underscore'
 
 module.exports =
 class EditorStatsView extends ScrollView
-  hours = 6
+  hours = 2
 
   time = (date) ->
     date.setTime(date.getTime() + 6e4)
@@ -17,6 +17,9 @@ class EditorStatsView extends ScrollView
   x  = d3.scale.ordinal().domain d3.range(hours * 60)
   y  = d3.scale.linear()
 
+  xaxis = d3.svg.axis().scale(x)
+    .orient('top')
+
   @activate: (rootView, state) ->
     @instance = new EditorStatsView(rootView, state?.eventLog)
 
@@ -32,6 +35,7 @@ class EditorStatsView extends ScrollView
     super
 
     @command 'core:cancel', @detach
+    @statusBar = @rootView.find '.status-bar'
 
     date = new Date()
     future = new Date(date.getTime() + (36e5 * hours))
@@ -40,19 +44,19 @@ class EditorStatsView extends ScrollView
     while date < future
       @eventlog[time(date)] = 0
 
-    console.log @eventlog
     @rootView.on 'keydown', @track
     @rootView.on 'mouseup', @track
 
   draw: ->
-    w = @.width()
+    w = @statusBar.width()
     h = @.height()
-    [pt, pl, pb, pr] = [5,0,0,0]
+    [pt, pl, pb, pr] = [15,0,0,0]
 
     data = d3.entries @eventlog
 
-    x.rangeRoundBands [0, w - pl - pr], 0.1
+    x.rangeRoundBands [0, w - pl - pr], 0.2
     y.range [h, 0]
+    xaxis.tickSize(-h - pt - pb, 50)
 
     vis = d3.select(@.get(0)).append('svg')
       .attr('width', w)
@@ -60,6 +64,10 @@ class EditorStatsView extends ScrollView
     .append('g')
       .attr('transform', "translate(#{pl},#{pt})")
 
+    vis.append('g')
+      .attr('class', 'x axis')
+      .call(xaxis)
+
     bars = vis.selectAll('rect.bar')
       .data(data)
     .enter().append('rect')
@@ -94,7 +102,7 @@ class EditorStatsView extends ScrollView
       @attach()
 
   attach: ->
-    @rootView.append @
+    @.insertBefore @statusBar
     @focus()
     @draw()
 

From ebc7daf1dcc0d46ccf7dca3d398a1471ce5a7dd0 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 09:00:48 -0800
Subject: [PATCH 016/133] more styles

---
 .../editor-stats/stylesheets/editor-stats.css | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
index d298ab9d9..0644808bf 100644
--- a/src/packages/editor-stats/stylesheets/editor-stats.css
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -1,14 +1,27 @@
 .editor-stats {
-  position: absolute;
   height: 50px;
   width: 100%;
-  bottom: 0;
-  left: 0;
-  z-index: 99;
   background: #1d1f21;
   border-top: 1px solid rgba(255, 255, 255, 0.1);
 }
 
 .editor-stats rect.bar {
-  fill: rgba(255, 255, 255, 0.1);
+  fill: rgba(255, 255, 255, 0.2);
+  shape-rendering: crispedges;
+}
+
+.editor-stats text {
+  font-size: 10px;
+  fill: rgba(255, 255, 255, 0.2);
+}
+
+.editor-stats line {
+  stroke: #ccc;
+  stroke-opacity: 0.05;
+  stroke-width: 1px;
+  shape-rendering: crispedges;
+}
+
+.editor-stats path.domain {
+  fill: none;
 }
\ No newline at end of file

From 6080ba66e152ef4c7b910b03bf85aad55971c4e2 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 09:33:39 -0800
Subject: [PATCH 017/133] tweak x axis display

---
 .../editor-stats/src/editor-stats-view.coffee    | 16 ++++++++++++----
 .../editor-stats/stylesheets/editor-stats.css    |  5 +++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 037c449b2..61e671ec8 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -5,7 +5,7 @@ _ = require 'underscore'
 
 module.exports =
 class EditorStatsView extends ScrollView
-  hours = 2
+  hours = 4
 
   time = (date) ->
     date.setTime(date.getTime() + 6e4)
@@ -13,6 +13,7 @@ class EditorStatsView extends ScrollView
     minute = date.getMinutes()
     "#{hour}:#{minute}"
 
+  startDate = new Date
   d3 = require 'd3.v3'
   x  = d3.scale.ordinal().domain d3.range(hours * 60)
   y  = d3.scale.linear()
@@ -37,7 +38,7 @@ class EditorStatsView extends ScrollView
     @command 'core:cancel', @detach
     @statusBar = @rootView.find '.status-bar'
 
-    date = new Date()
+    date = new Date(startDate)
     future = new Date(date.getTime() + (36e5 * hours))
     @eventlog[time(date)] = 0
 
@@ -48,7 +49,7 @@ class EditorStatsView extends ScrollView
     @rootView.on 'mouseup', @track
 
   draw: ->
-    w = @statusBar.width()
+    w = @statusBar.outerWidth()
     h = @.height()
     [pt, pl, pb, pr] = [15,0,0,0]
 
@@ -56,7 +57,7 @@ class EditorStatsView extends ScrollView
 
     x.rangeRoundBands [0, w - pl - pr], 0.2
     y.range [h, 0]
-    xaxis.tickSize(-h - pt - pb, 50)
+    xaxis.tickSize(-h + pt + pb, 50)
 
     vis = d3.select(@.get(0)).append('svg')
       .attr('width', w)
@@ -67,6 +68,13 @@ class EditorStatsView extends ScrollView
     vis.append('g')
       .attr('class', 'x axis')
       .call(xaxis)
+    .selectAll('g')
+      .style('display', (d, i) ->
+        if i % 15 == 0 || i % 5 == 0
+          'block'
+        else
+          'none'
+      ).classed('minor', (d, i) -> i % 5 == 0 && i % 15 != 0)
 
     bars = vis.selectAll('rect.bar')
       .data(data)
diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
index 0644808bf..3e9ccdf97 100644
--- a/src/packages/editor-stats/stylesheets/editor-stats.css
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -13,6 +13,11 @@
 .editor-stats text {
   font-size: 10px;
   fill: rgba(255, 255, 255, 0.2);
+  font-family: Courier;
+}
+
+.editor-stats .minor text {
+  display: none;
 }
 
 .editor-stats line {

From 2abe3e47ded248b0fc6993876f8379b0e4bda48d Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 09:41:49 -0800
Subject: [PATCH 018/133] show actual time on scale

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 61e671ec8..ae008decd 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -20,6 +20,9 @@ class EditorStatsView extends ScrollView
 
   xaxis = d3.svg.axis().scale(x)
     .orient('top')
+    .tickFormat (d) ->
+      d = new Date(startDate.getTime() + (d * 6e4))
+      "#{d.getHours()}:#{d.getMinutes()}"
 
   @activate: (rootView, state) ->
     @instance = new EditorStatsView(rootView, state?.eventLog)

From bc61c3ca984956316625996bdc94268673390921 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 10:14:04 -0800
Subject: [PATCH 019/133] remove when detached

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 1 +
 src/packages/editor-stats/stylesheets/editor-stats.css | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index ae008decd..e558dfa68 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -119,6 +119,7 @@ class EditorStatsView extends ScrollView
 
   detach: =>
     super()
+    @.remove()
     @rootView.focus()
 
   serialize: ->
diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
index 3e9ccdf97..1368dcdb1 100644
--- a/src/packages/editor-stats/stylesheets/editor-stats.css
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -10,6 +10,10 @@
   shape-rendering: crispedges;
 }
 
+.editor-stats rect.bar.max {
+  fill: rgba(0, 163, 255, 1);
+}
+
 .editor-stats text {
   font-size: 10px;
   fill: rgba(255, 255, 255, 0.2);

From 1afb2fbeb571e813fe65082176fe11ca6d82e6e3 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 10:14:12 -0800
Subject: [PATCH 020/133] highlight the max minute

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index e558dfa68..13fbb1ad7 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -97,6 +97,8 @@ class EditorStatsView extends ScrollView
         .attr('height', (d, i) ->  h - y(d.value))
         .attr('y', (d, i) -> y d.value)
 
+      bars.classed('max', (d, i) -> d.value == max)
+
     setInterval update, 5000
 
   track: =>

From 164b50d795542f67a6b528ed8f059c3b0bddc6a7 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 10:14:26 -0800
Subject: [PATCH 021/133] zero pad minutes

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 13fbb1ad7..8dc2ae947 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -22,7 +22,9 @@ class EditorStatsView extends ScrollView
     .orient('top')
     .tickFormat (d) ->
       d = new Date(startDate.getTime() + (d * 6e4))
-      "#{d.getHours()}:#{d.getMinutes()}"
+      mins = d.getMinutes()
+      mins = "0#{mins}" if mins < 9
+      "#{d.getHours()}:#{mins}"
 
   @activate: (rootView, state) ->
     @instance = new EditorStatsView(rootView, state?.eventLog)

From 6c10622b2faa4ac2143d6b7ddedf6b544630824a Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 10:57:44 -0800
Subject: [PATCH 022/133] support escape key to exit command panel

---
 src/packages/command-panel/src/command-panel-view.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/packages/command-panel/src/command-panel-view.coffee b/src/packages/command-panel/src/command-panel-view.coffee
index 7ccb74a48..b297516df 100644
--- a/src/packages/command-panel/src/command-panel-view.coffee
+++ b/src/packages/command-panel/src/command-panel-view.coffee
@@ -44,6 +44,7 @@ class CommandPanelView extends View
 
     @command 'tool-panel:unfocus', => @rootView.focus()
     @command 'core:close', => @detach(); false
+    @command 'core:cancel', => @detach(); false
     @command 'core:confirm', => @execute()
     @command 'core:move-up', => @navigateBackwardInHistory()
     @command 'core:move-down', => @navigateForwardInHistory()

From 2d87a60019af9f086d4063acd82f512f4707003a Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 12:15:15 -0800
Subject: [PATCH 023/133] camelCase

---
 .../editor-stats/src/editor-stats-view.coffee    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 8dc2ae947..a5cd4053d 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -35,7 +35,7 @@ class EditorStatsView extends ScrollView
   @serialize: ->
     @instance.serialize()
 
-  eventlog: [],
+  eventLog: [],
 
   initialize: (@rootView, @eventLog = {}) ->
     super
@@ -45,10 +45,10 @@ class EditorStatsView extends ScrollView
 
     date = new Date(startDate)
     future = new Date(date.getTime() + (36e5 * hours))
-    @eventlog[time(date)] = 0
+    @eventLog[time(date)] = 0
 
     while date < future
-      @eventlog[time(date)] = 0
+      @eventLog[time(date)] = 0
 
     @rootView.on 'keydown', @track
     @rootView.on 'mouseup', @track
@@ -58,7 +58,7 @@ class EditorStatsView extends ScrollView
     h = @.height()
     [pt, pl, pb, pr] = [15,0,0,0]
 
-    data = d3.entries @eventlog
+    data = d3.entries @eventLog
 
     x.rangeRoundBands [0, w - pl - pr], 0.2
     y.range [h, 0]
@@ -90,7 +90,7 @@ class EditorStatsView extends ScrollView
       .attr('class', 'bar')
 
     update = =>
-      newdata = d3.entries @eventlog
+      newdata = d3.entries @eventLog
       max  = d3.max newdata, (d) -> d.value
 
       y.domain [0, max]
@@ -106,9 +106,9 @@ class EditorStatsView extends ScrollView
   track: =>
     date = new Date
     times = time date
-    @eventlog[times] ||= 0
-    @eventlog[times] += 1
-    @eventlog.shift() if @eventlog.length > (hours * 60)
+    @eventLog[times] ||= 0
+    @eventLog[times] += 1
+    @eventLog.shift() if @eventLog.length > (hours * 60)
 
   toggle: ->
     if @hasParent()

From c5b9c38311a9765f702142bf02e898d8456c4959 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 12:15:25 -0800
Subject: [PATCH 024/133] specs for editor stats

---
 .../spec/editor-stats-spec.coffee             | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 src/packages/editor-stats/spec/editor-stats-spec.coffee

diff --git a/src/packages/editor-stats/spec/editor-stats-spec.coffee b/src/packages/editor-stats/spec/editor-stats-spec.coffee
new file mode 100644
index 000000000..deba8fe9e
--- /dev/null
+++ b/src/packages/editor-stats/spec/editor-stats-spec.coffee
@@ -0,0 +1,46 @@
+$ = require 'jquery'
+RootView = require 'root-view'
+EditorStats = require 'editor-stats/src/editor-stats-view'
+
+fdescribe "EditorStats", ->
+  [rootView, editorStats, editor, date, time] = []
+
+  simulateKeyUp = (key) ->
+    e = $.Event "keydown", keyCode: key.charCodeAt(0)
+    rootView.trigger(e)
+
+  simulateClick = ->
+    e = $.Event "mouseup"
+    rootView.trigger(e)
+
+  beforeEach ->
+    rootView = new RootView(require.resolve('fixtures/sample.js'))
+
+    date = new Date()
+    mins = date.getMinutes()
+    hours = date.getHours()
+
+    mins = if mins == 60 then '01' else mins + 1
+    time  = "#{hours}:#{mins}"
+
+    atom.loadPackage('editor-stats').getInstance()
+    editor = rootView.getActiveEditor()
+    editorStats = EditorStats.instance
+
+  afterEach ->
+    rootView.deactivate()
+
+  describe "when a keyup event is triggered", ->
+    it "records the number of times a keyup is triggered", ->
+      simulateKeyUp('a')
+      expect(editorStats.eventLog[time]).toBe 1
+      simulateKeyUp('b')
+      expect(editorStats.eventLog[time]).toBe 2
+
+  describe "when a mouseup event is triggered", ->
+    it "records the number of times a mouseup is triggered", ->
+      simulateClick()
+      expect(editorStats.eventLog[time]).toBe 1
+      simulateClick()
+      expect(editorStats.eventLog[time]).toBe 2
+

From 1fa16c4ae125c3c1904cf8a7f23d78aecc837d16 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 13:56:35 -0800
Subject: [PATCH 025/133] refocus preview list after performing operation

Allows esc key to exit the command pallete
---
 src/packages/command-panel/src/command-panel-view.coffee | 1 -
 src/packages/command-panel/src/preview-list.coffee       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/packages/command-panel/src/command-panel-view.coffee b/src/packages/command-panel/src/command-panel-view.coffee
index b297516df..7ccb74a48 100644
--- a/src/packages/command-panel/src/command-panel-view.coffee
+++ b/src/packages/command-panel/src/command-panel-view.coffee
@@ -44,7 +44,6 @@ class CommandPanelView extends View
 
     @command 'tool-panel:unfocus', => @rootView.focus()
     @command 'core:close', => @detach(); false
-    @command 'core:cancel', => @detach(); false
     @command 'core:confirm', => @execute()
     @command 'core:move-up', => @navigateBackwardInHistory()
     @command 'core:move-down', => @navigateForwardInHistory()
diff --git a/src/packages/command-panel/src/preview-list.coffee b/src/packages/command-panel/src/preview-list.coffee
index 34cbd240c..a068da3e2 100644
--- a/src/packages/command-panel/src/preview-list.coffee
+++ b/src/packages/command-panel/src/preview-list.coffee
@@ -83,7 +83,7 @@ class PreviewList extends ScrollView
     editSession = @rootView.open(operation.getPath())
     bufferRange = operation.execute(editSession)
     editSession.setSelectedBufferRange(bufferRange, autoscroll: true) if bufferRange
-    @rootView.focus()
+    @.focus()
     false
 
   getPathCount: ->

From 79d569d55b5f635785032f9f44ab57b93cd76846 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 15:30:10 -0800
Subject: [PATCH 026/133] rename atom.coffee to user.coffee

---
 .atom/{atom.coffee => user.coffee} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .atom/{atom.coffee => user.coffee} (100%)

diff --git a/.atom/atom.coffee b/.atom/user.coffee
similarity index 100%
rename from .atom/atom.coffee
rename to .atom/user.coffee

From 0233b4a53eecff7bfe96aeb6cea2b914b178e230 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 15:30:18 -0800
Subject: [PATCH 027/133] add .atom/user.css file

---
 .atom/user.css | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .atom/user.css

diff --git a/.atom/user.css b/.atom/user.css
new file mode 100644
index 000000000..f53057581
--- /dev/null
+++ b/.atom/user.css
@@ -0,0 +1,8 @@
+// User styles
+.tree-view {
+
+}
+
+.editor {
+
+}
\ No newline at end of file

From 228c9ff5225467331053ee782bf3838592f20410 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 15:33:52 -0800
Subject: [PATCH 028/133] update readme to point to user.coffee instead of
 atom.coffee

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f6e23611e..04459faa3 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Requirements
 Atom is installed! Type `atom [path]` from the commmand line or find it in `/Applications/Atom.app`
 
 ## Your ~/.atom Directory
-A basic ~/.atom directory is installed when you run `rake install`. Take a look at ~/.atom/atom.coffee for more information.
+A basic ~/.atom directory is installed when you run `rake install`. Take a look at ~/.atom/user.coffee for more information.
 
 ## Basic Keyboard shortcuts
 Atom doesn't have much in the way of menus yet. Use these keyboard shortcuts to
@@ -53,7 +53,7 @@ Most default OS X keybindings also work.
 
 ## Init Script
 
-Atom will require `~/.atom/atom.coffee` whenever a window is opened or reloaded if it is present in your
+Atom will require `~/.atom/user.coffee` whenever a window is opened or reloaded if it is present in your
 home directory. This is a rudimentary jumping off point for your own customizations.
 
 ## Command Panel

From 389ecc0b4ae807bc94e7bd5072f40aefda7be249 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 15:34:26 -0800
Subject: [PATCH 029/133] copy over user.coffee in rake task

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index e6adbba94..bd693df3f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -80,7 +80,7 @@ task "create-dot-atom" do
 
   `rm -rf "#{DOT_ATOM_PATH}"`
   `mkdir "#{DOT_ATOM_PATH}"`
-  `cp "#{dot_atom_template_path}/atom.coffee" "#{DOT_ATOM_PATH}"`
+  `cp "#{dot_atom_template_path}/user.coffee" "#{DOT_ATOM_PATH}"`
   `cp "#{dot_atom_template_path}/packages" "#{DOT_ATOM_PATH}"`
   `cp -r "#{ATOM_SRC_PATH}/themes" "#{DOT_ATOM_PATH}"`
   `cp "#{ATOM_SRC_PATH}/vendor/themes/IR_Black.tmTheme" "#{DOT_ATOM_PATH}/themes"`

From 82f1fb44200f8f109d4adf057878ebe5f2e548b4 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 15:34:38 -0800
Subject: [PATCH 030/133] load user.coffee from .atom directory

---
 src/app/config.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/config.coffee b/src/app/config.coffee
index bf35eff63..26efbd674 100644
--- a/src/app/config.coffee
+++ b/src/app/config.coffee
@@ -4,7 +4,7 @@ EventEmitter = require 'event-emitter'
 
 configDirPath = fs.absolute("~/.atom")
 configJsonPath = fs.join(configDirPath, "config.json")
-userInitScriptPath = fs.join(configDirPath, "atom.coffee")
+userInitScriptPath = fs.join(configDirPath, "user.coffee")
 bundledPackagesDirPath = fs.join(resourcePath, "src/packages")
 bundledThemesDirPath = fs.join(resourcePath, "themes")
 vendoredPackagesDirPath = fs.join(resourcePath, "vendor/packages")

From 95d7c89ec52dab8cf677ff0bf46b0e3d7839b41b Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Wed, 30 Jan 2013 16:00:45 -0800
Subject: [PATCH 031/133] load styles from ~/.atom/user.css

---
 src/app/atom.coffee | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/app/atom.coffee b/src/app/atom.coffee
index 455382926..43c4d942d 100644
--- a/src/app/atom.coffee
+++ b/src/app/atom.coffee
@@ -7,6 +7,8 @@ LoadTextMatePackagesTask = require 'load-text-mate-packages-task'
 
 messageIdCounter = 1
 originalSendMessageToBrowserProcess = atom.sendMessageToBrowserProcess
+configDirPath = fs.absolute("~/.atom")
+userStylePath = fs.join(configDirPath, "user.css")
 
 _.extend atom,
   exitWhenDone: window.location.params.exitWhenDone
@@ -53,10 +55,15 @@ _.extend atom,
     themeNames = config.get("core.themes") ? ['Atom - Dark', 'IR_Black']
     themeNames = [themeNames] unless _.isArray(themeNames)
     @loadTheme(themeName) for themeName in themeNames
+    @loadUserStyles()
 
   loadTheme: (name) ->
     @loadedThemes.push Theme.load(name)
 
+  loadUserStyles: ->
+    if fs.exists(userStylePath)
+      applyStylesheet(userStylePath, fs.read(userStylePath), 'userTheme')
+
   getAtomThemeStylesheets: ->
     themeNames = config.get("core.themes") ? ['Atom - Dark', 'IR_Black']
     themeNames = [themeNames] unless _.isArray(themeNames)

From 7e030b09e7a7da933b6f4931e73a40ae619b6a17 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Wed, 30 Jan 2013 21:40:26 -0500
Subject: [PATCH 032/133] Adding a line-height to the editor.

---
 themes/Atom - Dark/editor.css  | 1 +
 themes/Atom - Light/editor.css | 1 +
 2 files changed, 2 insertions(+)

diff --git a/themes/Atom - Dark/editor.css b/themes/Atom - Dark/editor.css
index b2daa3586..533dca1b5 100644
--- a/themes/Atom - Dark/editor.css	
+++ b/themes/Atom - Dark/editor.css	
@@ -1,5 +1,6 @@
 .editor {
   font-family: Inconsolata, Monaco, Courier;
+  line-height: 1.3;
 }
 
 .editor.mini {
diff --git a/themes/Atom - Light/editor.css b/themes/Atom - Light/editor.css
index 26dec9cb1..ac4a98014 100644
--- a/themes/Atom - Light/editor.css	
+++ b/themes/Atom - Light/editor.css	
@@ -1,5 +1,6 @@
 .editor {
   font-family: Inconsolata, Monaco, Courier;
+  line-height: 1.3;
 }
 
 .editor.mini {

From 11c0637220472f8cadcaf0b0d7653a7ccaad0d71 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 10:19:41 -0500
Subject: [PATCH 033/133] Not adding a font family when the user doesn't have
 it set

---
 spec/app/editor-spec.coffee | 7 +++----
 src/app/editor.coffee       | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index 2cbc0cc34..2729be262 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -520,9 +520,8 @@ describe "Editor", ->
     beforeEach ->
       expect(editor.css('font-family')).not.toBe 'Courier'
 
-    it "sets the initial font family based on the value from config", ->
-      expect($("head style.font-family")).toExist()
-      expect($("head style.font-family").text()).toMatch "{font-family: #{config.get('editor.fontFamily')}}"
+    it "when there is no config in fontFamily don't set it", ->
+      expect($("head style.font-family")).not.toExist()
 
     describe "when the font family changes", ->
       it "updates the font family on new and existing editors", ->
@@ -544,7 +543,7 @@ describe "Editor", ->
 
         lineHeightBefore = editor.lineHeight
         charWidthBefore = editor.charWidth
-        config.set("editor.fontFamily", "Courier")
+        config.set("editor.fontFamily", "Inconsolata")
         editor.setCursorScreenPosition [5, 6]
         expect(editor.charWidth).not.toBe charWidthBefore
         expect(editor.getCursorView().position()).toEqual { top: 5 * editor.lineHeight, left: 6 * editor.charWidth }
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 2769b6cba..e9a197158 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -14,7 +14,6 @@ _ = require 'underscore'
 module.exports =
 class Editor extends View
   @configDefaults:
-    fontFamily: "Inconsolata, Monaco, Courier"
     fontSize: 20
     showInvisibles: false
     autosave: false
@@ -697,6 +696,7 @@ class Editor extends View
     parseInt(@css("font-size"))
 
   setFontFamily: (fontFamily) ->
+    return if fontFamily == undefined
     headTag = $("head")
     styleTag = headTag.find("style.font-family")
     if styleTag.length == 0

From 4f8181969ed873f134a07259d4448624a1ef7f9e Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 09:24:59 -0800
Subject: [PATCH 034/133] :lipstick:

---
 static/editor.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/static/editor.css b/static/editor.css
index 0b8cfb452..40c3d1b4e 100644
--- a/static/editor.css
+++ b/static/editor.css
@@ -56,7 +56,6 @@
   overflow-x: hidden;
 }
 
-
 .editor .underlayer, .editor .lines, .editor .overlayer {
   width: 100%;
   height: 100%;

From ef6e525674def664631bf58af6e3ceafd192ef8e Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 09:32:20 -0800
Subject: [PATCH 035/133] Use package instead of package's view in specs

Event logs are now stored on the package and passed
to the view when toggled.
---
 .../command-logger/spec/command-logger-spec.coffee       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/packages/command-logger/spec/command-logger-spec.coffee b/src/packages/command-logger/spec/command-logger-spec.coffee
index c01f24320..e2a06da2b 100644
--- a/src/packages/command-logger/spec/command-logger-spec.coffee
+++ b/src/packages/command-logger/spec/command-logger-spec.coffee
@@ -6,9 +6,8 @@ describe "CommandLogger", ->
 
   beforeEach ->
     rootView = new RootView(require.resolve('fixtures/sample.js'))
-    atom.loadPackage('command-logger').getInstance()
+    commandLogger = atom.loadPackage('command-logger')
     editor = rootView.getActiveEditor()
-    commandLogger = CommandLogger.instance
 
   afterEach ->
     rootView.deactivate()
@@ -44,9 +43,11 @@ describe "CommandLogger", ->
 
   describe "when an event is ignored", ->
     it "does not create a node for that event", ->
-      commandLogger.ignoredEvents.push 'editor:delete-line'
+      commandLoggerView = commandLogger.getInstance()
+      commandLoggerView.ignoredEvents.push 'editor:delete-line'
       editor.trigger 'editor:delete-line'
-      nodes = commandLogger.createNodes()
+      commandLoggerView.eventLog = commandLogger.eventLog
+      nodes = commandLoggerView.createNodes()
       for node in nodes
         continue unless node.name is 'Editor'
         for child in node.children

From e5bd097592aa7c5987d341ceb678f7b78c354e6b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 09:41:40 -0800
Subject: [PATCH 036/133] Use configDirPath exposed by global config object

---
 src/app/atom.coffee | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/app/atom.coffee b/src/app/atom.coffee
index 43c4d942d..4630eb6fc 100644
--- a/src/app/atom.coffee
+++ b/src/app/atom.coffee
@@ -7,8 +7,6 @@ LoadTextMatePackagesTask = require 'load-text-mate-packages-task'
 
 messageIdCounter = 1
 originalSendMessageToBrowserProcess = atom.sendMessageToBrowserProcess
-configDirPath = fs.absolute("~/.atom")
-userStylePath = fs.join(configDirPath, "user.css")
 
 _.extend atom,
   exitWhenDone: window.location.params.exitWhenDone
@@ -55,14 +53,15 @@ _.extend atom,
     themeNames = config.get("core.themes") ? ['Atom - Dark', 'IR_Black']
     themeNames = [themeNames] unless _.isArray(themeNames)
     @loadTheme(themeName) for themeName in themeNames
-    @loadUserStyles()
+    @loadUserStylesheet()
 
   loadTheme: (name) ->
     @loadedThemes.push Theme.load(name)
 
-  loadUserStyles: ->
-    if fs.exists(userStylePath)
-      applyStylesheet(userStylePath, fs.read(userStylePath), 'userTheme')
+  loadUserStylesheet: ->
+    userStylesheetPath = fs.join(config.configDirPath, 'user.css')
+    if fs.isFile(userStylesheetPath)
+      applyStylesheet(userStylesheetPath, fs.read(userStylesheetPath), 'userTheme')
 
   getAtomThemeStylesheets: ->
     themeNames = config.get("core.themes") ? ['Atom - Dark', 'IR_Black']

From 30103b66fcefd45ab6050983d5c61794558b3557 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Thu, 31 Jan 2013 10:18:25 -0800
Subject: [PATCH 037/133] move old atom.coffee to user.coffee on rake install
 if it exists

---
 Rakefile | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index bd693df3f..01db92806 100644
--- a/Rakefile
+++ b/Rakefile
@@ -76,11 +76,24 @@ task "create-dot-atom" do
 
   dot_atom_template_path = ATOM_SRC_PATH + "/.atom"
   replace_dot_atom = false
-  next if File.exists?(DOT_ATOM_PATH)
+
+  if File.exists?(DOT_ATOM_PATH)
+    user_config = "#{DOT_ATOM_PATH}/user.coffee"
+    old_user_config = "#{DOT_ATOM_PATH}/atom.coffee"
+
+    if File.exists?(old_user_config)
+      `mv #{old_user_config} #{user_config}`
+      puts "\033[32mRenamed #{old_user_config} to #{user_config}\033[0m"
+    end
+
+    next
+  end
 
   `rm -rf "#{DOT_ATOM_PATH}"`
   `mkdir "#{DOT_ATOM_PATH}"`
+
   `cp "#{dot_atom_template_path}/user.coffee" "#{DOT_ATOM_PATH}"`
+  `cp "#{dot_atom_template_path}/user.css" "#{DOT_ATOM_PATH}"`
   `cp "#{dot_atom_template_path}/packages" "#{DOT_ATOM_PATH}"`
   `cp -r "#{ATOM_SRC_PATH}/themes" "#{DOT_ATOM_PATH}"`
   `cp "#{ATOM_SRC_PATH}/vendor/themes/IR_Black.tmTheme" "#{DOT_ATOM_PATH}/themes"`

From 2982c5e51a304ca91f9efb8c12a0ffd895555ea7 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Thu, 31 Jan 2013 10:22:36 -0800
Subject: [PATCH 038/133] need -r when copying packages directory

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 01db92806..2a14471ac 100644
--- a/Rakefile
+++ b/Rakefile
@@ -94,7 +94,7 @@ task "create-dot-atom" do
 
   `cp "#{dot_atom_template_path}/user.coffee" "#{DOT_ATOM_PATH}"`
   `cp "#{dot_atom_template_path}/user.css" "#{DOT_ATOM_PATH}"`
-  `cp "#{dot_atom_template_path}/packages" "#{DOT_ATOM_PATH}"`
+  `cp -r "#{dot_atom_template_path}/packages" "#{DOT_ATOM_PATH}"`
   `cp -r "#{ATOM_SRC_PATH}/themes" "#{DOT_ATOM_PATH}"`
   `cp "#{ATOM_SRC_PATH}/vendor/themes/IR_Black.tmTheme" "#{DOT_ATOM_PATH}/themes"`
 end

From 8f030cd97e9ff83519b3692c3bb4150c31721910 Mon Sep 17 00:00:00 2001
From: Corey Johnson & Kevin Sawicki <cj+kevin@github.com>
Date: Thu, 31 Jan 2013 10:31:13 -0800
Subject: [PATCH 039/133] Always calculate dimensions with editor on DOM

Closes #206
---
 spec/app/editor-spec.coffee         | 18 ++++++++++++++++++
 src/app/editor.coffee               |  6 ++++++
 src/stdlib/jquery-extensions.coffee |  3 +++
 3 files changed, 27 insertions(+)

diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index 2729be262..dee1224d0 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -552,6 +552,7 @@ describe "Editor", ->
   describe "font size", ->
     beforeEach ->
       expect(editor.css('font-size')).not.toBe "20px"
+      expect(editor.css('font-size')).not.toBe "10px"
 
     it "sets the initial font size based on the value from config", ->
       expect($("head style.font-size")).toExist()
@@ -614,6 +615,23 @@ describe "Editor", ->
         config.set("editor.fontSize", 10)
         expect(editor.renderedLines.find(".line").length).toBeGreaterThan originalLineCount
 
+      describe "when the editor is detached", ->
+        it "updates the font-size correctly and recalculates the dimensions by placing the rendered lines on the DOM", ->
+          rootView.attachToDom()
+          rootView.height(200)
+          rootView.width(200)
+
+          newEditor = editor.splitRight()
+          newEditorParent = newEditor.parent()
+          newEditor.detach()
+          config.set("editor.fontSize", 10)
+          newEditorParent.append(newEditor)
+
+          expect(newEditor.lineHeight).toBe editor.lineHeight
+          expect(newEditor.charWidth).toBe editor.charWidth
+          expect(newEditor.getCursorView().position()).toEqual editor.getCursorView().position()
+          expect(newEditor.verticalScrollbarContent.height()).toBe editor.verticalScrollbarContent.height()
+
   describe "mouse events", ->
     beforeEach ->
       editor.attachToDom()
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index e9a197158..01b8ac40f 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -804,6 +804,10 @@ class Editor extends View
     @overlayer.append(view)
 
   calculateDimensions: ->
+    if not @isOnDom()
+      detachedEditorParent = _.last(@parents()) ? this
+      $(document.body).append(detachedEditorParent)
+
     fragment = $('<pre class="line" style="position: absolute; visibility: hidden;"><span>x</span></div>')
     @renderedLines.append(fragment)
 
@@ -815,6 +819,8 @@ class Editor extends View
     @height(@lineHeight) if @mini
     fragment.remove()
 
+    $(detachedEditorParent).detach()
+
   updateLayerDimensions: ->
     @gutter.calculateWidth()
 
diff --git a/src/stdlib/jquery-extensions.coffee b/src/stdlib/jquery-extensions.coffee
index 365c2b5a8..089363577 100644
--- a/src/stdlib/jquery-extensions.coffee
+++ b/src/stdlib/jquery-extensions.coffee
@@ -25,6 +25,9 @@ $.fn.pageUp = ->
 $.fn.pageDown = ->
   @scrollTop(@scrollTop() + @height())
 
+$.fn.isOnDom = ->
+  @closest(document.body).length is 1
+
 $.fn.containsElement = (element) ->
   (element[0].compareDocumentPosition(this[0]) & 8) == 8
 

From 6bddebede3cb24da0449e11910bd18a482861401 Mon Sep 17 00:00:00 2001
From: Corey Johnson & Kevin Sawicki <cj+kevin@github.com>
Date: Thu, 31 Jan 2013 10:56:08 -0800
Subject: [PATCH 040/133] Show folding icon in gutter instead of end of line

Closes #211
---
 themes/Atom - Dark/editor.css  | 17 +++++++++--------
 themes/Atom - Light/editor.css | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/themes/Atom - Dark/editor.css b/themes/Atom - Dark/editor.css
index 533dca1b5..e80ff930a 100644
--- a/themes/Atom - Dark/editor.css	
+++ b/themes/Atom - Dark/editor.css	
@@ -18,7 +18,7 @@
 }
 
 .editor .gutter .line-number {
-  padding-right: 1.3em;
+  padding-right: .5em;
   min-width: 35px;
   box-sizing: border-box;
   text-align: right;
@@ -53,16 +53,17 @@
   opacity: 1;
 }
 
-.editor .fold-marker:before {
-  content: '\f060';
-  -webkit-transform: rotate(90deg);
+.editor .gutter .line-number:after {
+  font-size: 0.8em;
+  content: '\f078';
   font-family: 'Octicons Regular';
-  display: inline-block;
-  margin-left: .3em;
-  margin-top: .1em;
-  line-height: .8em;
   -webkit-font-smoothing: antialiased;
   color: #fba0e3;
+  visibility: hidden;
+}
+
+.editor .gutter .line-number.fold:after {
+  visibility: visible;
 }
 
 .editor .invisible {
diff --git a/themes/Atom - Light/editor.css b/themes/Atom - Light/editor.css
index ac4a98014..7a58eacfd 100644
--- a/themes/Atom - Light/editor.css	
+++ b/themes/Atom - Light/editor.css	
@@ -21,7 +21,7 @@
 }
 
 .editor .gutter .line-number {
-  padding-right: 1.3em;
+  padding-right: .5em;
   min-width: 35px;
   box-sizing: border-box;
   text-align: right;
@@ -56,16 +56,17 @@
   opacity: 1;
 }
 
-.editor .fold-marker:before {
-  content: '\f060';
-  -webkit-transform: rotate(90deg);
+.editor .gutter .line-number:after {
+  font-size: 0.8em;
+  content: '\f078';
   font-family: 'Octicons Regular';
-  display: inline-block;
-  margin-left: .3em;
-  margin-top: .1em;
-  line-height: .8em;
   -webkit-font-smoothing: antialiased;
   color: #fba0e3;
+  visibility: hidden;
+}
+
+.editor .gutter .line-number.fold:after {
+  visibility: visible;
 }
 
 .editor .invisible {

From e24859cc23b1c766958f4d24493ecce1f2abad39 Mon Sep 17 00:00:00 2001
From: Corey Johnson & Kevin Sawicki <cj+kevin@github.com>
Date: Thu, 31 Jan 2013 11:03:20 -0800
Subject: [PATCH 041/133] :lipstick:

---
 src/packages/command-panel/src/preview-list.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/command-panel/src/preview-list.coffee b/src/packages/command-panel/src/preview-list.coffee
index a068da3e2..cb0296d46 100644
--- a/src/packages/command-panel/src/preview-list.coffee
+++ b/src/packages/command-panel/src/preview-list.coffee
@@ -83,7 +83,7 @@ class PreviewList extends ScrollView
     editSession = @rootView.open(operation.getPath())
     bufferRange = operation.execute(editSession)
     editSession.setSelectedBufferRange(bufferRange, autoscroll: true) if bufferRange
-    @.focus()
+    @focus()
     false
 
   getPathCount: ->

From 379a4a4d8d8d8bcbc529c92509f05d3347440fb4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 12:01:02 -0800
Subject: [PATCH 042/133] Only auto-load .cson and .json keymap files

This now prevents files such as .DS_Store from being loaded as a
keymap where previously all paths were loaded regardless of extension.

Closes #205
---
 spec/app/atom-spec.coffee                           |  5 ++++-
 .../package-with-module/keymaps/keymap-3.cjson      |  2 ++
 spec/stdlib/fs-spec.coffee                          |  5 +++++
 src/app/atom-package.coffee                         |  9 +++------
 src/app/keymap.coffee                               |  2 +-
 src/stdlib/fs.coffee                                | 13 +++++++++----
 6 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 spec/fixtures/packages/package-with-module/keymaps/keymap-3.cjson

diff --git a/spec/app/atom-spec.coffee b/spec/app/atom-spec.coffee
index a02c84d97..73474a2a1 100644
--- a/spec/app/atom-spec.coffee
+++ b/spec/app/atom-spec.coffee
@@ -26,17 +26,20 @@ describe "the `atom` global", ->
 
     describe "keymap loading", ->
       describe "when package.json does not contain a 'keymaps' manifest", ->
-        it "loads all keymaps in the directory", ->
+        it "loads all the .cson/.json files in the keymaps directory", ->
           element1 = $$ -> @div class: 'test-1'
           element2 = $$ -> @div class: 'test-2'
+          element3 = $$ -> @div class: 'test-3'
 
           expect(keymap.bindingsForElement(element1)['ctrl-z']).toBeUndefined()
           expect(keymap.bindingsForElement(element2)['ctrl-z']).toBeUndefined()
+          expect(keymap.bindingsForElement(element3)['ctrl-z']).toBeUndefined()
 
           atom.loadPackage("package-with-module")
 
           expect(keymap.bindingsForElement(element1)['ctrl-z']).toBe "test-1"
           expect(keymap.bindingsForElement(element2)['ctrl-z']).toBe "test-2"
+          expect(keymap.bindingsForElement(element3)['ctrl-z']).toBeUndefined()
 
       describe "when package.json contains a 'keymaps' manifest", ->
         it "loads only the keymaps specified by the manifest, in the specified order", ->
diff --git a/spec/fixtures/packages/package-with-module/keymaps/keymap-3.cjson b/spec/fixtures/packages/package-with-module/keymaps/keymap-3.cjson
new file mode 100644
index 000000000..3c95c85a5
--- /dev/null
+++ b/spec/fixtures/packages/package-with-module/keymaps/keymap-3.cjson
@@ -0,0 +1,2 @@
+".test-3":
+  "ctrl-z": "test-3"
diff --git a/spec/stdlib/fs-spec.coffee b/spec/stdlib/fs-spec.coffee
index ffcdaf31b..b0a6fae5f 100644
--- a/spec/stdlib/fs-spec.coffee
+++ b/spec/stdlib/fs-spec.coffee
@@ -128,3 +128,8 @@ describe "fs", ->
   describe ".md5ForPath(path)", ->
     it "returns the MD5 hash of the file at the given path", ->
       expect(fs.md5ForPath(require.resolve('fixtures/sample.js'))).toBe 'dd38087d0d7e3e4802a6d3f9b9745f2b'
+
+  describe ".list(path, extensions)", ->
+    it "returns the paths with the specified extensions", ->
+      path = require.resolve('fixtures/css.css')
+      expect(fs.list(require.resolve('fixtures'), ['.css'])).toEqual [path]
diff --git a/src/app/atom-package.coffee b/src/app/atom-package.coffee
index bb1ce071b..15a4e465a 100644
--- a/src/app/atom-package.coffee
+++ b/src/app/atom-package.coffee
@@ -26,15 +26,12 @@ class AtomPackage extends Package
       @metadata = fs.readObject(metadataPath)
 
   loadKeymaps: ->
-    for keymapPath in @getKeymapPaths()
-      keymap.load(keymapPath)
-
-  getKeymapPaths: ->
     if keymaps = @metadata?.keymaps
-      keymaps.map (relativePath) =>
+      keymaps = keymaps.map (relativePath) =>
         fs.resolve(@keymapsDirPath, relativePath, ['cson', 'json', ''])
+      keymap.load(keymapPath) for keymapPath in keymaps
     else
-      fs.list(@keymapsDirPath)
+      keymap.loadDirectory(@keymapsDirPath)
 
   loadStylesheets: ->
     for stylesheetPath in @getStylesheetPaths()
diff --git a/src/app/keymap.coffee b/src/app/keymap.coffee
index 1918a429d..97cf4303b 100644
--- a/src/app/keymap.coffee
+++ b/src/app/keymap.coffee
@@ -35,7 +35,7 @@ class Keymap
     @loadDirectory(fs.join(config.configDirPath, 'keymaps'))
 
   loadDirectory: (directoryPath) ->
-    @load(filePath) for filePath in fs.list(directoryPath)
+    @load(filePath) for filePath in fs.list(directoryPath, ['.cson', '.json'])
 
   load: (path) ->
     @add(fs.readObject(path))
diff --git a/src/stdlib/fs.coffee b/src/stdlib/fs.coffee
index a9eb755da..fcf8904a9 100644
--- a/src/stdlib/fs.coffee
+++ b/src/stdlib/fs.coffee
@@ -59,11 +59,16 @@ module.exports =
 
   # Returns an array with all the names of files contained
   # in the directory path.
-  list: (rootPath) ->
+  list: (rootPath, extensions) ->
     paths = []
-    onPath = (path) =>
-      paths.push(@join(rootPath, path))
-      false
+    if extensions
+      onPath = (path) =>
+        paths.push(@join(rootPath, path)) if _.contains(extensions, @extension(path))
+        false
+    else
+      onPath = (path) =>
+        paths.push(@join(rootPath, path))
+        false
     @traverseTree(rootPath, onPath, onPath)
     paths
 

From a0f06e09d69dec752c236aa9e89463fdbbb97be3 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Thu, 31 Jan 2013 11:13:13 -0800
Subject: [PATCH 043/133] fix command panel specs that I broke

We're now refocusing the preview list instead of the editor
---
 .../command-panel/spec/command-panel-spec.coffee     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/packages/command-panel/spec/command-panel-spec.coffee b/src/packages/command-panel/spec/command-panel-spec.coffee
index 635613912..a63ae410b 100644
--- a/src/packages/command-panel/spec/command-panel-spec.coffee
+++ b/src/packages/command-panel/spec/command-panel-spec.coffee
@@ -438,13 +438,13 @@ describe "CommandPanel", ->
         expect(previewList.getSelectedOperation()).toBe previewList.getOperations()[0]
 
     describe "when core:confirm is triggered on the preview list", ->
-      it "opens the operation's buffer, selects and scrolls to the search result, and focuses the active editor", ->
+      it "opens the operation's buffer, selects and scrolls to the search result, and refocuses the preview list", ->
         rootView.height(200)
         rootView.attachToDom()
 
         waitsForPromise -> commandPanel.execute('X x/apply/') # use apply because it is at the end of the file
         runs ->
-          spyOn(rootView, 'focus')
+          spyOn(previewList, 'focus')
           executeHandler = jasmine.createSpy('executeHandler')
           commandPanel.on 'core:confirm', executeHandler
 
@@ -458,13 +458,13 @@ describe "CommandPanel", ->
           expect(editSession.getSelectedBufferRange()).toEqual operation.getBufferRange()
           expect(editSession.getSelectedBufferRange()).toEqual operation.getBufferRange()
           expect(editor.isScreenRowVisible(editor.getCursorScreenRow())).toBeTruthy()
-          expect(rootView.focus).toHaveBeenCalled()
+          expect(previewList.focus).toHaveBeenCalled()
 
           expect(executeHandler).not.toHaveBeenCalled()
 
     describe "when an operation in the preview list is clicked", ->
-      it "opens the operation's buffer, selects the search result, and focuses the active editor", ->
-        spyOn(rootView, 'focus')
+      it "opens the operation's buffer, selects the search result, and refocuses the preview list", ->
+        spyOn(previewList, 'focus')
         operation = previewList.getOperations()[4]
 
         previewList.find('li.operation:eq(4) span').mousedown()
@@ -473,4 +473,4 @@ describe "CommandPanel", ->
         editSession = rootView.getActiveEditSession()
         expect(editSession.buffer.getPath()).toBe project.resolve(operation.getPath())
         expect(editSession.getSelectedBufferRange()).toEqual operation.getBufferRange()
-        expect(rootView.focus).toHaveBeenCalled()
+        expect(previewList.focus).toHaveBeenCalled()

From 793bb44bb2864c3e75492ca21075d0342e49c3d5 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Thu, 31 Jan 2013 12:51:36 -0800
Subject: [PATCH 044/133] copy over the .atom template directory instead of
 individual files

---
 Rakefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index 2a14471ac..ad33f5a86 100644
--- a/Rakefile
+++ b/Rakefile
@@ -90,13 +90,7 @@ task "create-dot-atom" do
   end
 
   `rm -rf "#{DOT_ATOM_PATH}"`
-  `mkdir "#{DOT_ATOM_PATH}"`
-
-  `cp "#{dot_atom_template_path}/user.coffee" "#{DOT_ATOM_PATH}"`
-  `cp "#{dot_atom_template_path}/user.css" "#{DOT_ATOM_PATH}"`
-  `cp -r "#{dot_atom_template_path}/packages" "#{DOT_ATOM_PATH}"`
-  `cp -r "#{ATOM_SRC_PATH}/themes" "#{DOT_ATOM_PATH}"`
-  `cp "#{ATOM_SRC_PATH}/vendor/themes/IR_Black.tmTheme" "#{DOT_ATOM_PATH}/themes"`
+  `cp -r #{dot_atom_template_path} #{DOT_ATOM_PATH}`
 end
 
 desc "Clone default bundles into vendor/bundles directory"

From 4cd220012197dcacc7a41f9c2c5d78f8151b88f9 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Thu, 31 Jan 2013 12:52:02 -0800
Subject: [PATCH 045/133] create a default config.json file with sane defaults

---
 .atom/config.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .atom/config.json

diff --git a/.atom/config.json b/.atom/config.json
new file mode 100644
index 000000000..3f2c5de32
--- /dev/null
+++ b/.atom/config.json
@@ -0,0 +1,11 @@
+{
+  "editor": {
+
+  },
+  "core": {
+    "themes": [
+      "Atom - Dark",
+      "IR_Black"
+    ]
+  }
+}
\ No newline at end of file

From a57ac08238b5b567c37c63d34b095ef56c1b6b0f Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Thu, 31 Jan 2013 12:58:38 -0800
Subject: [PATCH 046/133] make the default font size 12px

---
 .atom/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.atom/config.json b/.atom/config.json
index 3f2c5de32..89e425883 100644
--- a/.atom/config.json
+++ b/.atom/config.json
@@ -1,6 +1,6 @@
 {
   "editor": {
-
+    "fontSize": 12
   },
   "core": {
     "themes": [

From 6be772d617a2c03fc613cf31a5d0083fee5f178a Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Thu, 31 Jan 2013 12:58:52 -0800
Subject: [PATCH 047/133] add themes directory to .atom template

---
 .atom/themes/Readme.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .atom/themes/Readme.md

diff --git a/.atom/themes/Readme.md b/.atom/themes/Readme.md
new file mode 100644
index 000000000..e69de29bb

From 9a73665811f8493f54922f356e18b6fef02bad3f Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 13:21:06 -0800
Subject: [PATCH 048/133] Add ellipsis at end of folded line

---
 themes/Atom - Dark/editor.css  | 11 +++++++++++
 themes/Atom - Light/editor.css | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/themes/Atom - Dark/editor.css b/themes/Atom - Dark/editor.css
index e80ff930a..9dfb302ac 100644
--- a/themes/Atom - Dark/editor.css	
+++ b/themes/Atom - Dark/editor.css	
@@ -66,6 +66,17 @@
   visibility: visible;
 }
 
+.editor .fold-marker:after {
+  content: '\2026';
+  opacity: .8;
+  color: #fba0e3;
+  padding-left: .2em;
+}
+
+.editor .line.cursor-line .fold-marker {
+  opacity: 1;
+}
+
 .editor .invisible {
   opacity: 0.2;
 }
diff --git a/themes/Atom - Light/editor.css b/themes/Atom - Light/editor.css
index 7a58eacfd..3a3652b0b 100644
--- a/themes/Atom - Light/editor.css	
+++ b/themes/Atom - Light/editor.css	
@@ -69,6 +69,17 @@
   visibility: visible;
 }
 
+.editor .fold-marker:after {
+  content: '\2026';
+  opacity: .8;
+  color: #fba0e3;
+  padding-left: .2em;
+}
+
+.editor .line.cursor-line .fold-marker {
+  opacity: 1;
+}
+
 .editor .invisible {
   opacity: 0.2;
 }

From 08cac2bbe0b484a12408a79f996a90d1926f7923 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 13:36:52 -0800
Subject: [PATCH 049/133] :lipstick:

---
 src/packages/editor-stats/spec/editor-stats-spec.coffee | 1 -
 src/packages/editor-stats/src/editor-stats-view.coffee  | 2 +-
 src/packages/editor-stats/stylesheets/editor-stats.css  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/packages/editor-stats/spec/editor-stats-spec.coffee b/src/packages/editor-stats/spec/editor-stats-spec.coffee
index deba8fe9e..bb63c91cc 100644
--- a/src/packages/editor-stats/spec/editor-stats-spec.coffee
+++ b/src/packages/editor-stats/spec/editor-stats-spec.coffee
@@ -43,4 +43,3 @@ fdescribe "EditorStats", ->
       expect(editorStats.eventLog[time]).toBe 1
       simulateClick()
       expect(editorStats.eventLog[time]).toBe 2
-
diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index a5cd4053d..394a654d3 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -127,4 +127,4 @@ class EditorStatsView extends ScrollView
     @rootView.focus()
 
   serialize: ->
-    eventLog: @eventLog
\ No newline at end of file
+    eventLog: @eventLog
diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
index 1368dcdb1..25a3cc08b 100644
--- a/src/packages/editor-stats/stylesheets/editor-stats.css
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -33,4 +33,4 @@
 
 .editor-stats path.domain {
   fill: none;
-}
\ No newline at end of file
+}

From 2b61883d9b830e10a579e569e9771d1cc257e9ab Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 13:37:30 -0800
Subject: [PATCH 050/133] un-f editor stats spec

---
 src/packages/editor-stats/spec/editor-stats-spec.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/spec/editor-stats-spec.coffee b/src/packages/editor-stats/spec/editor-stats-spec.coffee
index bb63c91cc..b330f0073 100644
--- a/src/packages/editor-stats/spec/editor-stats-spec.coffee
+++ b/src/packages/editor-stats/spec/editor-stats-spec.coffee
@@ -2,7 +2,7 @@ $ = require 'jquery'
 RootView = require 'root-view'
 EditorStats = require 'editor-stats/src/editor-stats-view'
 
-fdescribe "EditorStats", ->
+describe "EditorStats", ->
   [rootView, editorStats, editor, date, time] = []
 
   simulateKeyUp = (key) ->

From 9f3f0fe397c7dc86732e9dd6f6f1f82977f1d1d2 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 13:45:41 -0800
Subject: [PATCH 051/133] Don't focus stats when attaching

Leave the editor with focus since the stats aren't interactive
---
 src/packages/editor-stats/src/editor-stats-view.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 394a654d3..afe49372d 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -118,7 +118,6 @@ class EditorStatsView extends ScrollView
 
   attach: ->
     @.insertBefore @statusBar
-    @focus()
     @draw()
 
   detach: =>

From 30e8eee9cecef5d836ca66ef0b1b941f4b7b8bd8 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 13:49:14 -0800
Subject: [PATCH 052/133] Move d3 require to top

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index afe49372d..5df176834 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -2,6 +2,7 @@
 ScrollView = require 'scroll-view'
 $ = require 'jquery'
 _ = require 'underscore'
+d3 = require 'd3.v3'
 
 module.exports =
 class EditorStatsView extends ScrollView
@@ -14,7 +15,6 @@ class EditorStatsView extends ScrollView
     "#{hour}:#{minute}"
 
   startDate = new Date
-  d3 = require 'd3.v3'
   x  = d3.scale.ordinal().domain d3.range(hours * 60)
   y  = d3.scale.linear()
 

From 517d4cfe3ae205892e3fcd07cefa413dc0ee0eb5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 13:50:47 -0800
Subject: [PATCH 053/133] Remove unused requires

---
 src/packages/editor-stats/spec/editor-stats-spec.coffee | 2 +-
 src/packages/editor-stats/src/editor-stats-view.coffee  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/packages/editor-stats/spec/editor-stats-spec.coffee b/src/packages/editor-stats/spec/editor-stats-spec.coffee
index b330f0073..bb63c91cc 100644
--- a/src/packages/editor-stats/spec/editor-stats-spec.coffee
+++ b/src/packages/editor-stats/spec/editor-stats-spec.coffee
@@ -2,7 +2,7 @@ $ = require 'jquery'
 RootView = require 'root-view'
 EditorStats = require 'editor-stats/src/editor-stats-view'
 
-describe "EditorStats", ->
+fdescribe "EditorStats", ->
   [rootView, editorStats, editor, date, time] = []
 
   simulateKeyUp = (key) ->
diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 5df176834..4e738c7f3 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -1,7 +1,4 @@
-{$$$} = require 'space-pen'
 ScrollView = require 'scroll-view'
-$ = require 'jquery'
-_ = require 'underscore'
 d3 = require 'd3.v3'
 
 module.exports =

From 20249b4d38a3211f0c3cf2d320db37129b292e96 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 14:06:16 -0800
Subject: [PATCH 054/133] un-f editor stats spec again

---
 src/packages/editor-stats/spec/editor-stats-spec.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/spec/editor-stats-spec.coffee b/src/packages/editor-stats/spec/editor-stats-spec.coffee
index bb63c91cc..b330f0073 100644
--- a/src/packages/editor-stats/spec/editor-stats-spec.coffee
+++ b/src/packages/editor-stats/spec/editor-stats-spec.coffee
@@ -2,7 +2,7 @@ $ = require 'jquery'
 RootView = require 'root-view'
 EditorStats = require 'editor-stats/src/editor-stats-view'
 
-fdescribe "EditorStats", ->
+describe "EditorStats", ->
   [rootView, editorStats, editor, date, time] = []
 
   simulateKeyUp = (key) ->

From 4433f443d4f674561ce96e946d4be3a317b79d76 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 14:06:46 -0800
Subject: [PATCH 055/133] Simplify stats keymap

---
 src/packages/editor-stats/keymaps/editor-stats.cson | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/packages/editor-stats/keymaps/editor-stats.cson b/src/packages/editor-stats/keymaps/editor-stats.cson
index 1364f2098..819b7c04f 100644
--- a/src/packages/editor-stats/keymaps/editor-stats.cson
+++ b/src/packages/editor-stats/keymaps/editor-stats.cson
@@ -1,5 +1,2 @@
-'body, .editor-stats':
-  'meta-alt-s': 'editor-stats:toggle'
-
-'.editor-stats':
+'body':
   'meta-alt-s': 'editor-stats:toggle'

From 6b3a953384ad07c08410f58bfbdafb4640daa254 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 14:16:58 -0800
Subject: [PATCH 056/133] Close command logger when it loses focus

---
 src/packages/command-logger/src/command-logger-view.coffee | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/packages/command-logger/src/command-logger-view.coffee b/src/packages/command-logger/src/command-logger-view.coffee
index 4a5f89df5..ce8c8dbbb 100644
--- a/src/packages/command-logger/src/command-logger-view.coffee
+++ b/src/packages/command-logger/src/command-logger-view.coffee
@@ -34,6 +34,7 @@ class CommandLoggerView extends ScrollView
     super
 
     @command 'core:cancel', => @detach()
+    @on 'blur', => @detach() unless document.activeElement is this[0]
 
   toggle: (@eventLog={}) ->
     if @hasParent()
@@ -180,8 +181,11 @@ class CommandLoggerView extends ScrollView
     @focus()
 
   detach: ->
-    super()
+    return if @detaching
+    @detaching = true
+    super
     @rootView.focus()
+    @detaching = false
 
   serialize: ->
     eventLog: @eventLog

From 7f86bf1351a40981c5a9577062f7634704968841 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 14:19:20 -0800
Subject: [PATCH 057/133] Remove unneeded remove call

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 4e738c7f3..8e13c20f0 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -118,8 +118,7 @@ class EditorStatsView extends ScrollView
     @draw()
 
   detach: =>
-    super()
-    @.remove()
+    super
     @rootView.focus()
 
   serialize: ->

From de09adc45f4c13f4f5249ed4c2a2e6b43acd2395 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 31 Jan 2013 14:24:02 -0800
Subject: [PATCH 058/133] :lipstick:

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 8e13c20f0..ac052875b 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -32,7 +32,7 @@ class EditorStatsView extends ScrollView
   @serialize: ->
     @instance.serialize()
 
-  eventLog: [],
+  eventLog: []
 
   initialize: (@rootView, @eventLog = {}) ->
     super
@@ -117,7 +117,7 @@ class EditorStatsView extends ScrollView
     @.insertBefore @statusBar
     @draw()
 
-  detach: =>
+  detach: ->
     super
     @rootView.focus()
 

From 30c7e8e2a5c38b76db6fb77e586398c55497644b Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Thu, 31 Jan 2013 10:57:29 -0800
Subject: [PATCH 059/133] require 'Task' uses correct case

---
 src/app/load-text-mate-packages-task.coffee         | 2 +-
 src/packages/snippets/src/load-snippets-task.coffee | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/load-text-mate-packages-task.coffee b/src/app/load-text-mate-packages-task.coffee
index 2eb904676..0bb0ee805 100644
--- a/src/app/load-text-mate-packages-task.coffee
+++ b/src/app/load-text-mate-packages-task.coffee
@@ -1,4 +1,4 @@
-Task = require 'Task'
+Task = require 'task'
 
 module.exports =
 class LoadTextMatePackagesTask extends Task
diff --git a/src/packages/snippets/src/load-snippets-task.coffee b/src/packages/snippets/src/load-snippets-task.coffee
index bbef9d681..e32d70dde 100644
--- a/src/packages/snippets/src/load-snippets-task.coffee
+++ b/src/packages/snippets/src/load-snippets-task.coffee
@@ -1,4 +1,4 @@
-Task = require 'Task'
+Task = require 'task'
 TextMatePackage = require 'text-mate-package'
 
 module.exports =

From 5d95d8bc4eec90ce87c9ccd8f35a679bdcc1822f Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Thu, 31 Jan 2013 15:14:47 -0800
Subject: [PATCH 060/133] Remove log noise while running tests

---
 spec/app/syntax-spec.coffee                     | 3 +--
 src/packages/snippets/spec/snippets-spec.coffee | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/app/syntax-spec.coffee b/spec/app/syntax-spec.coffee
index d15eb5c74..9660fcecb 100644
--- a/spec/app/syntax-spec.coffee
+++ b/spec/app/syntax-spec.coffee
@@ -23,8 +23,7 @@ describe "the `syntax` global", ->
       expect(syntax.grammarForFilePath("/tmp/.git/config").name).toBe "Git Config"
 
     it "uses plain text if no grammar can be found", ->
-      filePath = require.resolve("this-is-not-a-real-file")
-      expect(syntax.grammarForFilePath(filePath).name).toBe "Plain Text"
+      expect(syntax.grammarForFilePath("this-is-not-a-real-file").name).toBe "Plain Text"
 
   describe ".getProperty(scopeDescriptor)", ->
     it "returns the property with the most specific scope selector", ->
diff --git a/src/packages/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee
index 046807746..39cd4d4c6 100644
--- a/src/packages/snippets/spec/snippets-spec.coffee
+++ b/src/packages/snippets/spec/snippets-spec.coffee
@@ -277,6 +277,7 @@ describe "Snippets extension", ->
 
     it "terminates the worker when loading completes", ->
       jasmine.unspy(LoadSnippetsTask.prototype, 'loadAtomSnippets')
+      spyOn(console, "warn")
       spyOn(Worker.prototype, 'terminate').andCallThrough()
       snippets.loaded = false
       snippets.loadAll()
@@ -284,6 +285,7 @@ describe "Snippets extension", ->
       waitsFor "all snippets to load", 5000, -> snippets.loaded
 
       runs ->
+        expect(console.warn).toHaveBeenCalledWith("Error reading snippets file '/Users/corey/github/atom/spec/fixtures/packages/package-with-snippets/snippets/junk-file'")
         expect(Worker.prototype.terminate).toHaveBeenCalled()
         expect(Worker.prototype.terminate.calls.length).toBe 1
 

From 587111074d381fe1996f8fede7084d165783763d Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Thu, 31 Jan 2013 15:15:29 -0800
Subject: [PATCH 061/133] Don't complain if restoring an unnamed buffer

---
 src/app/edit-session.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index e3a906e8a..f6248c173 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -18,7 +18,7 @@ class EditSession
     if fs.exists(state.buffer)
       session = project.buildEditSessionForPath(state.buffer)
     else
-      console.warn "Could not build edit session for path '#{state.buffer}' because that file no longer exists"
+      console.warn "Could not build edit session for path '#{state.buffer}' because that file no longer exists" if state.buffer
       session = project.buildEditSessionForPath(null)
     session.setScrollTop(state.scrollTop)
     session.setScrollLeft(state.scrollLeft)

From a383c205b71fe6e5d512d85887d255dc011a7d9b Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Thu, 31 Jan 2013 15:33:15 -0800
Subject: [PATCH 062/133] Make test output more readable

---
 vendor/jasmine-console-reporter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vendor/jasmine-console-reporter.js b/vendor/jasmine-console-reporter.js
index fc6eb75d7..571c84aaa 100644
--- a/vendor/jasmine-console-reporter.js
+++ b/vendor/jasmine-console-reporter.js
@@ -31,7 +31,9 @@ jasmine.ConsoleReporter.prototype.reportSpecResults = function(spec) {
   for (var i = 0; i < resultItems.length; i++) {
     var result = resultItems[i];
     if (this.logErrors && result.type == 'expect' && result.passed && !result.passed()) {
-      console.log("ERROR: " + spec.getFullName())
+      message = spec.getFullName()
+      console.log("\n\n" + message)
+      console.log((new Array(message.length + 1)).join('-'))
       if (result.trace.stack) {
         console.log(result.trace.stack)
       }

From 8e0b6aec40987cf54a28cdf9405caa6193e42f80 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Thu, 31 Jan 2013 15:46:54 -0800
Subject: [PATCH 063/133] Longer spec timeout

---
 spec/spec-helper.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index a0e49740a..1a4657488 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -85,7 +85,7 @@ jasmine.unspy = (object, methodName) ->
   throw new Error("Not a spy") unless object[methodName].originalValue?
   object[methodName] = object[methodName].originalValue
 
-jasmine.getEnv().defaultTimeoutInterval = 500
+jasmine.getEnv().defaultTimeoutInterval = 1000
 
 window.keyIdentifierForKey = (key) ->
   if key.length > 1 # named key

From a7531c134174476de0a86875305fe11532732024 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Thu, 31 Jan 2013 15:54:36 -0800
Subject: [PATCH 064/133] :shit:

---
 src/packages/snippets/spec/snippets-spec.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/packages/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee
index 39cd4d4c6..c9582a336 100644
--- a/src/packages/snippets/spec/snippets-spec.coffee
+++ b/src/packages/snippets/spec/snippets-spec.coffee
@@ -285,7 +285,8 @@ describe "Snippets extension", ->
       waitsFor "all snippets to load", 5000, -> snippets.loaded
 
       runs ->
-        expect(console.warn).toHaveBeenCalledWith("Error reading snippets file '/Users/corey/github/atom/spec/fixtures/packages/package-with-snippets/snippets/junk-file'")
+        expect(console.warn).toHaveBeenCalled()
+        expect(console.warn.argsForCall[0]).toMatch /Error reading snippets file '.*?\/spec\/fixtures\/packages\/package-with-snippets\/snippets\/junk-file'/
         expect(Worker.prototype.terminate).toHaveBeenCalled()
         expect(Worker.prototype.terminate.calls.length).toBe 1
 

From c2af8712d13b245cc957164d089553158431ad7b Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 19:01:44 -0500
Subject: [PATCH 065/133] Creating GitHub_Dark and GitHub_Light.

---
 Rakefile                  |   1 -
 src/app/atom-theme.coffee |  15 ++-
 src/app/atom.coffee       |   4 +-
 src/app/theme.coffee      |   2 +-
 themes/GitHub_Dark.css    | 182 ++++++++++++++++++++++++++
 themes/GitHub_Light.css   | 262 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 458 insertions(+), 8 deletions(-)
 create mode 100644 themes/GitHub_Dark.css
 create mode 100644 themes/GitHub_Light.css

diff --git a/Rakefile b/Rakefile
index 2a14471ac..e0dd5abd1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -96,7 +96,6 @@ task "create-dot-atom" do
   `cp "#{dot_atom_template_path}/user.css" "#{DOT_ATOM_PATH}"`
   `cp -r "#{dot_atom_template_path}/packages" "#{DOT_ATOM_PATH}"`
   `cp -r "#{ATOM_SRC_PATH}/themes" "#{DOT_ATOM_PATH}"`
-  `cp "#{ATOM_SRC_PATH}/vendor/themes/IR_Black.tmTheme" "#{DOT_ATOM_PATH}/themes"`
 end
 
 desc "Clone default bundles into vendor/bundles directory"
diff --git a/src/app/atom-theme.coffee b/src/app/atom-theme.coffee
index f955402b5..b52ed3111 100644
--- a/src/app/atom-theme.coffee
+++ b/src/app/atom-theme.coffee
@@ -3,9 +3,16 @@ Theme = require 'theme'
 
 module.exports =
 class AtomTheme extends Theme
+
+  loadStylesheet: (stylesheetPath)->
+    @stylesheets[stylesheetPath] = fs.read(stylesheetPath)
+
   load: ->
-    json = fs.read(fs.join(@path, "package.json"))
-    for stylesheetName in JSON.parse(json).stylesheets
-      stylesheetPath = fs.join(@path, stylesheetName)
-      @stylesheets[stylesheetPath] = fs.read(stylesheetPath)
+    if /\.css$/.test(@path)
+      @loadStylesheet @path
+    else
+      json = fs.read(fs.join(@path, "package.json"))
+      for stylesheetName in JSON.parse(json).stylesheets
+        stylesheetPath = fs.join(@path, stylesheetName)
+        @loadStylesheet stylesheetPath
     super
diff --git a/src/app/atom.coffee b/src/app/atom.coffee
index 4630eb6fc..7068d6cbe 100644
--- a/src/app/atom.coffee
+++ b/src/app/atom.coffee
@@ -50,7 +50,7 @@ _.extend atom,
       .filter (name) -> not _.contains(disabledPackages, name)
 
   loadThemes: ->
-    themeNames = config.get("core.themes") ? ['Atom - Dark', 'IR_Black']
+    themeNames = config.get("core.themes") ? ['Atom - Dark', 'GitHub_Dark']
     themeNames = [themeNames] unless _.isArray(themeNames)
     @loadTheme(themeName) for themeName in themeNames
     @loadUserStylesheet()
@@ -64,7 +64,7 @@ _.extend atom,
       applyStylesheet(userStylesheetPath, fs.read(userStylesheetPath), 'userTheme')
 
   getAtomThemeStylesheets: ->
-    themeNames = config.get("core.themes") ? ['Atom - Dark', 'IR_Black']
+    themeNames = config.get("core.themes") ? ['Atom - Dark', 'GitHub_Dark']
     themeNames = [themeNames] unless _.isArray(themeNames)
 
   open: (args...) ->
diff --git a/src/app/theme.coffee b/src/app/theme.coffee
index c3f574977..b16a7ef1c 100644
--- a/src/app/theme.coffee
+++ b/src/app/theme.coffee
@@ -11,7 +11,7 @@ class Theme
     if fs.exists(name)
       path = name
     else
-      path = fs.resolve(config.themeDirPaths..., name, ['', '.tmTheme'])
+      path = fs.resolve(config.themeDirPaths..., name, ['', '.tmTheme', '.css'])
 
     throw new Error("No theme exists named '#{name}'") unless path
 
diff --git a/themes/GitHub_Dark.css b/themes/GitHub_Dark.css
new file mode 100644
index 000000000..7d7392b35
--- /dev/null
+++ b/themes/GitHub_Dark.css
@@ -0,0 +1,182 @@
+.editor, .editor .gutter {
+  background-color: #141414;
+  color: #F8F8F8;
+}
+
+.editor.focused .cursor {
+  border-color: #A7A7A7;
+}
+
+.editor.focused .selection .region {
+  background-color: rgba(221, 240, 255, 0.2);
+}
+
+.editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line {
+  background-color: rgba(255, 255, 255, 0.03);
+}
+
+.comment {
+  color: #5F5A60;
+}
+
+.constant {
+  color: #CF6A4C;
+}
+
+.entity {
+  color: #9B703F;
+}
+
+.keyword {
+  color: #CDA869;
+}
+
+.storage {
+  color: #F9EE98;
+}
+
+.string {
+  color: #8F9D6A;
+}
+
+.support {
+  color: #9B859D;
+}
+
+.variable {
+  color: #7587A6;
+}
+
+.invalid.deprecated {
+  text-decoration: underline;
+  color: #D2A8A1;
+}
+
+.invalid.illegal {
+  color: #F8F8F8;
+  background-color: rgba(86, 45, 86, 0.75);
+}
+
+.text .source {
+  background-color: rgba(176, 179, 186, 0.08);
+}
+
+.text.html.ruby .source {
+  background-color: rgba(177, 179, 186, 0.13);
+}
+
+.entity.other.inherited-class {
+  color: #9B5C2E;
+}
+
+.string .source {
+  color: #DAEFA3;
+}
+
+.string .constant {
+  color: #DDF2A4;
+}
+
+.string.regexp {
+  color: #E9C062;
+}
+
+.string.regexp .constant.character.escape, .string.regexp .source.ruby.embedded, .string.regexp .string.regexp.arbitrary-repitition {
+  color: #CF7D34;
+}
+
+.string .variable {
+  color: #8A9A95;
+}
+
+.support.function {
+  color: #DAD085;
+}
+
+.support.constant {
+  color: #CF6A4C;
+}
+
+.meta.preprocessor.c {
+  color: #8996A8;
+}
+
+.meta.preprocessor.c .keyword {
+  color: #AFC4DB;
+}
+
+.meta.tag.sgml.doctype, .meta.tag.sgml.doctype .entity, .meta.tag.sgml.doctype .string, .meta.tag.preprocessor.xml, .meta.tag.preprocessor.xml .entity, .meta.tag.preprocessor.xml .string {
+  color: #494949;
+}
+
+.declaration.tag, .declaration.tag .entity, .meta.tag, .meta.tag .entity {
+  color: #AC885B;
+}
+
+.declaration.tag.inline, .declaration.tag.inline .entity, .source .entity.name.tag, .source .entity.other.attribute-name, .meta.tag.inline, .meta.tag.inline .entity {
+  color: #E0C589;
+}
+
+.meta.selector.css .entity.name.tag {
+  color: #CDA869;
+}
+
+.meta.selector.css .entity.other.attribute-name.tag.pseudo-class {
+  color: #8F9D6A;
+}
+
+.meta.selector.css .entity.other.attribute-name.id {
+  color: #8B98AB;
+}
+
+.meta.selector.css .entity.other.attribute-name.class {
+  color: #9B703F;
+}
+
+.support.type.property-name.css {
+  color: #C5AF75;
+}
+
+.meta.property-group .support.constant.property-value.css, .meta.property-value .support.constant.property-value.css {
+  color: #F9EE98;
+}
+
+.meta.preprocessor.at-rule .keyword.control.at-rule {
+  color: #8693A5;
+}
+
+.meta.property-value .support.constant.named-color.css, .meta.property-value .constant {
+  color: #CA7840;
+}
+
+.meta.constructor.argument.css {
+  color: #8F9D6A;
+}
+
+.meta.diff, .meta.diff.header, .meta.separator {
+  color: #F8F8F8;
+  background-color: #0E2231;
+}
+
+.markup.deleted {
+  color: #F8F8F8;
+  background-color: #420E09;
+}
+
+.markup.changed {
+  color: #F8F8F8;
+  background-color: #4A410D;
+}
+
+.markup.inserted {
+  color: #F8F8F8;
+  background-color: #253B22;
+}
+
+.markup.list {
+  color: #F9EE98;
+}
+
+.markup.heading {
+  color: #CF6A4C;
+}
\ No newline at end of file
diff --git a/themes/GitHub_Light.css b/themes/GitHub_Light.css
new file mode 100644
index 000000000..0342796b6
--- /dev/null
+++ b/themes/GitHub_Light.css
@@ -0,0 +1,262 @@
+.editor, .editor .gutter {
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+.editor.focused .cursor {
+  border-color: #A7A7A7;
+}
+
+.editor.focused .selection .region {
+  background-color: #E0E0ED;
+}
+
+.editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line {
+  background-color: #D7D7D7;
+}
+
+.comment {
+  color: #898989;
+}
+
+.entity {
+  color: #A15001;
+}
+
+.keyword {
+  color: #016692;
+}
+
+.entity.name.type {
+  text-decoration: underline;
+  color: #646409;
+}
+
+.support {
+  color: #646409;
+}
+
+.storage {
+  color: #877611;
+}
+
+.storage.modifier {
+  color: #014A69;
+}
+
+.constant {
+  color: #333366;
+}
+
+.string {
+  color: #009F78;
+}
+
+.constant.numeric {
+  color: #8C008A;
+}
+
+.punctuation {
+}
+
+.variable {
+  color: #696989;
+}
+
+.invalid.deprecated {
+  text-decoration: underline;
+  color: #A00294;
+}
+
+.invalid.illegal {
+  color: #A00294;
+  background-color: rgba(223, 104, 217, 0.75);
+}
+
+.text .source {
+  background-color: rgba(177, 179, 186, 0.03);
+}
+
+.entity.other.inherited-class {
+  color: #D19264;
+}
+
+.source .string .source {
+  color: #000000;
+}
+
+.source .string .source .punctuation.section.embedded {
+  color: #00FF00;
+}
+
+.string .constant {
+  color: #00FF00;
+}
+
+.string.regexp {
+  color: #9D7416;
+}
+
+.string.regexp .constant.character.escape, .string.regexp .source.ruby.embedded, .string.regexp .string.regexp.arbitrary-repitition {
+  color: #FF8000;
+}
+
+.string.regexp.group {
+  color: #B08C39;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.string.regexp.character-class {
+  color: #C29B4E;
+}
+
+.string .variable {
+  color: #756565;
+}
+
+.support.function {
+  color: #7A7025;
+}
+
+.support.constant {
+  color: #582B00;
+}
+
+.meta.preprocessor.c {
+  color: #765757;
+}
+
+.meta.preprocessor.c .keyword {
+  color: #502424;
+}
+
+.meta.cast {
+  color: #010101;
+}
+
+.meta.sgml.html .meta.doctype, .meta.sgml.html .meta.doctype .entity, .meta.sgml.html .meta.doctype .string, .meta.xml-processing, .meta.xml-processing .entity, .meta.xml-processing .string {
+  color: #010101;
+}
+
+.meta.tag, .meta.tag .entity {
+  color: #0067C2;
+}
+
+.source .entity.name.tag, .source .entity.other.attribute-name, .meta.tag.inline, .meta.tag.inline .entity {
+  color: #00528B;
+}
+
+.entity.other.attribute-name {
+  color: #BC4D00;
+}
+
+.entity.name.tag.namespace, .entity.other.attribute-name.namespace {
+  color: #9B431E;
+}
+
+.meta.selector.css .entity.name.tag {
+  text-decoration: underline;
+  color: #0067C2;
+}
+
+.meta.selector.css .entity.other.attribute-name.tag.pseudo-class {
+  color: #628795;
+}
+
+.meta.selector.css .entity.other.attribute-name.id {
+  color: #667587;
+}
+
+.meta.selector.css .entity.other.attribute-name.class {
+  color: #2A85CF;
+}
+
+.support.type.property-name.css {
+  color: #000000;
+}
+
+.meta.property-group .support.constant.property-value.css, .meta.property-value .support.constant.property-value.css {
+  color: #675C06;
+}
+
+.meta.preprocessor.at-rule .keyword.control.at-rule {
+  color: #795A5A;
+}
+
+.meta.property-value .support.constant.named-color.css, .meta.property-value .constant {
+  color: #3C785D;
+}
+
+.meta.constructor.argument.css {
+  color: #628795;
+}
+
+.meta.diff, .meta.diff.header {
+  color: #FFFFFF;
+  background-color: #0E2231;
+}
+
+.markup.deleted {
+  color: #FFFFFF;
+  background-color: #420E09;
+}
+
+.markup.changed {
+  color: #FFFFFF;
+  background-color: #4A410D;
+}
+
+.markup.inserted {
+  color: #FFFFFF;
+  background-color: #253B22;
+}
+
+.markup.italic {
+  color: #9D7416;
+}
+
+.markup.bold {
+  color: #9D7416;
+}
+
+.markup.underline {
+  text-decoration: underline;
+  color: #9B431E;
+}
+
+.markup.quote {
+  color: #46391E;
+  background-color: rgba(254, 224, 156, 0.07);
+}
+
+.markup.heading, .markup.heading .entity {
+  color: #D95B06;
+  background-color: #632D04;
+}
+
+.markup.list {
+  color: #46391E;
+}
+
+.markup.raw {
+  color: #7C4CA8;
+  background-color: rgba(177, 179, 186, 0.03);
+}
+
+.markup .comment {
+  color: #C84D09;
+}
+
+.meta.separator {
+  color: #746DFF;
+  background-color: #242424;
+}
+
+.meta.line.entry.logfile, .meta.line.exit.logfile {
+  background-color: rgba(238, 238, 238, 0.16);
+}
+
+.meta.line.error.logfile {
+  color: #FFFFFF;
+  background-color: #751012;
+}
\ No newline at end of file

From 801283d022086d79d0a33d0b0128ee3796b4b960 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Thu, 31 Jan 2013 16:02:25 -0800
Subject: [PATCH 066/133] wait a bit after tree-view:move specs

---
 src/packages/tree-view/spec/tree-view-spec.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/packages/tree-view/spec/tree-view-spec.coffee b/src/packages/tree-view/spec/tree-view-spec.coffee
index c788842bf..f0a83fe63 100644
--- a/src/packages/tree-view/spec/tree-view-spec.coffee
+++ b/src/packages/tree-view/spec/tree-view-spec.coffee
@@ -761,7 +761,7 @@ describe "TreeView", ->
 
           expect(addDialog.miniEditor.getText().length).toBe 0
 
-    describe "tree-view:move", ->
+    fdescribe "tree-view:move", ->
       describe "when a file is selected", ->
         moveDialog = null
 
@@ -770,6 +770,9 @@ describe "TreeView", ->
           treeView.trigger "tree-view:move"
           moveDialog = rootView.find(".tree-view-dialog").view()
 
+        afterEach ->
+          waits 50 # The move specs cause too many false positives because of their async nature, so wait a little bit before we cleanup
+
         it "opens a move dialog with the file's current path (excluding extension) populated", ->
           extension = fs.extension(filePath)
           fileNameWithoutExtension = fs.base(filePath, extension)

From 194675b8c3ad6a7fa5b3d0b62564fa94550fb8e2 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 19:48:32 -0500
Subject: [PATCH 067/133] Renaming themes to lowercase-dashes.

---
 src/app/atom.coffee                                      | 2 +-
 themes/{Atom - Dark => atom-dark}/atom.css               | 0
 themes/{Atom - Dark => atom-dark}/autocomplete.css       | 0
 themes/{Atom - Dark => atom-dark}/command-logger.css     | 0
 themes/{Atom - Dark => atom-dark}/command-palette.css    | 0
 themes/{Atom - Dark => atom-dark}/command-panel.css      | 0
 themes/{Atom - Dark => atom-dark}/editor.css             | 0
 themes/{Atom - Dark => atom-dark}/fuzzy-finder.css       | 0
 themes/{Atom - Dark => atom-dark}/gists.css              | 0
 themes/{Atom - Dark => atom-dark}/go-to-line.css         | 0
 themes/{Atom - Dark => atom-dark}/grammar-view.css       | 0
 themes/{Atom - Dark => atom-dark}/markdown-preview.css   | 0
 themes/{Atom - Dark => atom-dark}/package.json           | 0
 themes/{Atom - Dark => atom-dark}/select-list.css        | 0
 themes/{Atom - Dark => atom-dark}/status-bar.css         | 0
 themes/{Atom - Dark => atom-dark}/symbols-view.css       | 0
 themes/{Atom - Dark => atom-dark}/tabs.css               | 0
 themes/{Atom - Dark => atom-dark}/tree-view.css          | 0
 themes/{Atom - Dark => atom-dark}/wrap-guide.css         | 0
 themes/{Atom - Light => atom-light}/atom.css             | 0
 themes/{Atom - Light => atom-light}/autocomplete.css     | 0
 themes/{Atom - Light => atom-light}/command-logger.css   | 0
 themes/{Atom - Light => atom-light}/command-palette.css  | 0
 themes/{Atom - Light => atom-light}/command-panel.css    | 0
 themes/{Atom - Light => atom-light}/editor.css           | 0
 themes/{Atom - Light => atom-light}/fuzzy-finder.css     | 0
 themes/{Atom - Light => atom-light}/gists.css            | 0
 themes/{Atom - Light => atom-light}/go-to-line.css       | 0
 themes/{Atom - Light => atom-light}/grammar-view.css     | 0
 themes/{Atom - Light => atom-light}/markdown-preview.css | 0
 themes/{Atom - Light => atom-light}/package.json         | 0
 themes/{Atom - Light => atom-light}/select-list.css      | 0
 themes/{Atom - Light => atom-light}/status-bar.css       | 0
 themes/{Atom - Light => atom-light}/symbols-view.css     | 0
 themes/{Atom - Light => atom-light}/tabs.css             | 0
 themes/{Atom - Light => atom-light}/tree-view.css        | 0
 themes/{Atom - Light => atom-light}/wrap-guide.css       | 0
 themes/{GitHub_Dark.css => github-dark.css}              | 0
 themes/{GitHub_Light.css => github-light.css}            | 0
 39 files changed, 1 insertion(+), 1 deletion(-)
 rename themes/{Atom - Dark => atom-dark}/atom.css (100%)
 rename themes/{Atom - Dark => atom-dark}/autocomplete.css (100%)
 rename themes/{Atom - Dark => atom-dark}/command-logger.css (100%)
 rename themes/{Atom - Dark => atom-dark}/command-palette.css (100%)
 rename themes/{Atom - Dark => atom-dark}/command-panel.css (100%)
 rename themes/{Atom - Dark => atom-dark}/editor.css (100%)
 rename themes/{Atom - Dark => atom-dark}/fuzzy-finder.css (100%)
 rename themes/{Atom - Dark => atom-dark}/gists.css (100%)
 rename themes/{Atom - Dark => atom-dark}/go-to-line.css (100%)
 rename themes/{Atom - Dark => atom-dark}/grammar-view.css (100%)
 rename themes/{Atom - Dark => atom-dark}/markdown-preview.css (100%)
 rename themes/{Atom - Dark => atom-dark}/package.json (100%)
 rename themes/{Atom - Dark => atom-dark}/select-list.css (100%)
 rename themes/{Atom - Dark => atom-dark}/status-bar.css (100%)
 rename themes/{Atom - Dark => atom-dark}/symbols-view.css (100%)
 rename themes/{Atom - Dark => atom-dark}/tabs.css (100%)
 rename themes/{Atom - Dark => atom-dark}/tree-view.css (100%)
 rename themes/{Atom - Dark => atom-dark}/wrap-guide.css (100%)
 rename themes/{Atom - Light => atom-light}/atom.css (100%)
 rename themes/{Atom - Light => atom-light}/autocomplete.css (100%)
 rename themes/{Atom - Light => atom-light}/command-logger.css (100%)
 rename themes/{Atom - Light => atom-light}/command-palette.css (100%)
 rename themes/{Atom - Light => atom-light}/command-panel.css (100%)
 rename themes/{Atom - Light => atom-light}/editor.css (100%)
 rename themes/{Atom - Light => atom-light}/fuzzy-finder.css (100%)
 rename themes/{Atom - Light => atom-light}/gists.css (100%)
 rename themes/{Atom - Light => atom-light}/go-to-line.css (100%)
 rename themes/{Atom - Light => atom-light}/grammar-view.css (100%)
 rename themes/{Atom - Light => atom-light}/markdown-preview.css (100%)
 rename themes/{Atom - Light => atom-light}/package.json (100%)
 rename themes/{Atom - Light => atom-light}/select-list.css (100%)
 rename themes/{Atom - Light => atom-light}/status-bar.css (100%)
 rename themes/{Atom - Light => atom-light}/symbols-view.css (100%)
 rename themes/{Atom - Light => atom-light}/tabs.css (100%)
 rename themes/{Atom - Light => atom-light}/tree-view.css (100%)
 rename themes/{Atom - Light => atom-light}/wrap-guide.css (100%)
 rename themes/{GitHub_Dark.css => github-dark.css} (100%)
 rename themes/{GitHub_Light.css => github-light.css} (100%)

diff --git a/src/app/atom.coffee b/src/app/atom.coffee
index 7068d6cbe..945ba0085 100644
--- a/src/app/atom.coffee
+++ b/src/app/atom.coffee
@@ -50,7 +50,7 @@ _.extend atom,
       .filter (name) -> not _.contains(disabledPackages, name)
 
   loadThemes: ->
-    themeNames = config.get("core.themes") ? ['Atom - Dark', 'GitHub_Dark']
+    themeNames = config.get("core.themes") ? ['atom-dark', 'github-dark']
     themeNames = [themeNames] unless _.isArray(themeNames)
     @loadTheme(themeName) for themeName in themeNames
     @loadUserStylesheet()
diff --git a/themes/Atom - Dark/atom.css b/themes/atom-dark/atom.css
similarity index 100%
rename from themes/Atom - Dark/atom.css
rename to themes/atom-dark/atom.css
diff --git a/themes/Atom - Dark/autocomplete.css b/themes/atom-dark/autocomplete.css
similarity index 100%
rename from themes/Atom - Dark/autocomplete.css
rename to themes/atom-dark/autocomplete.css
diff --git a/themes/Atom - Dark/command-logger.css b/themes/atom-dark/command-logger.css
similarity index 100%
rename from themes/Atom - Dark/command-logger.css
rename to themes/atom-dark/command-logger.css
diff --git a/themes/Atom - Dark/command-palette.css b/themes/atom-dark/command-palette.css
similarity index 100%
rename from themes/Atom - Dark/command-palette.css
rename to themes/atom-dark/command-palette.css
diff --git a/themes/Atom - Dark/command-panel.css b/themes/atom-dark/command-panel.css
similarity index 100%
rename from themes/Atom - Dark/command-panel.css
rename to themes/atom-dark/command-panel.css
diff --git a/themes/Atom - Dark/editor.css b/themes/atom-dark/editor.css
similarity index 100%
rename from themes/Atom - Dark/editor.css
rename to themes/atom-dark/editor.css
diff --git a/themes/Atom - Dark/fuzzy-finder.css b/themes/atom-dark/fuzzy-finder.css
similarity index 100%
rename from themes/Atom - Dark/fuzzy-finder.css
rename to themes/atom-dark/fuzzy-finder.css
diff --git a/themes/Atom - Dark/gists.css b/themes/atom-dark/gists.css
similarity index 100%
rename from themes/Atom - Dark/gists.css
rename to themes/atom-dark/gists.css
diff --git a/themes/Atom - Dark/go-to-line.css b/themes/atom-dark/go-to-line.css
similarity index 100%
rename from themes/Atom - Dark/go-to-line.css
rename to themes/atom-dark/go-to-line.css
diff --git a/themes/Atom - Dark/grammar-view.css b/themes/atom-dark/grammar-view.css
similarity index 100%
rename from themes/Atom - Dark/grammar-view.css
rename to themes/atom-dark/grammar-view.css
diff --git a/themes/Atom - Dark/markdown-preview.css b/themes/atom-dark/markdown-preview.css
similarity index 100%
rename from themes/Atom - Dark/markdown-preview.css
rename to themes/atom-dark/markdown-preview.css
diff --git a/themes/Atom - Dark/package.json b/themes/atom-dark/package.json
similarity index 100%
rename from themes/Atom - Dark/package.json
rename to themes/atom-dark/package.json
diff --git a/themes/Atom - Dark/select-list.css b/themes/atom-dark/select-list.css
similarity index 100%
rename from themes/Atom - Dark/select-list.css
rename to themes/atom-dark/select-list.css
diff --git a/themes/Atom - Dark/status-bar.css b/themes/atom-dark/status-bar.css
similarity index 100%
rename from themes/Atom - Dark/status-bar.css
rename to themes/atom-dark/status-bar.css
diff --git a/themes/Atom - Dark/symbols-view.css b/themes/atom-dark/symbols-view.css
similarity index 100%
rename from themes/Atom - Dark/symbols-view.css
rename to themes/atom-dark/symbols-view.css
diff --git a/themes/Atom - Dark/tabs.css b/themes/atom-dark/tabs.css
similarity index 100%
rename from themes/Atom - Dark/tabs.css
rename to themes/atom-dark/tabs.css
diff --git a/themes/Atom - Dark/tree-view.css b/themes/atom-dark/tree-view.css
similarity index 100%
rename from themes/Atom - Dark/tree-view.css
rename to themes/atom-dark/tree-view.css
diff --git a/themes/Atom - Dark/wrap-guide.css b/themes/atom-dark/wrap-guide.css
similarity index 100%
rename from themes/Atom - Dark/wrap-guide.css
rename to themes/atom-dark/wrap-guide.css
diff --git a/themes/Atom - Light/atom.css b/themes/atom-light/atom.css
similarity index 100%
rename from themes/Atom - Light/atom.css
rename to themes/atom-light/atom.css
diff --git a/themes/Atom - Light/autocomplete.css b/themes/atom-light/autocomplete.css
similarity index 100%
rename from themes/Atom - Light/autocomplete.css
rename to themes/atom-light/autocomplete.css
diff --git a/themes/Atom - Light/command-logger.css b/themes/atom-light/command-logger.css
similarity index 100%
rename from themes/Atom - Light/command-logger.css
rename to themes/atom-light/command-logger.css
diff --git a/themes/Atom - Light/command-palette.css b/themes/atom-light/command-palette.css
similarity index 100%
rename from themes/Atom - Light/command-palette.css
rename to themes/atom-light/command-palette.css
diff --git a/themes/Atom - Light/command-panel.css b/themes/atom-light/command-panel.css
similarity index 100%
rename from themes/Atom - Light/command-panel.css
rename to themes/atom-light/command-panel.css
diff --git a/themes/Atom - Light/editor.css b/themes/atom-light/editor.css
similarity index 100%
rename from themes/Atom - Light/editor.css
rename to themes/atom-light/editor.css
diff --git a/themes/Atom - Light/fuzzy-finder.css b/themes/atom-light/fuzzy-finder.css
similarity index 100%
rename from themes/Atom - Light/fuzzy-finder.css
rename to themes/atom-light/fuzzy-finder.css
diff --git a/themes/Atom - Light/gists.css b/themes/atom-light/gists.css
similarity index 100%
rename from themes/Atom - Light/gists.css
rename to themes/atom-light/gists.css
diff --git a/themes/Atom - Light/go-to-line.css b/themes/atom-light/go-to-line.css
similarity index 100%
rename from themes/Atom - Light/go-to-line.css
rename to themes/atom-light/go-to-line.css
diff --git a/themes/Atom - Light/grammar-view.css b/themes/atom-light/grammar-view.css
similarity index 100%
rename from themes/Atom - Light/grammar-view.css
rename to themes/atom-light/grammar-view.css
diff --git a/themes/Atom - Light/markdown-preview.css b/themes/atom-light/markdown-preview.css
similarity index 100%
rename from themes/Atom - Light/markdown-preview.css
rename to themes/atom-light/markdown-preview.css
diff --git a/themes/Atom - Light/package.json b/themes/atom-light/package.json
similarity index 100%
rename from themes/Atom - Light/package.json
rename to themes/atom-light/package.json
diff --git a/themes/Atom - Light/select-list.css b/themes/atom-light/select-list.css
similarity index 100%
rename from themes/Atom - Light/select-list.css
rename to themes/atom-light/select-list.css
diff --git a/themes/Atom - Light/status-bar.css b/themes/atom-light/status-bar.css
similarity index 100%
rename from themes/Atom - Light/status-bar.css
rename to themes/atom-light/status-bar.css
diff --git a/themes/Atom - Light/symbols-view.css b/themes/atom-light/symbols-view.css
similarity index 100%
rename from themes/Atom - Light/symbols-view.css
rename to themes/atom-light/symbols-view.css
diff --git a/themes/Atom - Light/tabs.css b/themes/atom-light/tabs.css
similarity index 100%
rename from themes/Atom - Light/tabs.css
rename to themes/atom-light/tabs.css
diff --git a/themes/Atom - Light/tree-view.css b/themes/atom-light/tree-view.css
similarity index 100%
rename from themes/Atom - Light/tree-view.css
rename to themes/atom-light/tree-view.css
diff --git a/themes/Atom - Light/wrap-guide.css b/themes/atom-light/wrap-guide.css
similarity index 100%
rename from themes/Atom - Light/wrap-guide.css
rename to themes/atom-light/wrap-guide.css
diff --git a/themes/GitHub_Dark.css b/themes/github-dark.css
similarity index 100%
rename from themes/GitHub_Dark.css
rename to themes/github-dark.css
diff --git a/themes/GitHub_Light.css b/themes/github-light.css
similarity index 100%
rename from themes/GitHub_Light.css
rename to themes/github-light.css

From ca7159b3f66a298ceeeb0e2297b81baa13388ff2 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 20:02:25 -0500
Subject: [PATCH 068/133] using a better github base for github-light.

---
 themes/github-light.css | 253 ++++++++++------------------------------
 1 file changed, 61 insertions(+), 192 deletions(-)

diff --git a/themes/github-light.css b/themes/github-light.css
index 0342796b6..4ba6dcd90 100644
--- a/themes/github-light.css
+++ b/themes/github-light.css
@@ -1,262 +1,131 @@
 .editor, .editor .gutter {
   background-color: #FFFFFF;
-  color: #000000;
+  color: #555;
 }
 
 .editor.focused .cursor {
-  border-color: #A7A7A7;
+  border-color: #615649;
 }
 
 .editor.focused .selection .region {
-  background-color: #E0E0ED;
+  background-color: #afc4da;
 }
 
 .editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line {
-  background-color: #D7D7D7;
+  background-color: #eee;
 }
 
 .comment {
-  color: #898989;
-}
-
-.entity {
-  color: #A15001;
-}
-
-.keyword {
-  color: #016692;
-}
-
-.entity.name.type {
-  text-decoration: underline;
-  color: #646409;
-}
-
-.support {
-  color: #646409;
-}
-
-.storage {
-  color: #877611;
-}
-
-.storage.modifier {
-  color: #014A69;
-}
-
-.constant {
-  color: #333366;
+  color: #b8b6b1;
 }
 
 .string {
-  color: #009F78;
+  color: #D14;
 }
 
 .constant.numeric {
-  color: #8C008A;
+  color: #D14;
 }
 
-.punctuation {
+.constant.language {
+  color: #606aa1;
+}
+
+.constant.character, .constant.other {
+  color: #606aa1;
 }
 
 .variable {
-  color: #696989;
+  color: #008080;
 }
 
-.invalid.deprecated {
+.keyword {
+  color: #222;
+}
+
+.storage {
+  color: #222;
+}
+
+.storage.type {
+  color: #222;
+}
+
+.entity.name.class {
   text-decoration: underline;
-  color: #A00294;
-}
-
-.invalid.illegal {
-  color: #A00294;
-  background-color: rgba(223, 104, 217, 0.75);
-}
-
-.text .source {
-  background-color: rgba(177, 179, 186, 0.03);
+  color: #606aa1;
 }
 
 .entity.other.inherited-class {
-  color: #D19264;
+  text-decoration: underline;
+  color: #606aa1;
 }
 
-.source .string .source {
-  color: #000000;
+.entity.name.function {
+  color: #900;
 }
 
-.source .string .source .punctuation.section.embedded {
-  color: #00FF00;
+.variable.parameter {
+  color: #606aa1;
 }
 
-.string .constant {
-  color: #00FF00;
-}
-
-.string.regexp {
-  color: #9D7416;
-}
-
-.string.regexp .constant.character.escape, .string.regexp .source.ruby.embedded, .string.regexp .string.regexp.arbitrary-repitition {
-  color: #FF8000;
-}
-
-.string.regexp.group {
-  color: #B08C39;
-  background-color: rgba(0, 0, 0, 0.1);
-}
-
-.string.regexp.character-class {
-  color: #C29B4E;
-}
-
-.string .variable {
-  color: #756565;
-}
-
-.support.function {
-  color: #7A7025;
-}
-
-.support.constant {
-  color: #582B00;
-}
-
-.meta.preprocessor.c {
-  color: #765757;
-}
-
-.meta.preprocessor.c .keyword {
-  color: #502424;
-}
-
-.meta.cast {
-  color: #010101;
-}
-
-.meta.sgml.html .meta.doctype, .meta.sgml.html .meta.doctype .entity, .meta.sgml.html .meta.doctype .string, .meta.xml-processing, .meta.xml-processing .entity, .meta.xml-processing .string {
-  color: #010101;
-}
-
-.meta.tag, .meta.tag .entity {
-  color: #0067C2;
-}
-
-.source .entity.name.tag, .source .entity.other.attribute-name, .meta.tag.inline, .meta.tag.inline .entity {
-  color: #00528B;
+.entity.name.tag {
+  color: #008080;
 }
 
 .entity.other.attribute-name {
-  color: #BC4D00;
+  color: #458;
 }
 
-.entity.name.tag.namespace, .entity.other.attribute-name.namespace {
-  color: #9B431E;
+.support.function {
+  color: #458;
 }
 
-.meta.selector.css .entity.name.tag {
-  text-decoration: underline;
-  color: #0067C2;
+.support.constant {
+  color: #458;
 }
 
-.meta.selector.css .entity.other.attribute-name.tag.pseudo-class {
-  color: #628795;
+.support.type, .support.class {
+  color: #458;
 }
 
-.meta.selector.css .entity.other.attribute-name.id {
-  color: #667587;
+.support.other.variable {
 }
 
-.meta.selector.css .entity.other.attribute-name.class {
-  color: #2A85CF;
+.invalid {
+  color: #F8F8F0;
+  background-color: #00A8C6;
 }
 
-.support.type.property-name.css {
-  color: #000000;
+.invalid.deprecated {
+  color: #F8F8F0;
+  background-color: #8FBE00;
 }
 
-.meta.property-group .support.constant.property-value.css, .meta.property-value .support.constant.property-value.css {
-  color: #675C06;
-}
-
-.meta.preprocessor.at-rule .keyword.control.at-rule {
-  color: #795A5A;
-}
-
-.meta.property-value .support.constant.named-color.css, .meta.property-value .constant {
-  color: #3C785D;
-}
-
-.meta.constructor.argument.css {
-  color: #628795;
+.meta.structure.dictionary.json .string.quoted.double.json {
+  color: #CFCFC2;
 }
 
 .meta.diff, .meta.diff.header {
-  color: #FFFFFF;
-  background-color: #0E2231;
+  color: #75715E;
 }
 
 .markup.deleted {
-  color: #FFFFFF;
-  background-color: #420E09;
-}
-
-.markup.changed {
-  color: #FFFFFF;
-  background-color: #4A410D;
+  color: #00A8C6;
 }
 
 .markup.inserted {
-  color: #FFFFFF;
-  background-color: #253B22;
+  color: #A6E22E;
 }
 
-.markup.italic {
-  color: #9D7416;
+.markup.changed {
+  color: #E6DB74;
 }
 
-.markup.bold {
-  color: #9D7416;
+.constant.numeric.line-number.find-in-files .- .match {
+  color: rgba(143, 190, 0, 0.63);
 }
 
-.markup.underline {
-  text-decoration: underline;
-  color: #9B431E;
-}
-
-.markup.quote {
-  color: #46391E;
-  background-color: rgba(254, 224, 156, 0.07);
-}
-
-.markup.heading, .markup.heading .entity {
-  color: #D95B06;
-  background-color: #632D04;
-}
-
-.markup.list {
-  color: #46391E;
-}
-
-.markup.raw {
-  color: #7C4CA8;
-  background-color: rgba(177, 179, 186, 0.03);
-}
-
-.markup .comment {
-  color: #C84D09;
-}
-
-.meta.separator {
-  color: #746DFF;
-  background-color: #242424;
-}
-
-.meta.line.entry.logfile, .meta.line.exit.logfile {
-  background-color: rgba(238, 238, 238, 0.16);
-}
-
-.meta.line.error.logfile {
-  color: #FFFFFF;
-  background-color: #751012;
+.entity.name.filename.find-in-files {
+  color: #E6DB74;
 }
\ No newline at end of file

From b0eeee3eb85faba6e03ff13f58ab3147c9418f11 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 20:44:39 -0500
Subject: [PATCH 069/133] made some updates to really match .com's light theme

---
 themes/github-light.css | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/themes/github-light.css b/themes/github-light.css
index 4ba6dcd90..2740d819c 100644
--- a/themes/github-light.css
+++ b/themes/github-light.css
@@ -16,7 +16,8 @@
 }
 
 .comment {
-  color: #b8b6b1;
+  color: #999988;
+  font-style: italic;
 }
 
 .string {
@@ -35,12 +36,26 @@
   color: #606aa1;
 }
 
+.constant.symbol {
+  color: #990073;
+}
+
 .variable {
   color: #008080;
 }
 
+/* Keywords */
 .keyword {
   color: #222;
+  font-weight: bold;
+}
+
+.keyword.unit {
+  color: #445588;
+}
+
+.keyword.special-method {
+  color: #0086B3;
 }
 
 .storage {
@@ -75,6 +90,7 @@
 
 .entity.other.attribute-name {
   color: #458;
+  font-weight: bold;
 }
 
 .support.function {
@@ -85,10 +101,14 @@
   color: #458;
 }
 
-.support.type, .support.class {
+.support.type {
   color: #458;
 }
 
+.support.class {
+  color: #008080;
+}
+
 .support.other.variable {
 }
 
@@ -110,6 +130,11 @@
   color: #75715E;
 }
 
+.meta.function span {
+  color: #990000;
+  font-weight: bold;
+}
+
 .markup.deleted {
   color: #00A8C6;
 }

From 7f811fe19f7662be1a218bf83453e843f64bdfc1 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 20:57:27 -0500
Subject: [PATCH 070/133] making the selected line highlighter yellow like the
 site

---
 themes/github-light.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/github-light.css b/themes/github-light.css
index 2740d819c..3f1269e0a 100644
--- a/themes/github-light.css
+++ b/themes/github-light.css
@@ -12,7 +12,7 @@
 }
 
 .editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line {
-  background-color: #eee;
+  background-color: rgb(255, 255, 204);
 }
 
 .comment {

From d83ef8db1785c1a4233c37dc88b8d8dc135ce145 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 21:09:19 -0500
Subject: [PATCH 071/133] fixing the json highlighting

---
 themes/github-light.css | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/themes/github-light.css b/themes/github-light.css
index 3f1269e0a..754d2c572 100644
--- a/themes/github-light.css
+++ b/themes/github-light.css
@@ -122,8 +122,13 @@
   background-color: #8FBE00;
 }
 
-.meta.structure.dictionary.json .string.quoted.double.json {
-  color: #CFCFC2;
+.meta.structure.dictionary.json > .string.quoted.double.json,
+.meta.structure.dictionary.json > .string.quoted.double.json .punctuation.string {
+  color: #000080;
+}
+
+.meta.structure.dictionary.value.json > .string.quoted.double.json {
+  color: #d14;
 }
 
 .meta.diff, .meta.diff.header {

From d275d7e636c8403902c01f2ec669d2c630c242ed Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 21:14:07 -0500
Subject: [PATCH 072/133] making the line highlight alpha transparent.

---
 themes/github-light.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/github-light.css b/themes/github-light.css
index 754d2c572..ab47c4ec6 100644
--- a/themes/github-light.css
+++ b/themes/github-light.css
@@ -12,7 +12,7 @@
 }
 
 .editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line {
-  background-color: rgb(255, 255, 204);
+  background-color: rgba(255, 255, 134, 0.34);
 }
 
 .comment {

From f40f4ead3a68e11962f0a185a9c5a364f13850d8 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 21:34:00 -0500
Subject: [PATCH 073/133] renaming scheme again

---
 src/app/atom.coffee                                       | 4 ++--
 themes/{github-dark.css => atom-syntax-dark.css}          | 0
 themes/{github-light.css => atom-syntax-light.css}        | 0
 themes/{atom-dark => atom-ui-dark}/atom.css               | 0
 themes/{atom-dark => atom-ui-dark}/autocomplete.css       | 0
 themes/{atom-dark => atom-ui-dark}/command-logger.css     | 0
 themes/{atom-dark => atom-ui-dark}/command-palette.css    | 0
 themes/{atom-dark => atom-ui-dark}/command-panel.css      | 0
 themes/{atom-dark => atom-ui-dark}/editor.css             | 0
 themes/{atom-dark => atom-ui-dark}/fuzzy-finder.css       | 0
 themes/{atom-dark => atom-ui-dark}/gists.css              | 0
 themes/{atom-dark => atom-ui-dark}/go-to-line.css         | 0
 themes/{atom-dark => atom-ui-dark}/grammar-view.css       | 0
 themes/{atom-dark => atom-ui-dark}/markdown-preview.css   | 0
 themes/{atom-dark => atom-ui-dark}/package.json           | 0
 themes/{atom-dark => atom-ui-dark}/select-list.css        | 0
 themes/{atom-dark => atom-ui-dark}/status-bar.css         | 0
 themes/{atom-dark => atom-ui-dark}/symbols-view.css       | 0
 themes/{atom-dark => atom-ui-dark}/tabs.css               | 0
 themes/{atom-dark => atom-ui-dark}/tree-view.css          | 0
 themes/{atom-dark => atom-ui-dark}/wrap-guide.css         | 0
 themes/{atom-light => atom-ui-light}/atom.css             | 0
 themes/{atom-light => atom-ui-light}/autocomplete.css     | 0
 themes/{atom-light => atom-ui-light}/command-logger.css   | 0
 themes/{atom-light => atom-ui-light}/command-palette.css  | 0
 themes/{atom-light => atom-ui-light}/command-panel.css    | 0
 themes/{atom-light => atom-ui-light}/editor.css           | 0
 themes/{atom-light => atom-ui-light}/fuzzy-finder.css     | 0
 themes/{atom-light => atom-ui-light}/gists.css            | 0
 themes/{atom-light => atom-ui-light}/go-to-line.css       | 0
 themes/{atom-light => atom-ui-light}/grammar-view.css     | 0
 themes/{atom-light => atom-ui-light}/markdown-preview.css | 0
 themes/{atom-light => atom-ui-light}/package.json         | 0
 themes/{atom-light => atom-ui-light}/select-list.css      | 0
 themes/{atom-light => atom-ui-light}/status-bar.css       | 0
 themes/{atom-light => atom-ui-light}/symbols-view.css     | 0
 themes/{atom-light => atom-ui-light}/tabs.css             | 0
 themes/{atom-light => atom-ui-light}/tree-view.css        | 0
 themes/{atom-light => atom-ui-light}/wrap-guide.css       | 0
 39 files changed, 2 insertions(+), 2 deletions(-)
 rename themes/{github-dark.css => atom-syntax-dark.css} (100%)
 rename themes/{github-light.css => atom-syntax-light.css} (100%)
 rename themes/{atom-dark => atom-ui-dark}/atom.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/autocomplete.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/command-logger.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/command-palette.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/command-panel.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/editor.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/fuzzy-finder.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/gists.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/go-to-line.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/grammar-view.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/markdown-preview.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/package.json (100%)
 rename themes/{atom-dark => atom-ui-dark}/select-list.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/status-bar.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/symbols-view.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/tabs.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/tree-view.css (100%)
 rename themes/{atom-dark => atom-ui-dark}/wrap-guide.css (100%)
 rename themes/{atom-light => atom-ui-light}/atom.css (100%)
 rename themes/{atom-light => atom-ui-light}/autocomplete.css (100%)
 rename themes/{atom-light => atom-ui-light}/command-logger.css (100%)
 rename themes/{atom-light => atom-ui-light}/command-palette.css (100%)
 rename themes/{atom-light => atom-ui-light}/command-panel.css (100%)
 rename themes/{atom-light => atom-ui-light}/editor.css (100%)
 rename themes/{atom-light => atom-ui-light}/fuzzy-finder.css (100%)
 rename themes/{atom-light => atom-ui-light}/gists.css (100%)
 rename themes/{atom-light => atom-ui-light}/go-to-line.css (100%)
 rename themes/{atom-light => atom-ui-light}/grammar-view.css (100%)
 rename themes/{atom-light => atom-ui-light}/markdown-preview.css (100%)
 rename themes/{atom-light => atom-ui-light}/package.json (100%)
 rename themes/{atom-light => atom-ui-light}/select-list.css (100%)
 rename themes/{atom-light => atom-ui-light}/status-bar.css (100%)
 rename themes/{atom-light => atom-ui-light}/symbols-view.css (100%)
 rename themes/{atom-light => atom-ui-light}/tabs.css (100%)
 rename themes/{atom-light => atom-ui-light}/tree-view.css (100%)
 rename themes/{atom-light => atom-ui-light}/wrap-guide.css (100%)

diff --git a/src/app/atom.coffee b/src/app/atom.coffee
index 945ba0085..14c741cab 100644
--- a/src/app/atom.coffee
+++ b/src/app/atom.coffee
@@ -50,7 +50,7 @@ _.extend atom,
       .filter (name) -> not _.contains(disabledPackages, name)
 
   loadThemes: ->
-    themeNames = config.get("core.themes") ? ['atom-dark', 'github-dark']
+    themeNames = config.get("core.themes") ? ['atom-ui-dark', 'atom-syntax-dark']
     themeNames = [themeNames] unless _.isArray(themeNames)
     @loadTheme(themeName) for themeName in themeNames
     @loadUserStylesheet()
@@ -64,7 +64,7 @@ _.extend atom,
       applyStylesheet(userStylesheetPath, fs.read(userStylesheetPath), 'userTheme')
 
   getAtomThemeStylesheets: ->
-    themeNames = config.get("core.themes") ? ['Atom - Dark', 'GitHub_Dark']
+    themeNames = config.get("core.themes") ? ['atom-ui-dark', 'atom-syntax-dark']
     themeNames = [themeNames] unless _.isArray(themeNames)
 
   open: (args...) ->
diff --git a/themes/github-dark.css b/themes/atom-syntax-dark.css
similarity index 100%
rename from themes/github-dark.css
rename to themes/atom-syntax-dark.css
diff --git a/themes/github-light.css b/themes/atom-syntax-light.css
similarity index 100%
rename from themes/github-light.css
rename to themes/atom-syntax-light.css
diff --git a/themes/atom-dark/atom.css b/themes/atom-ui-dark/atom.css
similarity index 100%
rename from themes/atom-dark/atom.css
rename to themes/atom-ui-dark/atom.css
diff --git a/themes/atom-dark/autocomplete.css b/themes/atom-ui-dark/autocomplete.css
similarity index 100%
rename from themes/atom-dark/autocomplete.css
rename to themes/atom-ui-dark/autocomplete.css
diff --git a/themes/atom-dark/command-logger.css b/themes/atom-ui-dark/command-logger.css
similarity index 100%
rename from themes/atom-dark/command-logger.css
rename to themes/atom-ui-dark/command-logger.css
diff --git a/themes/atom-dark/command-palette.css b/themes/atom-ui-dark/command-palette.css
similarity index 100%
rename from themes/atom-dark/command-palette.css
rename to themes/atom-ui-dark/command-palette.css
diff --git a/themes/atom-dark/command-panel.css b/themes/atom-ui-dark/command-panel.css
similarity index 100%
rename from themes/atom-dark/command-panel.css
rename to themes/atom-ui-dark/command-panel.css
diff --git a/themes/atom-dark/editor.css b/themes/atom-ui-dark/editor.css
similarity index 100%
rename from themes/atom-dark/editor.css
rename to themes/atom-ui-dark/editor.css
diff --git a/themes/atom-dark/fuzzy-finder.css b/themes/atom-ui-dark/fuzzy-finder.css
similarity index 100%
rename from themes/atom-dark/fuzzy-finder.css
rename to themes/atom-ui-dark/fuzzy-finder.css
diff --git a/themes/atom-dark/gists.css b/themes/atom-ui-dark/gists.css
similarity index 100%
rename from themes/atom-dark/gists.css
rename to themes/atom-ui-dark/gists.css
diff --git a/themes/atom-dark/go-to-line.css b/themes/atom-ui-dark/go-to-line.css
similarity index 100%
rename from themes/atom-dark/go-to-line.css
rename to themes/atom-ui-dark/go-to-line.css
diff --git a/themes/atom-dark/grammar-view.css b/themes/atom-ui-dark/grammar-view.css
similarity index 100%
rename from themes/atom-dark/grammar-view.css
rename to themes/atom-ui-dark/grammar-view.css
diff --git a/themes/atom-dark/markdown-preview.css b/themes/atom-ui-dark/markdown-preview.css
similarity index 100%
rename from themes/atom-dark/markdown-preview.css
rename to themes/atom-ui-dark/markdown-preview.css
diff --git a/themes/atom-dark/package.json b/themes/atom-ui-dark/package.json
similarity index 100%
rename from themes/atom-dark/package.json
rename to themes/atom-ui-dark/package.json
diff --git a/themes/atom-dark/select-list.css b/themes/atom-ui-dark/select-list.css
similarity index 100%
rename from themes/atom-dark/select-list.css
rename to themes/atom-ui-dark/select-list.css
diff --git a/themes/atom-dark/status-bar.css b/themes/atom-ui-dark/status-bar.css
similarity index 100%
rename from themes/atom-dark/status-bar.css
rename to themes/atom-ui-dark/status-bar.css
diff --git a/themes/atom-dark/symbols-view.css b/themes/atom-ui-dark/symbols-view.css
similarity index 100%
rename from themes/atom-dark/symbols-view.css
rename to themes/atom-ui-dark/symbols-view.css
diff --git a/themes/atom-dark/tabs.css b/themes/atom-ui-dark/tabs.css
similarity index 100%
rename from themes/atom-dark/tabs.css
rename to themes/atom-ui-dark/tabs.css
diff --git a/themes/atom-dark/tree-view.css b/themes/atom-ui-dark/tree-view.css
similarity index 100%
rename from themes/atom-dark/tree-view.css
rename to themes/atom-ui-dark/tree-view.css
diff --git a/themes/atom-dark/wrap-guide.css b/themes/atom-ui-dark/wrap-guide.css
similarity index 100%
rename from themes/atom-dark/wrap-guide.css
rename to themes/atom-ui-dark/wrap-guide.css
diff --git a/themes/atom-light/atom.css b/themes/atom-ui-light/atom.css
similarity index 100%
rename from themes/atom-light/atom.css
rename to themes/atom-ui-light/atom.css
diff --git a/themes/atom-light/autocomplete.css b/themes/atom-ui-light/autocomplete.css
similarity index 100%
rename from themes/atom-light/autocomplete.css
rename to themes/atom-ui-light/autocomplete.css
diff --git a/themes/atom-light/command-logger.css b/themes/atom-ui-light/command-logger.css
similarity index 100%
rename from themes/atom-light/command-logger.css
rename to themes/atom-ui-light/command-logger.css
diff --git a/themes/atom-light/command-palette.css b/themes/atom-ui-light/command-palette.css
similarity index 100%
rename from themes/atom-light/command-palette.css
rename to themes/atom-ui-light/command-palette.css
diff --git a/themes/atom-light/command-panel.css b/themes/atom-ui-light/command-panel.css
similarity index 100%
rename from themes/atom-light/command-panel.css
rename to themes/atom-ui-light/command-panel.css
diff --git a/themes/atom-light/editor.css b/themes/atom-ui-light/editor.css
similarity index 100%
rename from themes/atom-light/editor.css
rename to themes/atom-ui-light/editor.css
diff --git a/themes/atom-light/fuzzy-finder.css b/themes/atom-ui-light/fuzzy-finder.css
similarity index 100%
rename from themes/atom-light/fuzzy-finder.css
rename to themes/atom-ui-light/fuzzy-finder.css
diff --git a/themes/atom-light/gists.css b/themes/atom-ui-light/gists.css
similarity index 100%
rename from themes/atom-light/gists.css
rename to themes/atom-ui-light/gists.css
diff --git a/themes/atom-light/go-to-line.css b/themes/atom-ui-light/go-to-line.css
similarity index 100%
rename from themes/atom-light/go-to-line.css
rename to themes/atom-ui-light/go-to-line.css
diff --git a/themes/atom-light/grammar-view.css b/themes/atom-ui-light/grammar-view.css
similarity index 100%
rename from themes/atom-light/grammar-view.css
rename to themes/atom-ui-light/grammar-view.css
diff --git a/themes/atom-light/markdown-preview.css b/themes/atom-ui-light/markdown-preview.css
similarity index 100%
rename from themes/atom-light/markdown-preview.css
rename to themes/atom-ui-light/markdown-preview.css
diff --git a/themes/atom-light/package.json b/themes/atom-ui-light/package.json
similarity index 100%
rename from themes/atom-light/package.json
rename to themes/atom-ui-light/package.json
diff --git a/themes/atom-light/select-list.css b/themes/atom-ui-light/select-list.css
similarity index 100%
rename from themes/atom-light/select-list.css
rename to themes/atom-ui-light/select-list.css
diff --git a/themes/atom-light/status-bar.css b/themes/atom-ui-light/status-bar.css
similarity index 100%
rename from themes/atom-light/status-bar.css
rename to themes/atom-ui-light/status-bar.css
diff --git a/themes/atom-light/symbols-view.css b/themes/atom-ui-light/symbols-view.css
similarity index 100%
rename from themes/atom-light/symbols-view.css
rename to themes/atom-ui-light/symbols-view.css
diff --git a/themes/atom-light/tabs.css b/themes/atom-ui-light/tabs.css
similarity index 100%
rename from themes/atom-light/tabs.css
rename to themes/atom-ui-light/tabs.css
diff --git a/themes/atom-light/tree-view.css b/themes/atom-ui-light/tree-view.css
similarity index 100%
rename from themes/atom-light/tree-view.css
rename to themes/atom-ui-light/tree-view.css
diff --git a/themes/atom-light/wrap-guide.css b/themes/atom-ui-light/wrap-guide.css
similarity index 100%
rename from themes/atom-light/wrap-guide.css
rename to themes/atom-ui-light/wrap-guide.css

From f364541c4eb711ec6cdb6358790307bf8b56b892 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 21:56:28 -0500
Subject: [PATCH 074/133] Just having trouble with the dark theme, going with
 ir_black until we get some design up in here

---
 themes/atom-syntax-dark.css | 175 +++++++++++++++++++++++++++---------
 1 file changed, 131 insertions(+), 44 deletions(-)

diff --git a/themes/atom-syntax-dark.css b/themes/atom-syntax-dark.css
index 7d7392b35..d24fa1427 100644
--- a/themes/atom-syntax-dark.css
+++ b/themes/atom-syntax-dark.css
@@ -1,80 +1,104 @@
 .editor, .editor .gutter {
-  background-color: #141414;
-  color: #F8F8F8;
+  background-color: #000000;
+  color: #EDEDED;
 }
 
 .editor.focused .cursor {
-  border-color: #A7A7A7;
+  border-color: #FFFFFF;
 }
 
 .editor.focused .selection .region {
-  background-color: rgba(221, 240, 255, 0.2);
+  background-color: #333333;
 }
 
 .editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line {
-  background-color: rgba(255, 255, 255, 0.03);
+  background-color: rgba(255, 255, 255, 0.14);
 }
 
 .comment {
-  color: #5F5A60;
-}
-
-.constant {
-  color: #CF6A4C;
+  color: #7C7C7C;
 }
 
 .entity {
-  color: #9B703F;
+  color: #FFD2A7;
 }
 
 .keyword {
-  color: #CDA869;
+  color: #96CBFE;
 }
 
-.storage {
-  color: #F9EE98;
+.keyword.control {
+  color: #96CBFE;
 }
 
-.string {
-  color: #8F9D6A;
+.keyword.operator {
+  color: #EDEDED;
+}
+
+.entity.name.type {
+  text-decoration: underline;
+  color: #FFFFB6;
 }
 
 .support {
-  color: #9B859D;
+  color: #FFFFB6;
+}
+
+.storage {
+  color: #CFCB90;
+}
+
+.storage.modifier {
+  color: #96CBFE;
+}
+
+.constant {
+  color: #99CC99;
+}
+
+.string {
+  color: #A8FF60;
+}
+
+.constant.numeric {
+  color: #FF73FD;
+}
+
+.punctuation {
 }
 
 .variable {
-  color: #7587A6;
+  color: #C6C5FE;
 }
 
 .invalid.deprecated {
   text-decoration: underline;
-  color: #D2A8A1;
+  color: #FD5FF1;
 }
 
 .invalid.illegal {
-  color: #F8F8F8;
+  color: #FD5FF1;
   background-color: rgba(86, 45, 86, 0.75);
 }
 
 .text .source {
-  background-color: rgba(176, 179, 186, 0.08);
-}
-
-.text.html.ruby .source {
-  background-color: rgba(177, 179, 186, 0.13);
+  background-color: rgba(177, 179, 186, 0.03);
 }
 
 .entity.other.inherited-class {
   color: #9B5C2E;
 }
 
-.string .source {
-  color: #DAEFA3;
+.source .string .source {
+  color: #EDEDED;
+}
+
+.source .string .source .punctuation.section.embedded {
+  color: #00A0A0;
 }
 
 .string .constant {
-  color: #DDF2A4;
+  color: #00A0A0;
 }
 
 .string.regexp {
@@ -82,7 +106,16 @@
 }
 
 .string.regexp .constant.character.escape, .string.regexp .source.ruby.embedded, .string.regexp .string.regexp.arbitrary-repitition {
-  color: #CF7D34;
+  color: #FF8000;
+}
+
+.string.regexp.group {
+  color: #C6A24F;
+  background-color: rgba(255, 255, 255, 0.06);
+}
+
+.string.regexp.character-class {
+  color: #B18A3D;
 }
 
 .string .variable {
@@ -94,7 +127,7 @@
 }
 
 .support.constant {
-  color: #CF6A4C;
+  color: #FFD2A7;
 }
 
 .meta.preprocessor.c {
@@ -105,20 +138,33 @@
   color: #AFC4DB;
 }
 
-.meta.tag.sgml.doctype, .meta.tag.sgml.doctype .entity, .meta.tag.sgml.doctype .string, .meta.tag.preprocessor.xml, .meta.tag.preprocessor.xml .entity, .meta.tag.preprocessor.xml .string {
+.meta.cast {
+  color: #676767;
+}
+
+.meta.sgml.html .meta.doctype, .meta.sgml.html .meta.doctype .entity, .meta.sgml.html .meta.doctype .string, .meta.xml-processing, .meta.xml-processing .entity, .meta.xml-processing .string {
   color: #494949;
 }
 
-.declaration.tag, .declaration.tag .entity, .meta.tag, .meta.tag .entity {
-  color: #AC885B;
+.meta.tag, .meta.tag .entity {
+  color: #96CBFE;
 }
 
-.declaration.tag.inline, .declaration.tag.inline .entity, .source .entity.name.tag, .source .entity.other.attribute-name, .meta.tag.inline, .meta.tag.inline .entity {
-  color: #E0C589;
+.source .entity.name.tag, .source .entity.other.attribute-name, .meta.tag.inline, .meta.tag.inline .entity {
+  color: #96CBFE;
+}
+
+.entity.other.attribute-name {
+  color: #FFD7B1;
+}
+
+.entity.name.tag.namespace, .entity.other.attribute-name.namespace {
+  color: #E18964;
 }
 
 .meta.selector.css .entity.name.tag {
-  color: #CDA869;
+  text-decoration: underline;
+  color: #96CBFE;
 }
 
 .meta.selector.css .entity.other.attribute-name.tag.pseudo-class {
@@ -130,11 +176,11 @@
 }
 
 .meta.selector.css .entity.other.attribute-name.class {
-  color: #9B703F;
+  color: #62B1FE;
 }
 
 .support.type.property-name.css {
-  color: #C5AF75;
+  color: #EDEDED;
 }
 
 .meta.property-group .support.constant.property-value.css, .meta.property-value .support.constant.property-value.css {
@@ -146,14 +192,14 @@
 }
 
 .meta.property-value .support.constant.named-color.css, .meta.property-value .constant {
-  color: #CA7840;
+  color: #87C38A;
 }
 
 .meta.constructor.argument.css {
   color: #8F9D6A;
 }
 
-.meta.diff, .meta.diff.header, .meta.separator {
+.meta.diff, .meta.diff.header {
   color: #F8F8F8;
   background-color: #0E2231;
 }
@@ -173,10 +219,51 @@
   background-color: #253B22;
 }
 
-.markup.list {
-  color: #F9EE98;
+.markup.italic {
+  color: #E9C062;
 }
 
-.markup.heading {
-  color: #CF6A4C;
+.markup.bold {
+  color: #E9C062;
+}
+
+.markup.underline {
+  text-decoration: underline;
+  color: #E18964;
+}
+
+.markup.quote {
+  color: #E1D4B9;
+  background-color: rgba(254, 224, 156, 0.07);
+}
+
+.markup.heading, .markup.heading .entity {
+  color: #FEDCC5;
+  background-color: #632D04;
+}
+
+.markup.list {
+  color: #E1D4B9;
+}
+
+.markup.raw {
+  color: #578BB3;
+  background-color: rgba(177, 179, 186, 0.03);
+}
+
+.markup .comment {
+  color: #F67B37;
+}
+
+.meta.separator {
+  color: #60A633;
+  background-color: #242424;
+}
+
+.meta.line.entry.logfile, .meta.line.exit.logfile {
+  background-color: rgba(238, 238, 238, 0.16);
+}
+
+.meta.line.error.logfile {
+  background-color: #751012;
 }
\ No newline at end of file

From b226ecb8884e44a4109d53abf560e382b79f32f6 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 22:08:55 -0500
Subject: [PATCH 075/133] adding some css syntax

---
 themes/atom-syntax-light.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/themes/atom-syntax-light.css b/themes/atom-syntax-light.css
index ab47c4ec6..b1eb31128 100644
--- a/themes/atom-syntax-light.css
+++ b/themes/atom-syntax-light.css
@@ -158,4 +158,14 @@
 
 .entity.name.filename.find-in-files {
   color: #E6DB74;
+}
+
+/* CSS Styles */
+.css.support.property-name {
+  font-weight: bold;
+  color: #333;
+}
+
+.css.constant {
+  color: #099;
 }
\ No newline at end of file

From 54a2b48e90390551b50bee1f21630f2a6dfff220 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 22:17:34 -0500
Subject: [PATCH 076/133] namespacing all the syntax declarations to .editor

---
 themes/atom-syntax-light.css | 75 +++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/themes/atom-syntax-light.css b/themes/atom-syntax-light.css
index b1eb31128..3a80d2048 100644
--- a/themes/atom-syntax-light.css
+++ b/themes/atom-syntax-light.css
@@ -15,157 +15,154 @@
   background-color: rgba(255, 255, 134, 0.34);
 }
 
-.comment {
+.editor .comment {
   color: #999988;
   font-style: italic;
 }
 
-.string {
+.editor .string {
   color: #D14;
 }
 
-.constant.numeric {
+.editor .constant.numeric {
   color: #D14;
 }
 
-.constant.language {
+.editor .constant.language {
   color: #606aa1;
 }
 
-.constant.character, .constant.other {
+.editor .constant.character, .editor .constant.other {
   color: #606aa1;
 }
 
-.constant.symbol {
+.editor .constant.symbol {
   color: #990073;
 }
 
-.variable {
+.editor .variable {
   color: #008080;
 }
 
 /* Keywords */
-.keyword {
+.editor .keyword {
   color: #222;
   font-weight: bold;
 }
 
-.keyword.unit {
+.editor .keyword.unit {
   color: #445588;
 }
 
-.keyword.special-method {
+.editor .keyword.special-method {
   color: #0086B3;
 }
 
-.storage {
+.editor .storage {
   color: #222;
 }
 
-.storage.type {
+.editor .storage.type {
   color: #222;
 }
 
-.entity.name.class {
+.editor .entity.name.class {
   text-decoration: underline;
   color: #606aa1;
 }
 
-.entity.other.inherited-class {
+.editor .entity.other.inherited-class {
   text-decoration: underline;
   color: #606aa1;
 }
 
-.entity.name.function {
+.editor .entity.name.function {
   color: #900;
 }
 
-.variable.parameter {
+.editor .variable.parameter {
   color: #606aa1;
 }
 
-.entity.name.tag {
+.editor .entity.name.tag {
   color: #008080;
 }
 
-.entity.other.attribute-name {
+.editor .entity.other.attribute-name {
   color: #458;
   font-weight: bold;
 }
 
-.support.function {
+.editor .support.function {
   color: #458;
 }
 
-.support.constant {
+.editor .support.constant {
   color: #458;
 }
 
-.support.type {
+.editor .support.type {
   color: #458;
 }
 
-.support.class {
+.editor .support.class {
   color: #008080;
 }
 
-.support.other.variable {
-}
-
-.invalid {
+.editor .invalid {
   color: #F8F8F0;
   background-color: #00A8C6;
 }
 
-.invalid.deprecated {
+.editor .invalid.deprecated {
   color: #F8F8F0;
   background-color: #8FBE00;
 }
 
-.meta.structure.dictionary.json > .string.quoted.double.json,
-.meta.structure.dictionary.json > .string.quoted.double.json .punctuation.string {
+.editor .meta.structure.dictionary.json > .string.quoted.double.json,
+.editor .meta.structure.dictionary.json > .string.quoted.double.json .punctuation.string {
   color: #000080;
 }
 
-.meta.structure.dictionary.value.json > .string.quoted.double.json {
+.editor .meta.structure.dictionary.value.json > .string.quoted.double.json {
   color: #d14;
 }
 
-.meta.diff, .meta.diff.header {
+.editor .meta.diff, .editor .meta.diff.header {
   color: #75715E;
 }
 
-.meta.function span {
+.editor .meta.function span {
   color: #990000;
   font-weight: bold;
 }
 
-.markup.deleted {
+.editor .markup.deleted {
   color: #00A8C6;
 }
 
-.markup.inserted {
+.editor .markup.inserted {
   color: #A6E22E;
 }
 
-.markup.changed {
+.editor .markup.changed {
   color: #E6DB74;
 }
 
-.constant.numeric.line-number.find-in-files .- .match {
+.editor .constant.numeric.line-number.find-in-files .- .match {
   color: rgba(143, 190, 0, 0.63);
 }
 
-.entity.name.filename.find-in-files {
+.editor .entity.name.filename.find-in-files {
   color: #E6DB74;
 }
 
 /* CSS Styles */
-.css.support.property-name {
+.editor .css.support.property-name {
   font-weight: bold;
   color: #333;
 }
 
-.css.constant {
+.editor .css.constant {
   color: #099;
 }
\ No newline at end of file

From d37f8de82dd67654692a15a342acd5ce3e8c7251 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 22:33:11 -0500
Subject: [PATCH 077/133] just some theme polish

---
 themes/atom-syntax-dark.css       | 2 +-
 themes/atom-ui-dark/tabs.css      | 3 ++-
 themes/atom-ui-dark/tree-view.css | 2 +-
 themes/atom-ui-light/tabs.css     | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/themes/atom-syntax-dark.css b/themes/atom-syntax-dark.css
index d24fa1427..106adb27b 100644
--- a/themes/atom-syntax-dark.css
+++ b/themes/atom-syntax-dark.css
@@ -1,5 +1,5 @@
 .editor, .editor .gutter {
-  background-color: #000000;
+  background-color: #141414;
   color: #EDEDED;
 }
 
diff --git a/themes/atom-ui-dark/tabs.css b/themes/atom-ui-dark/tabs.css
index 09942bec6..c30c9c1ad 100644
--- a/themes/atom-ui-dark/tabs.css
+++ b/themes/atom-ui-dark/tabs.css
@@ -2,7 +2,8 @@
   background: #333333;
   border-bottom: 4px solid #424242;
   font: caption;
-  box-shadow: inset 0 -1px 0 #2e2e2e;
+  box-shadow: inset 0 -1px 0 #2e2e2e, 0 1px 0 #191919;
+  margin-bottom: 1px;
 }
 
 .tab {
diff --git a/themes/atom-ui-dark/tree-view.css b/themes/atom-ui-dark/tree-view.css
index ea27fd587..d8e69ab64 100644
--- a/themes/atom-ui-dark/tree-view.css
+++ b/themes/atom-ui-dark/tree-view.css
@@ -1,6 +1,6 @@
 .tree-view {
   background: #1e1e1e;
-  border-right: 2px solid #191919;
+  border-right: 1px solid #191919;
 }
 
 .tree-view .entry {
diff --git a/themes/atom-ui-light/tabs.css b/themes/atom-ui-light/tabs.css
index 6b286ad61..9e909e32d 100644
--- a/themes/atom-ui-light/tabs.css
+++ b/themes/atom-ui-light/tabs.css
@@ -2,7 +2,8 @@
   background: #e3e3e3;
   border-bottom: 4px solid #e5e5e5;
   font: caption;
-  box-shadow: inset 0 -1px 0 #959595;
+  box-shadow: inset 0 -1px 0 #959595, 0 1px 0 #989898;
+  margin-bottom: 1px;
 }
 
 .tab {

From 23383b72d81733c02448bcb3f681e95879d78626 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Thu, 31 Jan 2013 22:56:42 -0500
Subject: [PATCH 078/133] 2px cursors are bigger than other apps.

---
 static/editor.css            | 2 +-
 themes/atom-syntax-light.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/editor.css b/static/editor.css
index 40c3d1b4e..f840736cd 100644
--- a/static/editor.css
+++ b/static/editor.css
@@ -82,7 +82,7 @@
 
 .editor .cursor {
   position: absolute;
-  border-left: 2px solid;
+  border-left: 1px solid;
 }
 
 .editor:not(.focused) .cursor,
diff --git a/themes/atom-syntax-light.css b/themes/atom-syntax-light.css
index 3a80d2048..e7332f155 100644
--- a/themes/atom-syntax-light.css
+++ b/themes/atom-syntax-light.css
@@ -4,7 +4,7 @@
 }
 
 .editor.focused .cursor {
-  border-color: #615649;
+  border-color: #000;
 }
 
 .editor.focused .selection .region {

From 4482bdd96415984a53f39779d4c1f482fbf9197b Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 07:55:51 -0800
Subject: [PATCH 079/133] don't need that dot

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index a5cd4053d..ced873693 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -123,7 +123,7 @@ class EditorStatsView extends ScrollView
 
   detach: =>
     super()
-    @.remove()
+    @remove()
     @rootView.focus()
 
   serialize: ->

From 4d8a6e5b6039c0312c66ee1aef782a759506195b Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 07:59:35 -0800
Subject: [PATCH 080/133] remove serialization for now since I'm not reloading
 the data

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index ced873693..e56165b89 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -124,7 +124,4 @@ class EditorStatsView extends ScrollView
   detach: =>
     super()
     @remove()
-    @rootView.focus()
-
-  serialize: ->
-    eventLog: @eventLog
\ No newline at end of file
+    @rootView.focus()
\ No newline at end of file

From f62e49d2f4232153d13dc03b34f6022aa1efa8f8 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Fri, 1 Feb 2013 11:09:12 -0500
Subject: [PATCH 081/133] Adding back the font-weight font-style to tmThemes

We can add this back now because in the default tests we're using a true
monospaced font, not the fake monospace font Inconsolata.
---
 spec/app/text-mate-theme-spec.coffee | 2 +-
 src/app/text-mate-theme.coffee       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/app/text-mate-theme-spec.coffee b/spec/app/text-mate-theme-spec.coffee
index 5191ced55..e1c04ec90 100644
--- a/spec/app/text-mate-theme-spec.coffee
+++ b/spec/app/text-mate-theme-spec.coffee
@@ -42,7 +42,7 @@ describe "TextMateTheme", ->
         selector: ".invalid.deprecated"
         properties:
           'color': "#D2A8A1"
-          # 'font-style': 'italic'
+          'font-style': 'italic'
           'text-decoration': 'underline'
 
       expect(rulesets[13]).toEqual
diff --git a/src/app/text-mate-theme.coffee b/src/app/text-mate-theme.coffee
index ee78cdea7..cb1d3558a 100644
--- a/src/app/text-mate-theme.coffee
+++ b/src/app/text-mate-theme.coffee
@@ -75,8 +75,8 @@ class TextMateTheme extends Theme
 
     if fontStyle
       fontStyles = fontStyle.split(/\s+/)
-      # properties['font-weight'] = 'bold' if _.contains(fontStyles, 'bold')
-      # properties['font-style'] = 'italic' if _.contains(fontStyles, 'italic')
+      properties['font-weight'] = 'bold' if _.contains(fontStyles, 'bold')
+      properties['font-style'] = 'italic' if _.contains(fontStyles, 'italic')
       properties['text-decoration'] = 'underline' if _.contains(fontStyles, 'underline')
 
     properties['color'] = @translateColor(foreground) if foreground

From 52c1ca7a2dd8a24056f17d21acfcacd1831d2c6f Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 08:24:43 -0800
Subject: [PATCH 082/133] fix editor stats so they look as if they are embedded
 in the status bar

---
 .../editor-stats/src/editor-stats-view.coffee | 22 ++++++++++---------
 .../editor-stats/stylesheets/editor-stats.css |  9 +++++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index e56165b89..ca4c9e498 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -30,7 +30,8 @@ class EditorStatsView extends ScrollView
     @instance = new EditorStatsView(rootView, state?.eventLog)
 
   @content: (rootView) ->
-    @div class: 'editor-stats', tabindex: -1
+    @div class: 'editor-stats-wrapper', tabindex: -1, =>
+      @div class: 'editor-stats', outlet: 'editorStats'
 
   @serialize: ->
     @instance.serialize()
@@ -42,6 +43,7 @@ class EditorStatsView extends ScrollView
 
     @command 'core:cancel', @detach
     @statusBar = @rootView.find '.status-bar'
+    @css 'background', @statusBar.css('background')
 
     date = new Date(startDate)
     future = new Date(date.getTime() + (36e5 * hours))
@@ -54,17 +56,17 @@ class EditorStatsView extends ScrollView
     @rootView.on 'mouseup', @track
 
   draw: ->
-    w = @statusBar.outerWidth()
+    w = @statusBar.width()
     h = @.height()
-    [pt, pl, pb, pr] = [15,0,0,0]
+    [pt, pl, pb, pr] = [15,10,0,10]
 
     data = d3.entries @eventLog
 
-    x.rangeRoundBands [0, w - pl - pr], 0.2
+    x.rangeBands [0, w - pl - pr], 0.2
     y.range [h, 0]
     xaxis.tickSize(-h + pt + pb, 50)
 
-    vis = d3.select(@.get(0)).append('svg')
+    vis = d3.select(@editorStats.get(0)).append('svg')
       .attr('width', w)
       .attr('height', h)
     .append('g')
@@ -75,7 +77,7 @@ class EditorStatsView extends ScrollView
       .call(xaxis)
     .selectAll('g')
       .style('display', (d, i) ->
-        if i % 15 == 0 || i % 5 == 0
+        if i % 15 == 0 || i % 5 == 0 || i == data.length - 1
           'block'
         else
           'none'
@@ -85,7 +87,7 @@ class EditorStatsView extends ScrollView
       .data(data)
     .enter().append('rect')
       .attr('x', (d, i) -> x i)
-      .attr('y', (d) -> y d.value)
+      .attr('y', (d) -> y(d.value))
       .attr('width', x.rangeBand())
       .attr('class', 'bar')
 
@@ -96,8 +98,8 @@ class EditorStatsView extends ScrollView
       y.domain [0, max]
 
       bars.data(newdata).transition()
-        .attr('height', (d, i) ->  h - y(d.value))
-        .attr('y', (d, i) -> y d.value)
+        .attr('height', (d, i) ->  h - y(d.value) - 17)
+        .attr('y', (d, i) -> y(d.value))
 
       bars.classed('max', (d, i) -> d.value == max)
 
@@ -117,7 +119,7 @@ class EditorStatsView extends ScrollView
       @attach()
 
   attach: ->
-    @.insertBefore @statusBar
+    @insertAfter @statusBar
     @focus()
     @draw()
 
diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
index 1368dcdb1..57fdd5bf8 100644
--- a/src/packages/editor-stats/stylesheets/editor-stats.css
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -1,8 +1,15 @@
+.editor-stats-wrapper {
+  padding: 5px;
+  box-sizing: border-box;
+}
+
 .editor-stats {
   height: 50px;
   width: 100%;
   background: #1d1f21;
-  border-top: 1px solid rgba(255, 255, 255, 0.1);
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+  border-right: 1px solid rgba(255, 255, 255, 0.1);
 }
 
 .editor-stats rect.bar {

From d1b916f5a25aa51052d853df16aee30e7c9ef9b9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 08:32:24 -0800
Subject: [PATCH 083/133] Don't grab focus when attaching stats

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 7f6b955d4..6738874eb 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -117,7 +117,6 @@ class EditorStatsView extends ScrollView
 
   attach: ->
     @insertAfter @statusBar
-    @focus()
     @draw()
 
   detach: =>

From d597de6a7967957a066939ffbb5d132f0e490a07 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 08:34:11 -0800
Subject: [PATCH 084/133] Kill remaining serialization code

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 6738874eb..79358a662 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -24,18 +24,15 @@ class EditorStatsView extends ScrollView
       "#{d.getHours()}:#{mins}"
 
   @activate: (rootView, state) ->
-    @instance = new EditorStatsView(rootView, state?.eventLog)
+    @instance = new EditorStatsView(rootView)
 
   @content: (rootView) ->
     @div class: 'editor-stats-wrapper', tabindex: -1, =>
       @div class: 'editor-stats', outlet: 'editorStats'
 
-  @serialize: ->
-    @instance.serialize()
-
   eventLog: []
 
-  initialize: (@rootView, @eventLog = {}) ->
+  initialize: (@rootView) ->
     super
 
     @command 'core:cancel', @detach

From 3f7c7c1b9209b6e626efd8b70b88a930508e2ff3 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 08:42:54 -0800
Subject: [PATCH 085/133] soo many conflicts

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 79358a662..66d1818cc 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -37,6 +37,7 @@ class EditorStatsView extends ScrollView
 
     @command 'core:cancel', @detach
     @statusBar = @rootView.find '.status-bar'
+    @panes = @rootView.find('#panes')
     @css 'background', @statusBar.css('background')
 
     date = new Date(startDate)
@@ -92,7 +93,7 @@ class EditorStatsView extends ScrollView
       y.domain [0, max]
 
       bars.data(newdata).transition()
-        .attr('height', (d, i) ->  h - y(d.value) - 17)
+        .attr('height', (d, i) ->  h - y(d.value))
         .attr('y', (d, i) -> y(d.value))
 
       bars.classed('max', (d, i) -> d.value == max)
@@ -113,7 +114,7 @@ class EditorStatsView extends ScrollView
       @attach()
 
   attach: ->
-    @insertAfter @statusBar
+    @panes.append(@)
     @draw()
 
   detach: =>

From 3916f44d28a2b22909874e220db66c36ad4b05ae Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 08:46:35 -0800
Subject: [PATCH 086/133] append to the vertical element so its context appears
 global

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 66d1818cc..16f0e0c40 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -36,8 +36,7 @@ class EditorStatsView extends ScrollView
     super
 
     @command 'core:cancel', @detach
-    @statusBar = @rootView.find '.status-bar'
-    @panes = @rootView.find('#panes')
+    @statusBar = @rootView.find('.status-bar')
     @css 'background', @statusBar.css('background')
 
     date = new Date(startDate)
@@ -51,9 +50,9 @@ class EditorStatsView extends ScrollView
     @rootView.on 'mouseup', @track
 
   draw: ->
-    w = @statusBar.width()
+    w = @rootView.vertical.width()
     h = @.height()
-    [pt, pl, pb, pr] = [15,10,0,10]
+    [pt, pl, pb, pr] = [15,10,0,25]
 
     data = d3.entries @eventLog
 
@@ -114,7 +113,7 @@ class EditorStatsView extends ScrollView
       @attach()
 
   attach: ->
-    @panes.append(@)
+    @rootView.vertical.append(@)
     @draw()
 
   detach: =>

From 4f6f95ef4297f1181123890951d520aa5edc67e7 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 08:55:44 -0800
Subject: [PATCH 087/133] tweak dimensions

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 8 ++++----
 src/packages/editor-stats/stylesheets/editor-stats.css | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 16f0e0c40..4132792c6 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -3,7 +3,7 @@ d3 = require 'd3.v3'
 
 module.exports =
 class EditorStatsView extends ScrollView
-  hours = 4
+  hours = 6
 
   time = (date) ->
     date.setTime(date.getTime() + 6e4)
@@ -52,12 +52,12 @@ class EditorStatsView extends ScrollView
   draw: ->
     w = @rootView.vertical.width()
     h = @.height()
-    [pt, pl, pb, pr] = [15,10,0,25]
+    [pt, pl, pb, pr] = [15, 10, 3, 25]
 
     data = d3.entries @eventLog
 
     x.rangeBands [0, w - pl - pr], 0.2
-    y.range [h, 0]
+    y.range [h - pt - pb, 0]
     xaxis.tickSize(-h + pt + pb, 50)
 
     vis = d3.select(@editorStats.get(0)).append('svg')
@@ -92,7 +92,7 @@ class EditorStatsView extends ScrollView
       y.domain [0, max]
 
       bars.data(newdata).transition()
-        .attr('height', (d, i) ->  h - y(d.value))
+        .attr('height', (d, i) ->  h - y(d.value) - pt - pb)
         .attr('y', (d, i) -> y(d.value))
 
       bars.classed('max', (d, i) -> d.value == max)
diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
index 2f1da6516..781959197 100644
--- a/src/packages/editor-stats/stylesheets/editor-stats.css
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -1,6 +1,7 @@
 .editor-stats-wrapper {
   padding: 5px;
   box-sizing: border-box;
+  border-top: 1px solid rgba(255, 255, 255, 0.05);
 }
 
 .editor-stats {

From 3c654c67e280612bf1ef803fb154ac62f51fd414 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 08:59:17 -0800
Subject: [PATCH 088/133] use background-color just in case

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 +-
 src/packages/editor-stats/stylesheets/editor-stats.css | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 4132792c6..f3d56f4ba 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -37,7 +37,7 @@ class EditorStatsView extends ScrollView
 
     @command 'core:cancel', @detach
     @statusBar = @rootView.find('.status-bar')
-    @css 'background', @statusBar.css('background')
+    @css 'background', @statusBar.css('background-color')
 
     date = new Date(startDate)
     future = new Date(date.getTime() + (36e5 * hours))
diff --git a/src/packages/editor-stats/stylesheets/editor-stats.css b/src/packages/editor-stats/stylesheets/editor-stats.css
index 781959197..a7d5e3ff2 100644
--- a/src/packages/editor-stats/stylesheets/editor-stats.css
+++ b/src/packages/editor-stats/stylesheets/editor-stats.css
@@ -2,6 +2,7 @@
   padding: 5px;
   box-sizing: border-box;
   border-top: 1px solid rgba(255, 255, 255, 0.05);
+  z-index: 9999;
 }
 
 .editor-stats {

From 336c1299c59223d201268f47001efcec0745cb84 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 09:04:20 -0800
Subject: [PATCH 089/133] Start tracking stats before graph is opened

This allows the graph to open with data available
since the editor was launched.
---
 src/packages/editor-stats/index.coffee        | 11 ++-
 .../spec/editor-stats-spec.coffee             |  6 +-
 .../editor-stats/src/editor-stats-view.coffee | 77 ++++++-------------
 src/packages/editor-stats/src/stats.coffee    | 29 +++++++
 .../tree-view/spec/tree-view-spec.coffee      |  2 +-
 5 files changed, 67 insertions(+), 58 deletions(-)
 create mode 100644 src/packages/editor-stats/src/stats.coffee

diff --git a/src/packages/editor-stats/index.coffee b/src/packages/editor-stats/index.coffee
index 60a97582e..70b0871b1 100644
--- a/src/packages/editor-stats/index.coffee
+++ b/src/packages/editor-stats/index.coffee
@@ -1,4 +1,5 @@
 DeferredAtomPackage = require 'deferred-atom-package'
+Stats = require './src/stats'
 
 module.exports =
 class EditorStats extends DeferredAtomPackage
@@ -6,4 +7,12 @@ class EditorStats extends DeferredAtomPackage
 
   instanceClass: 'editor-stats/src/editor-stats-view'
 
-  onLoadEvent: (event, instance) -> instance.toggle()
+  stats: new Stats
+
+  activate: (rootView) ->
+    super
+
+    rootView.on 'keydown', => @stats.track()
+    rootView.on 'mouseup', => @stats.track()
+
+  onLoadEvent: (event, instance) -> instance.toggle(@stats)
diff --git a/src/packages/editor-stats/spec/editor-stats-spec.coffee b/src/packages/editor-stats/spec/editor-stats-spec.coffee
index b330f0073..3a5626b7b 100644
--- a/src/packages/editor-stats/spec/editor-stats-spec.coffee
+++ b/src/packages/editor-stats/spec/editor-stats-spec.coffee
@@ -23,9 +23,11 @@ describe "EditorStats", ->
     mins = if mins == 60 then '01' else mins + 1
     time  = "#{hours}:#{mins}"
 
-    atom.loadPackage('editor-stats').getInstance()
+    editorStatsPackage = atom.loadPackage('editor-stats')
+    editorStatsPackage.getInstance()
+    editorStats = editorStatsPackage.stats
+    editorStats.clear()
     editor = rootView.getActiveEditor()
-    editorStats = EditorStats.instance
 
   afterEach ->
     rootView.deactivate()
diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index f3d56f4ba..aaa975596 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -3,26 +3,6 @@ d3 = require 'd3.v3'
 
 module.exports =
 class EditorStatsView extends ScrollView
-  hours = 6
-
-  time = (date) ->
-    date.setTime(date.getTime() + 6e4)
-    hour = date.getHours()
-    minute = date.getMinutes()
-    "#{hour}:#{minute}"
-
-  startDate = new Date
-  x  = d3.scale.ordinal().domain d3.range(hours * 60)
-  y  = d3.scale.linear()
-
-  xaxis = d3.svg.axis().scale(x)
-    .orient('top')
-    .tickFormat (d) ->
-      d = new Date(startDate.getTime() + (d * 6e4))
-      mins = d.getMinutes()
-      mins = "0#{mins}" if mins < 9
-      "#{d.getHours()}:#{mins}"
-
   @activate: (rootView, state) ->
     @instance = new EditorStatsView(rootView)
 
@@ -30,8 +10,6 @@ class EditorStatsView extends ScrollView
     @div class: 'editor-stats-wrapper', tabindex: -1, =>
       @div class: 'editor-stats', outlet: 'editorStats'
 
-  eventLog: []
-
   initialize: (@rootView) ->
     super
 
@@ -39,26 +17,24 @@ class EditorStatsView extends ScrollView
     @statusBar = @rootView.find('.status-bar')
     @css 'background', @statusBar.css('background-color')
 
-    date = new Date(startDate)
-    future = new Date(date.getTime() + (36e5 * hours))
-    @eventLog[time(date)] = 0
-
-    while date < future
-      @eventLog[time(date)] = 0
-
-    @rootView.on 'keydown', @track
-    @rootView.on 'mouseup', @track
-
   draw: ->
+    @x ?= d3.scale.ordinal().domain d3.range(@stats.hours * 60)
+    @y ?= d3.scale.linear()
     w = @rootView.vertical.width()
-    h = @.height()
+    h = @height()
     [pt, pl, pb, pr] = [15, 10, 3, 25]
 
-    data = d3.entries @eventLog
+    data = d3.entries @stats.eventLog
 
-    x.rangeBands [0, w - pl - pr], 0.2
-    y.range [h - pt - pb, 0]
-    xaxis.tickSize(-h + pt + pb, 50)
+    @x.rangeBands [0, w - pl - pr], 0.2
+    @y.range [h - pt - pb, 0]
+
+    @xaxis ?= d3.svg.axis().scale(@x).orient('top').tickFormat (d) =>
+               d = new Date(@stats.startDate.getTime() + (d * 6e4))
+               mins = d.getMinutes()
+               mins = "0#{mins}" if mins < 9
+               "#{d.getHours()}:#{mins}"
+    @xaxis.tickSize(-h + pt + pb, 50)
 
     vis = d3.select(@editorStats.get(0)).append('svg')
       .attr('width', w)
@@ -68,7 +44,7 @@ class EditorStatsView extends ScrollView
 
     vis.append('g')
       .attr('class', 'x axis')
-      .call(xaxis)
+      .call(@xaxis)
     .selectAll('g')
       .style('display', (d, i) ->
         if i % 15 == 0 || i % 5 == 0 || i == data.length - 1
@@ -80,33 +56,26 @@ class EditorStatsView extends ScrollView
     bars = vis.selectAll('rect.bar')
       .data(data)
     .enter().append('rect')
-      .attr('x', (d, i) -> x i)
-      .attr('y', (d) -> y(d.value))
-      .attr('width', x.rangeBand())
+      .attr('x', (d, i) => @x i)
+      .attr('y', (d) => @y(d.value))
+      .attr('width', @x.rangeBand())
       .attr('class', 'bar')
 
     update = =>
-      newdata = d3.entries @eventLog
+      newdata = d3.entries @stats.eventLog
       max  = d3.max newdata, (d) -> d.value
 
-      y.domain [0, max]
+      @y.domain [0, max]
 
       bars.data(newdata).transition()
-        .attr('height', (d, i) ->  h - y(d.value) - pt - pb)
-        .attr('y', (d, i) -> y(d.value))
+        .attr('height', (d, i) =>  h - @y(d.value) - pt - pb)
+        .attr('y', (d, i) => @y(d.value))
 
       bars.classed('max', (d, i) -> d.value == max)
 
     setInterval update, 5000
 
-  track: =>
-    date = new Date
-    times = time date
-    @eventLog[times] ||= 0
-    @eventLog[times] += 1
-    @eventLog.shift() if @eventLog.length > (hours * 60)
-
-  toggle: ->
+  toggle: (@stats) ->
     if @hasParent()
       @detach()
     else
@@ -116,6 +85,6 @@ class EditorStatsView extends ScrollView
     @rootView.vertical.append(@)
     @draw()
 
-  detach: =>
+  detach: ->
     super()
     @rootView.focus()
diff --git a/src/packages/editor-stats/src/stats.coffee b/src/packages/editor-stats/src/stats.coffee
new file mode 100644
index 000000000..5e9c6700d
--- /dev/null
+++ b/src/packages/editor-stats/src/stats.coffee
@@ -0,0 +1,29 @@
+module.exports =
+class Stats
+  startDate: new Date
+  hours: 6
+  eventLog: []
+
+  constructor: ->
+    date = new Date(@startDate)
+    future = new Date(date.getTime() + (36e5 * @hours))
+    @eventLog[@time(date)] = 0
+
+    while date < future
+      @eventLog[@time(date)] = 0
+
+  clear: ->
+    @eventLog = []
+
+  track: ->
+    date = new Date
+    times = @time date
+    @eventLog[times] ?= 0
+    @eventLog[times] += 1
+    @eventLog.shift() if @eventLog.length > (@hours * 60)
+
+  time: (date) ->
+    date.setTime(date.getTime() + 6e4)
+    hour = date.getHours()
+    minute = date.getMinutes()
+    "#{hour}:#{minute}"
diff --git a/src/packages/tree-view/spec/tree-view-spec.coffee b/src/packages/tree-view/spec/tree-view-spec.coffee
index f0a83fe63..ab6d16d1a 100644
--- a/src/packages/tree-view/spec/tree-view-spec.coffee
+++ b/src/packages/tree-view/spec/tree-view-spec.coffee
@@ -761,7 +761,7 @@ describe "TreeView", ->
 
           expect(addDialog.miniEditor.getText().length).toBe 0
 
-    fdescribe "tree-view:move", ->
+    describe "tree-view:move", ->
       describe "when a file is selected", ->
         moveDialog = null
 

From 8c1fe35166d69b60a7a92291a1d387702c5455c0 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 09:12:49 -0800
Subject: [PATCH 090/133] Zero pad 9

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index aaa975596..165be44a7 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -32,7 +32,7 @@ class EditorStatsView extends ScrollView
     @xaxis ?= d3.svg.axis().scale(@x).orient('top').tickFormat (d) =>
                d = new Date(@stats.startDate.getTime() + (d * 6e4))
                mins = d.getMinutes()
-               mins = "0#{mins}" if mins < 9
+               mins = "0#{mins}" if mins <= 9
                "#{d.getHours()}:#{mins}"
     @xaxis.tickSize(-h + pt + pb, 50)
 

From 18f62498a176a949b1e2cdd4ac3f200f53d4d0f9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 09:22:36 -0800
Subject: [PATCH 091/133] Don't rely on status bar for background color

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 165be44a7..df4fc063c 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -14,8 +14,6 @@ class EditorStatsView extends ScrollView
     super
 
     @command 'core:cancel', @detach
-    @statusBar = @rootView.find('.status-bar')
-    @css 'background', @statusBar.css('background-color')
 
   draw: ->
     @x ?= d3.scale.ordinal().domain d3.range(@stats.hours * 60)

From a3ec402ca9dc8bdb23c9f75891086deab7affcc3 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 09:22:50 -0800
Subject: [PATCH 092/133] Only detach with toggle keybinding

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index df4fc063c..f66bdb0f6 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -13,8 +13,6 @@ class EditorStatsView extends ScrollView
   initialize: (@rootView) ->
     super
 
-    @command 'core:cancel', @detach
-
   draw: ->
     @x ?= d3.scale.ordinal().domain d3.range(@stats.hours * 60)
     @y ?= d3.scale.linear()

From 1cb81037a81e7a91d03fdb7d9d6cf657e8ce6be4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 09:27:32 -0800
Subject: [PATCH 093/133] :lipstick:

---
 src/packages/editor-stats/index.coffee | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/packages/editor-stats/index.coffee b/src/packages/editor-stats/index.coffee
index 70b0871b1..e743c0f18 100644
--- a/src/packages/editor-stats/index.coffee
+++ b/src/packages/editor-stats/index.coffee
@@ -4,9 +4,7 @@ Stats = require './src/stats'
 module.exports =
 class EditorStats extends DeferredAtomPackage
   loadEvents: ['editor-stats:toggle']
-
   instanceClass: 'editor-stats/src/editor-stats-view'
-
   stats: new Stats
 
   activate: (rootView) ->

From 47acd5912a6fc66b3c74538230b31de9294e95e9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 09:29:02 -0800
Subject: [PATCH 094/133] Remove unused variables

---
 src/packages/editor-stats/spec/editor-stats-spec.coffee | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/packages/editor-stats/spec/editor-stats-spec.coffee b/src/packages/editor-stats/spec/editor-stats-spec.coffee
index 3a5626b7b..ca274a252 100644
--- a/src/packages/editor-stats/spec/editor-stats-spec.coffee
+++ b/src/packages/editor-stats/spec/editor-stats-spec.coffee
@@ -3,7 +3,7 @@ RootView = require 'root-view'
 EditorStats = require 'editor-stats/src/editor-stats-view'
 
 describe "EditorStats", ->
-  [rootView, editorStats, editor, date, time] = []
+  [rootView, editorStats, time] = []
 
   simulateKeyUp = (key) ->
     e = $.Event "keydown", keyCode: key.charCodeAt(0)
@@ -27,7 +27,6 @@ describe "EditorStats", ->
     editorStatsPackage.getInstance()
     editorStats = editorStatsPackage.stats
     editorStats.clear()
-    editor = rootView.getActiveEditor()
 
   afterEach ->
     rootView.deactivate()

From 2788ee2715453df3b2bcd8f31b4acea0697778d8 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Fri, 1 Feb 2013 12:59:57 -0500
Subject: [PATCH 095/133] rename to

---
 src/app/atom.coffee                                          | 4 ++--
 themes/{atom-syntax-dark.css => atom-dark-syntax.css}        | 0
 themes/{atom-ui-dark => atom-dark-ui}/atom.css               | 0
 themes/{atom-ui-dark => atom-dark-ui}/autocomplete.css       | 0
 themes/{atom-ui-dark => atom-dark-ui}/command-logger.css     | 0
 themes/{atom-ui-dark => atom-dark-ui}/command-palette.css    | 0
 themes/{atom-ui-dark => atom-dark-ui}/command-panel.css      | 0
 themes/{atom-ui-dark => atom-dark-ui}/editor.css             | 0
 themes/{atom-ui-dark => atom-dark-ui}/fuzzy-finder.css       | 0
 themes/{atom-ui-dark => atom-dark-ui}/gists.css              | 0
 themes/{atom-ui-dark => atom-dark-ui}/go-to-line.css         | 0
 themes/{atom-ui-dark => atom-dark-ui}/grammar-view.css       | 0
 themes/{atom-ui-dark => atom-dark-ui}/markdown-preview.css   | 0
 themes/{atom-ui-dark => atom-dark-ui}/package.json           | 0
 themes/{atom-ui-dark => atom-dark-ui}/select-list.css        | 0
 themes/{atom-ui-dark => atom-dark-ui}/status-bar.css         | 0
 themes/{atom-ui-dark => atom-dark-ui}/symbols-view.css       | 0
 themes/{atom-ui-dark => atom-dark-ui}/tabs.css               | 0
 themes/{atom-ui-dark => atom-dark-ui}/tree-view.css          | 0
 themes/{atom-ui-dark => atom-dark-ui}/wrap-guide.css         | 0
 themes/{atom-syntax-light.css => atom-light-syntax.css}      | 0
 themes/{atom-ui-light => atom-light-ui}/atom.css             | 0
 themes/{atom-ui-light => atom-light-ui}/autocomplete.css     | 0
 themes/{atom-ui-light => atom-light-ui}/command-logger.css   | 0
 themes/{atom-ui-light => atom-light-ui}/command-palette.css  | 0
 themes/{atom-ui-light => atom-light-ui}/command-panel.css    | 0
 themes/{atom-ui-light => atom-light-ui}/editor.css           | 0
 themes/{atom-ui-light => atom-light-ui}/fuzzy-finder.css     | 0
 themes/{atom-ui-light => atom-light-ui}/gists.css            | 0
 themes/{atom-ui-light => atom-light-ui}/go-to-line.css       | 0
 themes/{atom-ui-light => atom-light-ui}/grammar-view.css     | 0
 themes/{atom-ui-light => atom-light-ui}/markdown-preview.css | 0
 themes/{atom-ui-light => atom-light-ui}/package.json         | 0
 themes/{atom-ui-light => atom-light-ui}/select-list.css      | 0
 themes/{atom-ui-light => atom-light-ui}/status-bar.css       | 0
 themes/{atom-ui-light => atom-light-ui}/symbols-view.css     | 0
 themes/{atom-ui-light => atom-light-ui}/tabs.css             | 0
 themes/{atom-ui-light => atom-light-ui}/tree-view.css        | 0
 themes/{atom-ui-light => atom-light-ui}/wrap-guide.css       | 0
 39 files changed, 2 insertions(+), 2 deletions(-)
 rename themes/{atom-syntax-dark.css => atom-dark-syntax.css} (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/atom.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/autocomplete.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/command-logger.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/command-palette.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/command-panel.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/editor.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/fuzzy-finder.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/gists.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/go-to-line.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/grammar-view.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/markdown-preview.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/package.json (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/select-list.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/status-bar.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/symbols-view.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/tabs.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/tree-view.css (100%)
 rename themes/{atom-ui-dark => atom-dark-ui}/wrap-guide.css (100%)
 rename themes/{atom-syntax-light.css => atom-light-syntax.css} (100%)
 rename themes/{atom-ui-light => atom-light-ui}/atom.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/autocomplete.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/command-logger.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/command-palette.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/command-panel.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/editor.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/fuzzy-finder.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/gists.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/go-to-line.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/grammar-view.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/markdown-preview.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/package.json (100%)
 rename themes/{atom-ui-light => atom-light-ui}/select-list.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/status-bar.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/symbols-view.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/tabs.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/tree-view.css (100%)
 rename themes/{atom-ui-light => atom-light-ui}/wrap-guide.css (100%)

diff --git a/src/app/atom.coffee b/src/app/atom.coffee
index 14c741cab..e5eb0197f 100644
--- a/src/app/atom.coffee
+++ b/src/app/atom.coffee
@@ -50,7 +50,7 @@ _.extend atom,
       .filter (name) -> not _.contains(disabledPackages, name)
 
   loadThemes: ->
-    themeNames = config.get("core.themes") ? ['atom-ui-dark', 'atom-syntax-dark']
+    themeNames = config.get("core.themes") ? ['atom-dark-ui', 'atom-dark-syntax']
     themeNames = [themeNames] unless _.isArray(themeNames)
     @loadTheme(themeName) for themeName in themeNames
     @loadUserStylesheet()
@@ -64,7 +64,7 @@ _.extend atom,
       applyStylesheet(userStylesheetPath, fs.read(userStylesheetPath), 'userTheme')
 
   getAtomThemeStylesheets: ->
-    themeNames = config.get("core.themes") ? ['atom-ui-dark', 'atom-syntax-dark']
+    themeNames = config.get("core.themes") ? ['atom-dark-ui', 'atom-dark-syntax']
     themeNames = [themeNames] unless _.isArray(themeNames)
 
   open: (args...) ->
diff --git a/themes/atom-syntax-dark.css b/themes/atom-dark-syntax.css
similarity index 100%
rename from themes/atom-syntax-dark.css
rename to themes/atom-dark-syntax.css
diff --git a/themes/atom-ui-dark/atom.css b/themes/atom-dark-ui/atom.css
similarity index 100%
rename from themes/atom-ui-dark/atom.css
rename to themes/atom-dark-ui/atom.css
diff --git a/themes/atom-ui-dark/autocomplete.css b/themes/atom-dark-ui/autocomplete.css
similarity index 100%
rename from themes/atom-ui-dark/autocomplete.css
rename to themes/atom-dark-ui/autocomplete.css
diff --git a/themes/atom-ui-dark/command-logger.css b/themes/atom-dark-ui/command-logger.css
similarity index 100%
rename from themes/atom-ui-dark/command-logger.css
rename to themes/atom-dark-ui/command-logger.css
diff --git a/themes/atom-ui-dark/command-palette.css b/themes/atom-dark-ui/command-palette.css
similarity index 100%
rename from themes/atom-ui-dark/command-palette.css
rename to themes/atom-dark-ui/command-palette.css
diff --git a/themes/atom-ui-dark/command-panel.css b/themes/atom-dark-ui/command-panel.css
similarity index 100%
rename from themes/atom-ui-dark/command-panel.css
rename to themes/atom-dark-ui/command-panel.css
diff --git a/themes/atom-ui-dark/editor.css b/themes/atom-dark-ui/editor.css
similarity index 100%
rename from themes/atom-ui-dark/editor.css
rename to themes/atom-dark-ui/editor.css
diff --git a/themes/atom-ui-dark/fuzzy-finder.css b/themes/atom-dark-ui/fuzzy-finder.css
similarity index 100%
rename from themes/atom-ui-dark/fuzzy-finder.css
rename to themes/atom-dark-ui/fuzzy-finder.css
diff --git a/themes/atom-ui-dark/gists.css b/themes/atom-dark-ui/gists.css
similarity index 100%
rename from themes/atom-ui-dark/gists.css
rename to themes/atom-dark-ui/gists.css
diff --git a/themes/atom-ui-dark/go-to-line.css b/themes/atom-dark-ui/go-to-line.css
similarity index 100%
rename from themes/atom-ui-dark/go-to-line.css
rename to themes/atom-dark-ui/go-to-line.css
diff --git a/themes/atom-ui-dark/grammar-view.css b/themes/atom-dark-ui/grammar-view.css
similarity index 100%
rename from themes/atom-ui-dark/grammar-view.css
rename to themes/atom-dark-ui/grammar-view.css
diff --git a/themes/atom-ui-dark/markdown-preview.css b/themes/atom-dark-ui/markdown-preview.css
similarity index 100%
rename from themes/atom-ui-dark/markdown-preview.css
rename to themes/atom-dark-ui/markdown-preview.css
diff --git a/themes/atom-ui-dark/package.json b/themes/atom-dark-ui/package.json
similarity index 100%
rename from themes/atom-ui-dark/package.json
rename to themes/atom-dark-ui/package.json
diff --git a/themes/atom-ui-dark/select-list.css b/themes/atom-dark-ui/select-list.css
similarity index 100%
rename from themes/atom-ui-dark/select-list.css
rename to themes/atom-dark-ui/select-list.css
diff --git a/themes/atom-ui-dark/status-bar.css b/themes/atom-dark-ui/status-bar.css
similarity index 100%
rename from themes/atom-ui-dark/status-bar.css
rename to themes/atom-dark-ui/status-bar.css
diff --git a/themes/atom-ui-dark/symbols-view.css b/themes/atom-dark-ui/symbols-view.css
similarity index 100%
rename from themes/atom-ui-dark/symbols-view.css
rename to themes/atom-dark-ui/symbols-view.css
diff --git a/themes/atom-ui-dark/tabs.css b/themes/atom-dark-ui/tabs.css
similarity index 100%
rename from themes/atom-ui-dark/tabs.css
rename to themes/atom-dark-ui/tabs.css
diff --git a/themes/atom-ui-dark/tree-view.css b/themes/atom-dark-ui/tree-view.css
similarity index 100%
rename from themes/atom-ui-dark/tree-view.css
rename to themes/atom-dark-ui/tree-view.css
diff --git a/themes/atom-ui-dark/wrap-guide.css b/themes/atom-dark-ui/wrap-guide.css
similarity index 100%
rename from themes/atom-ui-dark/wrap-guide.css
rename to themes/atom-dark-ui/wrap-guide.css
diff --git a/themes/atom-syntax-light.css b/themes/atom-light-syntax.css
similarity index 100%
rename from themes/atom-syntax-light.css
rename to themes/atom-light-syntax.css
diff --git a/themes/atom-ui-light/atom.css b/themes/atom-light-ui/atom.css
similarity index 100%
rename from themes/atom-ui-light/atom.css
rename to themes/atom-light-ui/atom.css
diff --git a/themes/atom-ui-light/autocomplete.css b/themes/atom-light-ui/autocomplete.css
similarity index 100%
rename from themes/atom-ui-light/autocomplete.css
rename to themes/atom-light-ui/autocomplete.css
diff --git a/themes/atom-ui-light/command-logger.css b/themes/atom-light-ui/command-logger.css
similarity index 100%
rename from themes/atom-ui-light/command-logger.css
rename to themes/atom-light-ui/command-logger.css
diff --git a/themes/atom-ui-light/command-palette.css b/themes/atom-light-ui/command-palette.css
similarity index 100%
rename from themes/atom-ui-light/command-palette.css
rename to themes/atom-light-ui/command-palette.css
diff --git a/themes/atom-ui-light/command-panel.css b/themes/atom-light-ui/command-panel.css
similarity index 100%
rename from themes/atom-ui-light/command-panel.css
rename to themes/atom-light-ui/command-panel.css
diff --git a/themes/atom-ui-light/editor.css b/themes/atom-light-ui/editor.css
similarity index 100%
rename from themes/atom-ui-light/editor.css
rename to themes/atom-light-ui/editor.css
diff --git a/themes/atom-ui-light/fuzzy-finder.css b/themes/atom-light-ui/fuzzy-finder.css
similarity index 100%
rename from themes/atom-ui-light/fuzzy-finder.css
rename to themes/atom-light-ui/fuzzy-finder.css
diff --git a/themes/atom-ui-light/gists.css b/themes/atom-light-ui/gists.css
similarity index 100%
rename from themes/atom-ui-light/gists.css
rename to themes/atom-light-ui/gists.css
diff --git a/themes/atom-ui-light/go-to-line.css b/themes/atom-light-ui/go-to-line.css
similarity index 100%
rename from themes/atom-ui-light/go-to-line.css
rename to themes/atom-light-ui/go-to-line.css
diff --git a/themes/atom-ui-light/grammar-view.css b/themes/atom-light-ui/grammar-view.css
similarity index 100%
rename from themes/atom-ui-light/grammar-view.css
rename to themes/atom-light-ui/grammar-view.css
diff --git a/themes/atom-ui-light/markdown-preview.css b/themes/atom-light-ui/markdown-preview.css
similarity index 100%
rename from themes/atom-ui-light/markdown-preview.css
rename to themes/atom-light-ui/markdown-preview.css
diff --git a/themes/atom-ui-light/package.json b/themes/atom-light-ui/package.json
similarity index 100%
rename from themes/atom-ui-light/package.json
rename to themes/atom-light-ui/package.json
diff --git a/themes/atom-ui-light/select-list.css b/themes/atom-light-ui/select-list.css
similarity index 100%
rename from themes/atom-ui-light/select-list.css
rename to themes/atom-light-ui/select-list.css
diff --git a/themes/atom-ui-light/status-bar.css b/themes/atom-light-ui/status-bar.css
similarity index 100%
rename from themes/atom-ui-light/status-bar.css
rename to themes/atom-light-ui/status-bar.css
diff --git a/themes/atom-ui-light/symbols-view.css b/themes/atom-light-ui/symbols-view.css
similarity index 100%
rename from themes/atom-ui-light/symbols-view.css
rename to themes/atom-light-ui/symbols-view.css
diff --git a/themes/atom-ui-light/tabs.css b/themes/atom-light-ui/tabs.css
similarity index 100%
rename from themes/atom-ui-light/tabs.css
rename to themes/atom-light-ui/tabs.css
diff --git a/themes/atom-ui-light/tree-view.css b/themes/atom-light-ui/tree-view.css
similarity index 100%
rename from themes/atom-ui-light/tree-view.css
rename to themes/atom-light-ui/tree-view.css
diff --git a/themes/atom-ui-light/wrap-guide.css b/themes/atom-light-ui/wrap-guide.css
similarity index 100%
rename from themes/atom-ui-light/wrap-guide.css
rename to themes/atom-light-ui/wrap-guide.css

From 1bf587b626bbb6b412c3debdc889416bf339598f Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 10:02:26 -0800
Subject: [PATCH 096/133] chain them methods

---
 .../editor-stats/src/editor-stats-view.coffee       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index f66bdb0f6..971a67f00 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -25,12 +25,13 @@ class EditorStatsView extends ScrollView
     @x.rangeBands [0, w - pl - pr], 0.2
     @y.range [h - pt - pb, 0]
 
-    @xaxis ?= d3.svg.axis().scale(@x).orient('top').tickFormat (d) =>
-               d = new Date(@stats.startDate.getTime() + (d * 6e4))
-               mins = d.getMinutes()
-               mins = "0#{mins}" if mins <= 9
-               "#{d.getHours()}:#{mins}"
-    @xaxis.tickSize(-h + pt + pb, 50)
+    @xaxis ?= d3.svg.axis().scale(@x).orient('top')
+      .tickSize(-h + pt + pb, 50)
+      .tickFormat (d) =>
+        d = new Date(@stats.startDate.getTime() + (d * 6e4))
+        mins = d.getMinutes()
+        mins = "0#{mins}" if mins <= 9
+        "#{d.getHours()}:#{mins}"
 
     vis = d3.select(@editorStats.get(0)).append('svg')
       .attr('width', w)

From 93183c8146388a02bac48ed7bbe8553d6f218db2 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 10:05:25 -0800
Subject: [PATCH 097/133] :lipstick:

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 971a67f00..9830eaa99 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -43,12 +43,12 @@ class EditorStatsView extends ScrollView
       .attr('class', 'x axis')
       .call(@xaxis)
     .selectAll('g')
-      .style('display', (d, i) ->
+      .classed('minor', (d, i) -> i % 5 == 0 && i % 15 != 0)
+      .style 'display', (d, i) ->
         if i % 15 == 0 || i % 5 == 0 || i == data.length - 1
           'block'
         else
           'none'
-      ).classed('minor', (d, i) -> i % 5 == 0 && i % 15 != 0)
 
     bars = vis.selectAll('rect.bar')
       .data(data)

From 8e1314107cb2cbf05388daab64f79bc70a5b9f18 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 10:10:06 -0800
Subject: [PATCH 098/133] we no longer need the minor tick size

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 9830eaa99..a709b3fb9 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -26,7 +26,7 @@ class EditorStatsView extends ScrollView
     @y.range [h - pt - pb, 0]
 
     @xaxis ?= d3.svg.axis().scale(@x).orient('top')
-      .tickSize(-h + pt + pb, 50)
+      .tickSize(-h + pt + pb)
       .tickFormat (d) =>
         d = new Date(@stats.startDate.getTime() + (d * 6e4))
         mins = d.getMinutes()

From b48a76a17bc5ec70691487b2392b9dc09edd9db5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 10:24:24 -0800
Subject: [PATCH 099/133] Clear interval when detaching

Otherwise an interval is leaker per each
attach event.
---
 src/packages/editor-stats/src/editor-stats-view.coffee | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index a709b3fb9..266b37456 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -14,6 +14,7 @@ class EditorStatsView extends ScrollView
     super
 
   draw: ->
+    @editorStats.empty()
     @x ?= d3.scale.ordinal().domain d3.range(@stats.hours * 60)
     @y ?= d3.scale.linear()
     w = @rootView.vertical.width()
@@ -70,7 +71,7 @@ class EditorStatsView extends ScrollView
 
       bars.classed('max', (d, i) -> d.value == max)
 
-    setInterval update, 5000
+    @updateInterval = setInterval update, 5000
 
   toggle: (@stats) ->
     if @hasParent()
@@ -84,4 +85,5 @@ class EditorStatsView extends ScrollView
 
   detach: ->
     super()
+    clearInterval(@updateInterval)
     @rootView.focus()

From cfed6859d52df13620b7bcfd4a0ead9b3120e180 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 10:28:42 -0800
Subject: [PATCH 100/133] Redraw graph on window resize events

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 266b37456..e72a6ede1 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -1,5 +1,7 @@
 ScrollView = require 'scroll-view'
 d3 = require 'd3.v3'
+_ = require 'underscore'
+$ = require 'jquery'
 
 module.exports =
 class EditorStatsView extends ScrollView
@@ -13,6 +15,8 @@ class EditorStatsView extends ScrollView
   initialize: (@rootView) ->
     super
 
+    @subscribe $(window), 'resize', _.debounce((=> @draw()), 300)
+
   draw: ->
     @editorStats.empty()
     @x ?= d3.scale.ordinal().domain d3.range(@stats.hours * 60)

From 7b472ed88897074e03e7106f6a64a2c289672e26 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 10:33:51 -0800
Subject: [PATCH 101/133] Immediately update after resize completes

---
 .../editor-stats/src/editor-stats-view.coffee | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index e72a6ede1..afa94c8e4 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -12,10 +12,18 @@ class EditorStatsView extends ScrollView
     @div class: 'editor-stats-wrapper', tabindex: -1, =>
       @div class: 'editor-stats', outlet: 'editorStats'
 
+  pt: 15
+  pl: 10
+  pb: 3
+  pr: 25
+
   initialize: (@rootView) ->
     super
 
-    @subscribe $(window), 'resize', _.debounce((=> @draw()), 300)
+    resizer = =>
+      @draw()
+      @update()
+    @subscribe $(window), 'resize', _.debounce(resizer, 300)
 
   draw: ->
     @editorStats.empty()
@@ -23,15 +31,13 @@ class EditorStatsView extends ScrollView
     @y ?= d3.scale.linear()
     w = @rootView.vertical.width()
     h = @height()
-    [pt, pl, pb, pr] = [15, 10, 3, 25]
-
     data = d3.entries @stats.eventLog
 
-    @x.rangeBands [0, w - pl - pr], 0.2
-    @y.range [h - pt - pb, 0]
+    @x.rangeBands [0, w - @pl - @pr], 0.2
+    @y.range [h - @pt - @pb, 0]
 
     @xaxis ?= d3.svg.axis().scale(@x).orient('top')
-      .tickSize(-h + pt + pb)
+      .tickSize(-h + @pt + @pb)
       .tickFormat (d) =>
         d = new Date(@stats.startDate.getTime() + (d * 6e4))
         mins = d.getMinutes()
@@ -42,7 +48,7 @@ class EditorStatsView extends ScrollView
       .attr('width', w)
       .attr('height', h)
     .append('g')
-      .attr('transform', "translate(#{pl},#{pt})")
+      .attr('transform', "translate(#{@pl},#{@pt})")
 
     vis.append('g')
       .attr('class', 'x axis')
@@ -55,7 +61,7 @@ class EditorStatsView extends ScrollView
         else
           'none'
 
-    bars = vis.selectAll('rect.bar')
+    @bars = vis.selectAll('rect.bar')
       .data(data)
     .enter().append('rect')
       .attr('x', (d, i) => @x i)
@@ -63,19 +69,17 @@ class EditorStatsView extends ScrollView
       .attr('width', @x.rangeBand())
       .attr('class', 'bar')
 
-    update = =>
-      newdata = d3.entries @stats.eventLog
-      max  = d3.max newdata, (d) -> d.value
+    @updateInterval = setInterval((=> @update()), 5000)
 
-      @y.domain [0, max]
-
-      bars.data(newdata).transition()
-        .attr('height', (d, i) =>  h - @y(d.value) - pt - pb)
-        .attr('y', (d, i) => @y(d.value))
-
-      bars.classed('max', (d, i) -> d.value == max)
-
-    @updateInterval = setInterval update, 5000
+  update: ->
+    newdata = d3.entries @stats.eventLog
+    max  = d3.max newdata, (d) -> d.value
+    @y.domain [0, max]
+    h = @height()
+    @bars.data(newdata).transition()
+      .attr('height', (d, i) =>  h - @y(d.value) - @pt - @pb)
+      .attr('y', (d, i) => @y(d.value))
+    @bars.classed('max', (d, i) -> d.value == max)
 
   toggle: (@stats) ->
     if @hasParent()

From b1b9a6914602e26c07dda1bcf9eba80ee7ee2ddf Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 10:34:31 -0800
Subject: [PATCH 102/133] :camel: case

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index afa94c8e4..121e969fc 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -72,11 +72,11 @@ class EditorStatsView extends ScrollView
     @updateInterval = setInterval((=> @update()), 5000)
 
   update: ->
-    newdata = d3.entries @stats.eventLog
-    max  = d3.max newdata, (d) -> d.value
+    newData = d3.entries @stats.eventLog
+    max  = d3.max newData, (d) -> d.value
     @y.domain [0, max]
     h = @height()
-    @bars.data(newdata).transition()
+    @bars.data(newData).transition()
       .attr('height', (d, i) =>  h - @y(d.value) - @pt - @pb)
       .attr('y', (d, i) => @y(d.value))
     @bars.classed('max', (d, i) -> d.value == max)

From 262cbcf168ac017bd63c9421fd01f3b3b9e5aae5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 10:36:53 -0800
Subject: [PATCH 103/133] Set initial render to be 100ms after attach

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 121e969fc..b4983c08a 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -69,6 +69,7 @@ class EditorStatsView extends ScrollView
       .attr('width', @x.rangeBand())
       .attr('class', 'bar')
 
+    setTimeout((=> @update()), 100)
     @updateInterval = setInterval((=> @update()), 5000)
 
   update: ->

From d7b09f0ba9baf5ddb7e30bddcf478c16039e5574 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 10:39:48 -0800
Subject: [PATCH 104/133] fix initial height so bars don't fly in from the top

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index b4983c08a..047c20f5b 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -65,6 +65,7 @@ class EditorStatsView extends ScrollView
       .data(data)
     .enter().append('rect')
       .attr('x', (d, i) => @x i)
+      .attr('height', (d, i) => h - @y(d.value) - @pt - @pb)
       .attr('y', (d) => @y(d.value))
       .attr('width', @x.rangeBand())
       .attr('class', 'bar')

From 341764e406c90ba541b89b9c100b069167023c39 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 10:45:35 -0800
Subject: [PATCH 105/133] we need to set this for the initial bar, otherwise
 there's a small jump at the beginning

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 047c20f5b..bd93cc1c3 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -32,9 +32,10 @@ class EditorStatsView extends ScrollView
     w = @rootView.vertical.width()
     h = @height()
     data = d3.entries @stats.eventLog
+    max  = d3.max data, (d) -> d.value
 
     @x.rangeBands [0, w - @pl - @pr], 0.2
-    @y.range [h - @pt - @pb, 0]
+    @y.domain([0, max]).range [h - @pt - @pb, 0]
 
     @xaxis ?= d3.svg.axis().scale(@x).orient('top')
       .tickSize(-h + @pt + @pb)

From 31aa1a947128635dcd084ffba7b021d95a3b91d4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 11:11:52 -0800
Subject: [PATCH 106/133] Add a little documentation

---
 .atom/packages/Readme.md | 1 +
 .atom/themes/Readme.md   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.atom/packages/Readme.md b/.atom/packages/Readme.md
index e69de29bb..540b6949c 100644
--- a/.atom/packages/Readme.md
+++ b/.atom/packages/Readme.md
@@ -0,0 +1 @@
+All packages in this directory will be automatically loaded
diff --git a/.atom/themes/Readme.md b/.atom/themes/Readme.md
index e69de29bb..dbedd5e13 100644
--- a/.atom/themes/Readme.md
+++ b/.atom/themes/Readme.md
@@ -0,0 +1 @@
+All themes in this directory will be automatically loaded

From 0484ecde7d106bcb3e4bc71f80fee196360cacd9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 11:12:58 -0800
Subject: [PATCH 107/133] Screaming README

---
 .atom/packages/{Readme.md => README.md} | 0
 .atom/themes/{Readme.md => README.md}   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename .atom/packages/{Readme.md => README.md} (100%)
 rename .atom/themes/{Readme.md => README.md} (100%)

diff --git a/.atom/packages/Readme.md b/.atom/packages/README.md
similarity index 100%
rename from .atom/packages/Readme.md
rename to .atom/packages/README.md
diff --git a/.atom/themes/Readme.md b/.atom/themes/README.md
similarity index 100%
rename from .atom/themes/Readme.md
rename to .atom/themes/README.md

From a51ccdee0660cd03854323cce8bfca04aeb31b1b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 11:13:22 -0800
Subject: [PATCH 108/133] Use valid css comment

---
 .atom/user.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.atom/user.css b/.atom/user.css
index f53057581..d63ad257e 100644
--- a/.atom/user.css
+++ b/.atom/user.css
@@ -1,8 +1,8 @@
-// User styles
+/* User styles */
 .tree-view {
 
 }
 
 .editor {
 
-}
\ No newline at end of file
+}

From 919ecb5a5659f20f8535ec10187a5f5759975abe Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 11:15:30 -0800
Subject: [PATCH 109/133] Add trailing newline

---
 .atom/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.atom/config.json b/.atom/config.json
index 89e425883..61420466f 100644
--- a/.atom/config.json
+++ b/.atom/config.json
@@ -8,4 +8,4 @@
       "IR_Black"
     ]
   }
-}
\ No newline at end of file
+}

From 5285ee2b762b353eb44c49019cbfe8b373731783 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 11:17:12 -0800
Subject: [PATCH 110/133] 16 is the new 12

---
 .atom/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.atom/config.json b/.atom/config.json
index 61420466f..f6b59770b 100644
--- a/.atom/config.json
+++ b/.atom/config.json
@@ -1,6 +1,6 @@
 {
   "editor": {
-    "fontSize": 12
+    "fontSize": 16
   },
   "core": {
     "themes": [

From a7b28f0dece35e06f8a6845750f981e35e254ba5 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Fri, 1 Feb 2013 14:42:49 -0500
Subject: [PATCH 111/133] updating default config.json to use atom-dark-ui and
 atom-dark-syntax

---
 .atom/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.atom/config.json b/.atom/config.json
index f6b59770b..50770e810 100644
--- a/.atom/config.json
+++ b/.atom/config.json
@@ -4,8 +4,8 @@
   },
   "core": {
     "themes": [
-      "Atom - Dark",
-      "IR_Black"
+      "atom-dark-ui",
+      "atom-dark-syntax"
     ]
   }
 }

From d7d473c3d69373194d6a225e6ef93939d3474e12 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 12:24:22 -0800
Subject: [PATCH 112/133] Doc styling new things in both light and dark themes

---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ac09dc3e8..0c48073b2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,6 +15,8 @@
     styleguides
   * Include thoughtfully worded [Jasmine](http://pivotal.github.com/jasmine/)
     specs
+  * Style new elements in both the light and dark default themes when
+    appropriate
   * New packages go in `src/packages/`
   * Add 3rd-party packages by submoduling in `vendor/packages/`
   * Commit messages are in the present tense

From 6734c2fb37f65c758cf92e6f2f8580ba81fb0c91 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 13:12:09 -0800
Subject: [PATCH 113/133] tone down the core colors slightly so they work in
 harmony with atom-dark-ui

---
 themes/atom-dark-syntax.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/atom-dark-syntax.css b/themes/atom-dark-syntax.css
index 106adb27b..fbac8c47c 100644
--- a/themes/atom-dark-syntax.css
+++ b/themes/atom-dark-syntax.css
@@ -1,6 +1,6 @@
 .editor, .editor .gutter {
-  background-color: #141414;
-  color: #EDEDED;
+  background-color: #1d1f21;
+  color: #c5c8c6;
 }
 
 .editor.focused .cursor {

From 5a96f3f8cd0040bbfb3f08d042e0927e539b7c4a Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 13:38:42 -0800
Subject: [PATCH 114/133] use etched style for pane edges

---
 themes/atom-dark-ui/atom.css | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/themes/atom-dark-ui/atom.css b/themes/atom-dark-ui/atom.css
index 2e5a1355b..ab9dbc365 100644
--- a/themes/atom-dark-ui/atom.css
+++ b/themes/atom-dark-ui/atom.css
@@ -16,11 +16,15 @@ html, body,
 }
 
 #root-view #panes .row > * + * {
-  border-left: 5px solid #515151;
+  -webkit-box-shadow:
+    -2px 0 rgba(0, 0, 0, 0.3),
+    -1px 0 rgba(255, 255, 255, 0.2);
 }
 
 #root-view #panes .column > * + * {
-  border-top: 5px solid #515151;
+  -webkit-box-shadow:
+    0 -2px rgba(0, 0, 0, 0.3),
+    0 -1px rgba(255, 255, 255, 0.2);
 }
 
 .error {

From edc982484ba20427f8f3ac3c7fdcc55dcc916a07 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 13:45:17 -0800
Subject: [PATCH 115/133] etched style for atom-light-ui

---
 themes/atom-light-ui/atom.css | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/themes/atom-light-ui/atom.css b/themes/atom-light-ui/atom.css
index 772922301..544df9367 100644
--- a/themes/atom-light-ui/atom.css
+++ b/themes/atom-light-ui/atom.css
@@ -5,11 +5,15 @@ html, body,
 }
 
 #root-view #panes .row > * + * {
-  border-left: 1px solid #989898;
+  -webkit-box-shadow:
+    -2px 0 rgba(0, 0, 0, 0.3),
+    -1px 0 rgba(255, 255, 255, 0.2);
 }
 
 #root-view #panes .column > * + * {
-  border-top: 1px solid #989898;
+  -webkit-box-shadow:
+    0 -2px rgba(0, 0, 0, 0.3),
+    0 -1px rgba(255, 255, 255, 0.2);
 }
 
 .error {

From 85ee0367ea36339a617e9a4cc2506dae4b6c5d56 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 13:45:39 -0800
Subject: [PATCH 116/133] tone down wrap guide in atom-dark

---
 themes/atom-dark-ui/wrap-guide.css  | 2 +-
 themes/atom-light-ui/wrap-guide.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/atom-dark-ui/wrap-guide.css b/themes/atom-dark-ui/wrap-guide.css
index 51660ea4c..8e7837e5d 100644
--- a/themes/atom-dark-ui/wrap-guide.css
+++ b/themes/atom-dark-ui/wrap-guide.css
@@ -1,3 +1,3 @@
 .wrap-guide {
-  background: rgba(150, 150, 150, .30);
+  background: rgba(150, 150, 150, 0.1);
 }
diff --git a/themes/atom-light-ui/wrap-guide.css b/themes/atom-light-ui/wrap-guide.css
index 51660ea4c..f4ff6269c 100644
--- a/themes/atom-light-ui/wrap-guide.css
+++ b/themes/atom-light-ui/wrap-guide.css
@@ -1,3 +1,3 @@
 .wrap-guide {
-  background: rgba(150, 150, 150, .30);
+  background: rgba(150, 150, 150, 0.3);
 }

From da6bbd70f978779da4a8f015d18cf71253b39c7f Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 14:09:52 -0800
Subject: [PATCH 117/133] cleanup look of command panel

---
 themes/atom-dark-ui/command-panel.css | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/themes/atom-dark-ui/command-panel.css b/themes/atom-dark-ui/command-panel.css
index 5e129e7cc..7d9d43376 100644
--- a/themes/atom-dark-ui/command-panel.css
+++ b/themes/atom-dark-ui/command-panel.css
@@ -1,18 +1,21 @@
 .command-panel {
   background-color: #303030;
   border: 1px solid #252525;
-  color: #ededed;
+  color: #dedede;
   padding: 5px;
 }
 
 .command-panel .preview-list {
   max-height: 300px;
   overflow: auto;
-  margin-bottom: 3px;
+  margin: 0 0 5px 10px;
   position: relative;
-  background-color: #000000;
-  color: #ededed;
+  background-color: #1e1e1e;
+  color: #C5C8C6;
   cursor: default;
+  border: 1px solid rgba(0, 0, 0, 0.5);
+  border-bottom: 1px solid rgba(180, 180, 180, 0.2);
+  border-right: 1px solid rgba(180, 180, 180, 0.2);
 }
 
 .command-panel .preview-count {
@@ -32,7 +35,7 @@
 
 .command-panel .preview-list .path {
   padding-left: 5px;
-  color: #00a693;
+  color: #fff;
 }
 
 .command-panel .preview-list .path:before {
@@ -73,6 +76,7 @@
   background-color: rgba(255, 255, 255, .2);
   -webkit-border-radius: 2px;
   padding: 1px;
+  color: yellow;
 }
 
 .command-panel .prompt-and-editor {

From ab8537f31759c43429f228c88f769346a30eb405 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Fri, 1 Feb 2013 14:13:09 -0800
Subject: [PATCH 118/133] Upgrade Jasmine to 1.3.1

---
 static/jasmine.css                 | 246 ++++--------
 vendor/jasmine-atom-reporter.js    | 489 +++++++++++++++++-------
 vendor/jasmine-console-reporter.js |   6 +-
 vendor/jasmine-focused.js          |  22 +-
 vendor/jasmine-helper.coffee       |   7 +-
 vendor/jasmine.js                  | 583 ++++++++++++++++++-----------
 6 files changed, 792 insertions(+), 561 deletions(-)

diff --git a/static/jasmine.css b/static/jasmine.css
index 6bf9eef9c..a1000e0fc 100644
--- a/static/jasmine.css
+++ b/static/jasmine.css
@@ -1,170 +1,80 @@
-.jasmine_reporter {
-  font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
-  font-size: 16px;
-}
+body { background-color: #eeeeee; padding: 0; overflow-y: scroll; }
 
-body {
-  background: #eee;
-}
+#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; }
+#HTMLReporter a { text-decoration: none; }
+#HTMLReporter a:hover { text-decoration: underline; }
+#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; }
+#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; }
+#HTMLReporter #jasmine_content { position: fixed; right: 100%; }
+#HTMLReporter .version { color: #aaaaaa; }
+#HTMLReporter .banner { margin-top: 14px; }
+#HTMLReporter .duration { color: #aaaaaa; float: right; }
+#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; }
+#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; }
+#HTMLReporter .symbolSummary li.passed { font-size: 14px; }
+#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; }
+#HTMLReporter .symbolSummary li.failed { line-height: 9px; }
+#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
+#HTMLReporter .symbolSummary li.skipped { font-size: 14px; }
+#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
+#HTMLReporter .symbolSummary li.pending { line-height: 11px; }
+#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
+#HTMLReporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; }
+#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
+#HTMLReporter .runningAlert { background-color: #666666; }
+#HTMLReporter .skippedAlert { background-color: #aaaaaa; }
+#HTMLReporter .skippedAlert:first-child { background-color: #333333; }
+#HTMLReporter .passingAlert { background-color: #a6b779; }
+#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; }
+#HTMLReporter .failingAlert { background-color: #cf867e; }
+#HTMLReporter .failingAlert:first-child { background-color: #b03911; }
+#HTMLReporter .results { margin-top: 5px }
+#HTMLReporter #details { display: none; }
+#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; }
+#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
+#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; }
+#HTMLReporter.showDetails .summary { display: none; }
+#HTMLReporter.showDetails #details { display: block; }
+#HTMLReporter .summaryMenuItem { font-weight: bold; }
+#HTMLReporter .summary { margin-top: 14px; }
+#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; }
+#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; }
+#HTMLReporter .summary .specSummary.failed a { color: #b03911; }
+#HTMLReporter .description + .suite { margin-top: 0; }
+#HTMLReporter .suite { margin-top: 14px; }
+#HTMLReporter .suite a { color: #333333; }
+#HTMLReporter #details .specDetail { margin-bottom: 28px; }
+#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; font-size: 14px; padding: 3px 9px }
+#HTMLReporter .resultMessage { padding-top: 5px; color: #333333; }
+#HTMLReporter .resultMessage span.result { display: block; }
+#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 500px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
 
-.jasmine_reporter a:visited, .jasmine_reporter a {
-  color: #303;
-}
-
-.jasmine_reporter a:hover, .jasmine_reporter a:active {
-  color: blue;
-}
-
-.run_spec {
-  float:right;
-  padding-right: 5px;
-  font-size: .8em;
-  text-decoration: none;
-}
-
-.jasmine_reporter {
-  margin: 0 5px;
-}
-
-.banner {
-  color: #303;
-  background-color: #fef;
-  padding: 5px;
-}
-
-.logo {
-  float: left;
-  font-size: 1.1em;
-  padding-left: 5px;
-}
-
-.logo .version {
-  font-size: .6em;
-  padding-left: 1em;
-}
-
-.runner.running {
-  background-color: yellow;
-}
-
-
-.options {
-  text-align: right;
-  font-size: .8em;
-}
-
-
-
-
-.suite {
-  border: 1px outset gray;
-  margin: 5px 0;
-  padding-left: 1em;
-}
-
-.suite .suite {
-  margin: 5px;
-}
-
-.suite.passed {
-  background-color: #dfd;
-}
-
-.suite.failed {
-  background-color: #fdd;
-}
-
-.spec {
-  margin: 5px;
-  padding-left: 1em;
-  clear: both;
-}
-
-.spec.failed, .spec.passed, .spec.skipped {
-  padding-bottom: 5px;
-  border: 1px solid gray;
-}
-
-.spec.failed {
-  background-color: #fbb;
-  border-color: red;
-}
-
-.spec.passed {
-  background-color: #bfb;
-  border-color: green;
-}
-
-.spec.skipped {
-  background-color: #bbb;
-}
-
-.messages {
-  border-left: 1px dashed gray;
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-.passed {
-  background-color: #cfc;
-  display: none;
-}
-
-.failed {
-  background-color: #fbb;
-}
-
-.skipped {
-  color: #777;
-  background-color: #eee;
-  display: none;
-}
-
-
-/*.resultMessage {*/
-  /*white-space: pre;*/
-/*}*/
-
-.resultMessage span.result {
-  display: block;
-  line-height: 2em;
-  color: black;
-}
-
-.resultMessage .mismatch {
-  color: black;
-}
-
-.stackTrace {
-  white-space: pre;
-  font-size: .8em;
-  margin-left: 10px;
-  max-height: 5em;
-  overflow: auto;
-  border: 1px inset red;
-  padding: 1em;
-  background: #eef;
-}
-
-.finished-at {
-  padding-left: 1em;
-  font-size: .6em;
-}
-
-.show-passed .passed,
-.show-skipped .skipped {
-  display: block;
-}
-
-
-#jasmine_content {
-  position:fixed;
-  right: 100%;
-}
-
-.runner {
-  border: 1px solid gray;
-  display: block;
-  margin: 5px 0;
-  padding: 2px 0 2px 10px;
-}
+#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ }
+#TrivialReporter a:visited, #TrivialReporter a { color: #303; }
+#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; }
+#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; }
+#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; }
+#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; }
+#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; }
+#TrivialReporter .runner.running { background-color: yellow; }
+#TrivialReporter .options { text-align: right; font-size: .8em; }
+#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; }
+#TrivialReporter .suite .suite { margin: 5px; }
+#TrivialReporter .suite.passed { background-color: #dfd; }
+#TrivialReporter .suite.failed { background-color: #fdd; }
+#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; }
+#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; }
+#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; }
+#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; }
+#TrivialReporter .spec.skipped { background-color: #bbb; }
+#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; }
+#TrivialReporter .passed { background-color: #cfc; display: none; }
+#TrivialReporter .failed { background-color: #fbb; }
+#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; }
+#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; }
+#TrivialReporter .resultMessage .mismatch { color: black; }
+#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; }
+#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; }
+#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; }
+#TrivialReporter #jasmine_content { position: fixed; right: 100%; }
+#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; }
diff --git a/vendor/jasmine-atom-reporter.js b/vendor/jasmine-atom-reporter.js
index dd896b373..d69ec1d9f 100644
--- a/vendor/jasmine-atom-reporter.js
+++ b/vendor/jasmine-atom-reporter.js
@@ -1,10 +1,6 @@
-jasmine.AtomReporter = function(doc) {
-  this.document = doc || document;
-  this.suiteDivs = {};
-  this.logRunningSpecs = false;
-};
+jasmine.AtomReporterHelpers = {};
 
-jasmine.AtomReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
+jasmine.AtomReporterHelpers.createDom = function(type, attrs, childrenVarArgs) {
   var el = document.createElement(type);
 
   for (var i = 2; i < arguments.length; i++) {
@@ -13,7 +9,9 @@ jasmine.AtomReporter.prototype.createDom = function(type, attrs, childrenVarArgs
     if (typeof child === 'string') {
       el.appendChild(document.createTextNode(child));
     } else {
-      if (child) { el.appendChild(child); }
+      if (child) {
+        el.appendChild(child);
+      }
     }
   }
 
@@ -28,117 +26,342 @@ jasmine.AtomReporter.prototype.createDom = function(type, attrs, childrenVarArgs
   return el;
 };
 
-jasmine.AtomReporter.prototype.reportRunnerStarting = function(runner) {
-  var showPassed, showSkipped;
-
-  this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' },
-      this.createDom('div', { className: 'banner' },
-        this.createDom('div', { className: 'logo' },
-            this.createDom('span', { className: 'title' }, "Jasmine"),
-            this.createDom('span', { className: 'version' }, runner.env.versionString())),
-        this.createDom('div', { className: 'options' },
-            "Show ",
-            showPassed = this.createDom('input', { id: "__jasmine_AtomReporter_showPassed__", type: 'checkbox' }),
-            this.createDom('label', { "for": "__jasmine_AtomReporter_showPassed__" }, " passed "),
-            showSkipped = this.createDom('input', { id: "__jasmine_AtomReporter_showSkipped__", type: 'checkbox' }),
-            this.createDom('label', { "for": "__jasmine_AtomReporter_showSkipped__" }, " skipped")
-            )
-          ),
-
-      this.runnerDiv = this.createDom('div', { className: 'runner running' },
-          this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
-          this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
-          this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, ""))
-      );
-
-  this.document.body.appendChild(this.outerDiv);
-
-  var suites = runner.suites();
-  for (var i = 0; i < suites.length; i++) {
-    var suite = suites[i];
-    var suiteDiv = this.createDom('div', { className: 'suite' },
-        this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"),
-        this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description));
-    this.suiteDivs[suite.id] = suiteDiv;
-    var parentDiv = this.outerDiv;
-    if (suite.parentSuite) {
-      parentDiv = this.suiteDivs[suite.parentSuite.id];
-    }
-    parentDiv.appendChild(suiteDiv);
-  }
-
-  this.startedAt = new Date();
-
-  var self = this;
-  showPassed.onclick = function(evt) {
-    if (showPassed.checked) {
-      self.outerDiv.className += ' show-passed';
-    } else {
-      self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
-    }
-  };
-
-  showSkipped.onclick = function(evt) {
-    if (showSkipped.checked) {
-      self.outerDiv.className += ' show-skipped';
-    } else {
-      self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
-    }
-  };
-};
-
-jasmine.AtomReporter.prototype.reportRunnerResults = function(runner) {
-  var results = runner.results();
-  var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
-  this.runnerDiv.setAttribute("class", className);
-  //do it twice for IE
-  this.runnerDiv.setAttribute("className", className);
-  var specs = runner.specs();
-  var specCount = 0;
-  for (var i = 0; i < specs.length; i++) {
-    if (this.specFilter(specs[i])) {
-      specCount++;
-    }
-  }
-  var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
-  message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
-  this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild);
-
-  this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
-};
-
-jasmine.AtomReporter.prototype.reportSuiteResults = function(suite) {
-  var results = suite.results();
-  var status = results.passed() ? 'passed' : 'failed';
-  if (results.totalCount === 0) { // todo: change this to check results.skipped
-    status = 'skipped';
-  }
-  this.suiteDivs[suite.id].className += " " + status;
-};
-
-jasmine.AtomReporter.prototype.reportSpecStarting = function(spec) {
-  if (this.logRunningSpecs) {
-    this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
-  }
-};
-
-jasmine.AtomReporter.prototype.reportSpecResults = function(spec) {
-  var results = spec.results();
+jasmine.AtomReporterHelpers.getSpecStatus = function(child) {
+  var results = child.results();
   var status = results.passed() ? 'passed' : 'failed';
   if (results.skipped) {
     status = 'skipped';
   }
-  var specDiv = this.createDom('div', { className: 'spec '  + status },
-      this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"),
+
+  return status;
+};
+
+jasmine.AtomReporterHelpers.appendToSummary = function(child, childElement) {
+  var parentDiv = this.dom.summary;
+  var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite';
+  var parent = child[parentSuite];
+
+  if (parent) {
+    if (typeof this.views.suites[parent.id] == 'undefined') {
+      this.views.suites[parent.id] = new jasmine.AtomReporter.SuiteView(parent, this.dom, this.views);
+    }
+    parentDiv = this.views.suites[parent.id].element;
+  }
+
+  parentDiv.appendChild(childElement);
+};
+
+
+jasmine.AtomReporterHelpers.addHelpers = function(ctor) {
+  for(var fn in jasmine.AtomReporterHelpers) {
+    ctor.prototype[fn] = jasmine.AtomReporterHelpers[fn];
+  }
+};
+
+jasmine.AtomReporter = function(_doc) {
+  var self = this;
+  var doc = _doc || window.document;
+
+  var reporterView;
+
+  var dom = {};
+
+  // Jasmine Reporter Public Interface
+  self.logRunningSpecs = false;
+
+  self.reportRunnerStarting = function(runner) {
+    var specs = runner.specs() || [];
+
+    if (specs.length == 0) {
+      return;
+    }
+
+    createReporterDom();
+    doc.body.appendChild(dom.reporter);
+
+    reporterView = new jasmine.AtomReporter.ReporterView(dom);
+    reporterView.addSpecs(specs, self.specFilter);
+  };
+
+  self.reportRunnerResults = function(runner) {
+    reporterView && reporterView.complete();
+  };
+
+  self.reportSuiteResults = function(suite) {
+    reporterView.suiteComplete(suite);
+  };
+
+  self.reportSpecStarting = function(spec) {
+    if (self.logRunningSpecs) {
+      self.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
+    }
+
+    reporterView.specStarted(spec);
+  };
+
+  self.reportSpecResults = function(spec) {
+    reporterView.specComplete(spec);
+  };
+
+  self.log = function() {
+    var console = jasmine.getGlobal().console;
+    if (console && console.log) {
+      if (console.log.apply) {
+        console.log.apply(console, arguments);
+      } else {
+        console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
+      }
+    }
+  };
+
+  self.specFilter = function(spec) {
+    return self.fSpecFilter(spec);
+  };
+
+  return self;
+
+  function createReporterDom() {
+    dom.reporter = self.createDom('div', { id: 'HTMLReporter', className: 'jasmine_reporter' },
+      dom.banner = self.createDom('div', { className: 'banner' },
+        self.createDom('span', { className: 'title' }, "Atom "),
+        self.createDom('span', { className: 'version' }, "0.0.0")),
+
+      dom.symbolSummary = self.createDom('ul', {className: 'symbolSummary'}),
+      dom.alert = self.createDom('div', {className: 'alert'}),
+      dom.results = self.createDom('div', {className: 'results'},
+        dom.summary = self.createDom('div', { className: 'summary' }),
+        dom.details = self.createDom('div', { id: 'details' }))
+    );
+  }
+
+  function searchWithCatch() {
+    var params = jasmine.AtomReporter.parameters(window.document);
+    var removed = false;
+    var i = 0;
+
+    while (!removed && i < params.length) {
+      if (params[i].match(/catch=/)) {
+        params.splice(i, 1);
+        removed = true;
+      }
+      i++;
+    }
+    if (jasmine.CATCH_EXCEPTIONS) {
+      params.push("catch=false");
+    }
+
+    return params.join("&");
+  }
+};
+jasmine.AtomReporter.parameters = function(doc) {
+  var paramStr = doc.location.search.substring(1);
+  var params = [];
+
+  if (paramStr.length > 0) {
+    params = paramStr.split('&');
+  }
+  return params;
+}
+jasmine.AtomReporter.sectionLink = function(sectionName) {
+  var link = '?';
+  var params = [];
+
+  if (sectionName) {
+    params.push('spec=' + encodeURIComponent(sectionName));
+  }
+  if (!jasmine.CATCH_EXCEPTIONS) {
+    params.push("catch=false");
+  }
+  if (params.length > 0) {
+    link += params.join("&");
+  }
+
+  return link;
+};
+jasmine.AtomReporterHelpers.addHelpers(jasmine.AtomReporter);
+jasmine.AtomReporter.ReporterView = function(dom) {
+  this.startedAt = new Date();
+  this.runningSpecCount = 0;
+  this.completeSpecCount = 0;
+  this.passedCount = 0;
+  this.failedCount = 0;
+  this.skippedCount = 0;
+
+  this.createResultsMenu = function() {
+    this.resultsMenu = this.createDom('span', {className: 'resultsMenu bar'},
+      this.summaryMenuItem = this.createDom('span', {className: 'summaryMenuItem'}, '0 specs'),
+      ' | ',
+      this.detailsMenuItem = this.createDom('span', {className: 'detailsMenuItem'}, '0 failing'),
+      this.currentSpecMenuItem = this.createDom('div', {className: 'currentSpecMenuItem'}, '')
+    );
+
+  };
+
+  this.addSpecs = function(specs, specFilter) {
+    this.totalSpecCount = specs.length;
+
+    this.views = {
+      specs: {},
+      suites: {}
+    };
+
+    for (var i = 0; i < specs.length; i++) {
+      var spec = specs[i];
+      this.views.specs[spec.id] = new jasmine.AtomReporter.SpecView(spec, dom, this.views);
+      if (specFilter(spec)) {
+        this.runningSpecCount++;
+      }
+    }
+  };
+
+  this.specStarted = function(spec) {
+    if (isUndefined(this.resultsMenu)) {
+      this.createResultsMenu();
+      dom.alert.appendChild(this.resultsMenu);
+    }
+
+    this.currentSpecMenuItem.innerHTML = spec.getFullName()
+  }
+
+  this.specComplete = function(spec) {
+    this.completeSpecCount++;
+
+    if (isUndefined(this.views.specs[spec.id])) {
+      this.views.specs[spec.id] = new jasmine.AtomReporter.SpecView(spec, dom);
+    }
+
+    var specView = this.views.specs[spec.id];
+
+    switch (specView.status()) {
+      case 'passed':
+        this.passedCount++;
+        break;
+
+      case 'failed':
+        this.failedCount++;
+        break;
+
+      case 'skipped':
+        this.skippedCount++;
+        break;
+    }
+
+    specView.refresh(spec);
+    this.refresh();
+  };
+
+  this.suiteComplete = function(suite) {
+    var suiteView = this.views.suites[suite.id];
+    if (isUndefined(suiteView)) {
+      return;
+    }
+    suiteView.refresh();
+  };
+
+  this.refresh = function() {
+    // summary info
+    this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount);
+    this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing";
+  };
+
+  this.complete = function() {
+    dom.alert.removeChild(this.resultsMenu);
+    var skippedSpecs = this.skippedCount == 0 ? "" : " (" + this.skippedCount + " specs skipped)"
+
+    if (this.failedCount === 0) {
+      dom.alert.appendChild(this.createDom('span', {className: 'passingAlert bar'}, this.passedCount + "/" + specPluralizedFor(this.totalSpecCount - this.skippedCount) + " passed" + skippedSpecs));
+    } else {
+      dom.alert.appendChild(this.createDom('span', {className: 'failingAlert bar'}, specPluralizedFor(this.failedCount) + " failed" + skippedSpecs));
+      showDetails();
+    }
+
+    dom.banner.appendChild(this.createDom('span', {className: 'duration'}, "finished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"));
+  };
+
+  return this;
+
+  function showDetails() {
+    if (dom.reporter.className.search(/showDetails/) === -1) {
+      dom.reporter.className += " showDetails";
+    }
+  }
+
+  function isUndefined(obj) {
+    return typeof obj === 'undefined';
+  }
+
+  function isDefined(obj) {
+    return !isUndefined(obj);
+  }
+
+  function specPluralizedFor(count) {
+    var str = count + " spec";
+    if (count > 1) {
+      str += "s"
+    }
+    return str;
+  }
+
+};
+
+jasmine.AtomReporterHelpers.addHelpers(jasmine.AtomReporter.ReporterView);
+
+
+jasmine.AtomReporter.SpecView = function(spec, dom, views) {
+  this.spec = spec;
+  this.dom = dom;
+  this.views = views;
+
+  this.symbol = this.createDom('li', { className: 'pending' });
+  this.dom.symbolSummary.appendChild(this.symbol);
+
+  this.summary = this.createDom('div', { className: 'specSummary' },
+    this.createDom('a', {
+      className: 'description',
+      href: jasmine.AtomReporter.sectionLink(this.spec.getFullName()),
+      title: this.spec.getFullName()
+    }, this.spec.description)
+  );
+
+  this.detail = this.createDom('div', { className: 'specDetail' },
       this.createDom('a', {
         className: 'description',
-        href: '?spec=' + encodeURIComponent(spec.getFullName()),
-        title: spec.getFullName()
-      }, spec.description));
+        href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
+        title: this.spec.getFullName()
+      }, this.spec.getFullName())
+  );
+};
 
+jasmine.AtomReporter.SpecView.prototype.status = function() {
+    return this.getSpecStatus(this.spec);
+};
 
-  var resultItems = results.getItems();
+jasmine.AtomReporter.SpecView.prototype.refresh = function() {
+  this.symbol.className = this.status();
+
+  switch (this.status()) {
+    case 'skipped':
+    case 'passed':
+      break;
+
+    case 'failed':
+      this.appendSummaryToSuiteDiv();
+      this.appendFailureDetail();
+      break;
+  }
+};
+
+jasmine.AtomReporter.SpecView.prototype.appendSummaryToSuiteDiv = function() {
+  this.summary.className += ' ' + this.status();
+  this.appendToSummary(this.spec, this.summary);
+};
+
+jasmine.AtomReporter.SpecView.prototype.appendFailureDetail = function() {
+  this.detail.className += ' ' + this.status();
+
+  var resultItems = this.spec.results().getItems();
   var messagesDiv = this.createDom('div', { className: 'messages' });
+
   for (var i = 0; i < resultItems.length; i++) {
     var result = resultItems[i];
 
@@ -154,37 +377,29 @@ jasmine.AtomReporter.prototype.reportSpecResults = function(spec) {
   }
 
   if (messagesDiv.childNodes.length > 0) {
-    specDiv.appendChild(messagesDiv);
-  }
-
-  this.suiteDivs[spec.suite.id].appendChild(specDiv);
-};
-
-jasmine.AtomReporter.prototype.log = function() {
-  var console = jasmine.getGlobal().console;
-  if (console && console.log) {
-    if (console.log.apply) {
-      console.log.apply(console, arguments);
-    } else {
-      console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
-    }
+    this.detail.appendChild(messagesDiv);
+    this.dom.details.appendChild(this.detail);
   }
 };
 
-jasmine.AtomReporter.prototype.getLocation = function() {
-  return this.document.location;
+jasmine.AtomReporterHelpers.addHelpers(jasmine.AtomReporter.SpecView);jasmine.AtomReporter.SuiteView = function(suite, dom, views) {
+  this.suite = suite;
+  this.dom = dom;
+  this.views = views;
+
+  this.element = this.createDom('div', { className: 'suite' },
+    this.createDom('a', { className: 'description', href: jasmine.AtomReporter.sectionLink(this.suite.getFullName()) }, this.suite.description)
+  );
+
+  this.appendToSummary(this.suite, this.element);
 };
 
-jasmine.AtomReporter.prototype.specFilter = function(spec) {
-  var paramMap = {};
-  var params = this.getLocation().search.substring(1).split('&');
-  for (var i = 0; i < params.length; i++) {
-    var p = params[i].split('=');
-    paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
-  }
-
-  if (!paramMap.spec) {
-    return true;
-  }
-  return spec.getFullName().indexOf(paramMap.spec) === 0;
+jasmine.AtomReporter.SuiteView.prototype.status = function() {
+  return this.getSpecStatus(this.suite);
 };
+
+jasmine.AtomReporter.SuiteView.prototype.refresh = function() {
+  this.element.className += " " + this.status();
+};
+
+jasmine.AtomReporterHelpers.addHelpers(jasmine.AtomReporter.SuiteView);
\ No newline at end of file
diff --git a/vendor/jasmine-console-reporter.js b/vendor/jasmine-console-reporter.js
index 571c84aaa..46fa75a29 100644
--- a/vendor/jasmine-console-reporter.js
+++ b/vendor/jasmine-console-reporter.js
@@ -45,9 +45,5 @@ jasmine.ConsoleReporter.prototype.reportSpecResults = function(spec) {
 };
 
 jasmine.ConsoleReporter.prototype.specFilter = function(spec) {
-  if (!jasmine.getEnv().focusPriority) {
-    return true;
-  }
-
-  return fSpecFilter(spec);
+  return true;
 };
diff --git a/vendor/jasmine-focused.js b/vendor/jasmine-focused.js
index c10b1b976..6ffb8b940 100644
--- a/vendor/jasmine-focused.js
+++ b/vendor/jasmine-focused.js
@@ -36,28 +36,12 @@ var fffit = function(description, specDefinitions) {
   fit(description, specDefinitions, 3);
 };
 
-var fSpecFilter = function(specOrSuite) {
+jasmine.AtomReporter.prototype.fSpecFilter = function(specOrSuite) {
   globalFocusPriority = jasmine.getEnv().focusPriority;
   if (!globalFocusPriority) return true;
   if (specOrSuite.focusPriority >= globalFocusPriority) return true;
 
   var parent = specOrSuite.parentSuite || specOrSuite.suite;
   if (!parent) return false;
-  return fSpecFilter(parent);
-}
-
-jasmine.AtomReporter.prototype.specFilter = function(spec) {
-  var paramMap = {};
-  var params = this.getLocation().search.substring(1).split('&');
-  for (var i = 0; i < params.length; i++) {
-    var p = params[i].split('=');
-    paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
-  }
-
-  if (!paramMap.spec && !jasmine.getEnv().focusPriority) {
-    return true;
-  }
-
-  return (spec.getFullName().indexOf(paramMap.spec) === 0) || fSpecFilter(spec);
-};
-
+  return this.fSpecFilter(parent);
+};
\ No newline at end of file
diff --git a/vendor/jasmine-helper.coffee b/vendor/jasmine-helper.coffee
index 0defd1990..d20f96573 100644
--- a/vendor/jasmine-helper.coffee
+++ b/vendor/jasmine-helper.coffee
@@ -8,9 +8,6 @@ module.exports.runSpecSuite = (specSuite, logErrors=true) ->
   $ = require 'jquery'
   TimeReporter = require 'time-reporter'
 
-  $('body').append $$ ->
-    @div id: 'jasmine-content'
-
   reporter = if atom.exitWhenDone
     new jasmine.ConsoleReporter(document, logErrors)
   else
@@ -22,4 +19,8 @@ module.exports.runSpecSuite = (specSuite, logErrors=true) ->
 
   jasmineEnv.addReporter(new TimeReporter())
   jasmineEnv.specFilter = (spec) -> reporter.specFilter(spec)
+
+  $('body').append $$ ->
+    @div id: 'jasmine-content'
+
   jasmineEnv.execute()
diff --git a/vendor/jasmine.js b/vendor/jasmine.js
index 2a5b5ad58..0da28abfa 100644
--- a/vendor/jasmine.js
+++ b/vendor/jasmine.js
@@ -1,8 +1,10 @@
-// Modified line 1769
-// -        if (self.blocks[self.index].abort) {
-// +        if (self.blocks[self.index] && self.blocks[self.index].abort) {
+// Modified line
+// - var isCommonJS = typeof window == "undefined" && typeof exports == "object";
+// +
+//
+// Modified method jasmine.WaitsForBlock.prototype.execute
 
-var isCommonJS = typeof window == "undefined";
+var isCommonJS = typeof window == "undefined" && typeof exports == "object";
 
 /**
  * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.
@@ -38,11 +40,23 @@ jasmine.VERBOSE = false;
  */
 jasmine.DEFAULT_UPDATE_INTERVAL = 250;
 
+/**
+ * Maximum levels of nesting that will be included when an object is pretty-printed
+ */
+jasmine.MAX_PRETTY_PRINT_DEPTH = 40;
+
 /**
  * Default timeout interval in milliseconds for waitsFor() blocks.
  */
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
 
+/**
+ * By default exceptions thrown in the context of a test are caught by jasmine so that it can run the remaining tests in the suite.
+ * Set to false to let the exception bubble up in the browser.
+ *
+ */
+jasmine.CATCH_EXCEPTIONS = true;
+
 jasmine.getGlobal = function() {
   function getGlobal() {
     return window;
@@ -200,6 +214,21 @@ jasmine.any = function(clazz) {
   return new jasmine.Matchers.Any(clazz);
 };
 
+/**
+ * Returns a matchable subset of a JSON object. For use in expectations when you don't care about all of the
+ * attributes on the object.
+ *
+ * @example
+ * // don't care about any other attributes than foo.
+ * expect(mySpy).toHaveBeenCalledWith(jasmine.objectContaining({foo: "bar"});
+ *
+ * @param sample {Object} sample
+ * @returns matchable object for the sample
+ */
+jasmine.objectContaining = function (sample) {
+    return new jasmine.Matchers.ObjectContaining(sample);
+};
+
 /**
  * Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks.
  *
@@ -452,7 +481,7 @@ jasmine.log = function() {
  * @see jasmine.createSpy
  * @param obj
  * @param methodName
- * @returns a Jasmine spy that can be chained with all spy methods
+ * @return {jasmine.Spy} a Jasmine spy that can be chained with all spy methods
  */
 var spyOn = function(obj, methodName) {
   return jasmine.getEnv().currentSpec.spyOn(obj, methodName);
@@ -497,6 +526,7 @@ if (isCommonJS) exports.xit = xit;
  * jasmine.Matchers functions.
  *
  * @param {Object} actual Actual value to test against and expected value
+ * @return {jasmine.Matchers}
  */
 var expect = function(actual) {
   return jasmine.getEnv().currentSpec.expect(actual);
@@ -856,6 +886,25 @@ jasmine.Env.prototype.xit = function(desc, func) {
   };
 };
 
+jasmine.Env.prototype.compareRegExps_ = function(a, b, mismatchKeys, mismatchValues) {
+  if (a.source != b.source)
+    mismatchValues.push("expected pattern /" + b.source + "/ is not equal to the pattern /" + a.source + "/");
+
+  if (a.ignoreCase != b.ignoreCase)
+    mismatchValues.push("expected modifier i was" + (b.ignoreCase ? " " : " not ") + "set and does not equal the origin modifier");
+
+  if (a.global != b.global)
+    mismatchValues.push("expected modifier g was" + (b.global ? " " : " not ") + "set and does not equal the origin modifier");
+
+  if (a.multiline != b.multiline)
+    mismatchValues.push("expected modifier m was" + (b.multiline ? " " : " not ") + "set and does not equal the origin modifier");
+
+  if (a.sticky != b.sticky)
+    mismatchValues.push("expected modifier y was" + (b.sticky ? " " : " not ") + "set and does not equal the origin modifier");
+
+  return (mismatchValues.length === 0);
+};
+
 jasmine.Env.prototype.compareObjects_ = function(a, b, mismatchKeys, mismatchValues) {
   if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) {
     return true;
@@ -918,11 +967,19 @@ jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) {
     return a.getTime() == b.getTime();
   }
 
-  if (a instanceof jasmine.Matchers.Any) {
+  if (a.jasmineMatches) {
+    return a.jasmineMatches(b);
+  }
+
+  if (b.jasmineMatches) {
+    return b.jasmineMatches(a);
+  }
+
+  if (a instanceof jasmine.Matchers.ObjectContaining) {
     return a.matches(b);
   }
 
-  if (b instanceof jasmine.Matchers.Any) {
+  if (b instanceof jasmine.Matchers.ObjectContaining) {
     return b.matches(a);
   }
 
@@ -934,6 +991,10 @@ jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) {
     return (a == b);
   }
 
+  if (a instanceof RegExp && b instanceof RegExp) {
+    return this.compareRegExps_(a, b, mismatchKeys, mismatchValues);
+  }
+
   if (typeof a === "object" && typeof b === "object") {
     return this.compareObjects_(a, b, mismatchKeys, mismatchValues);
   }
@@ -1001,10 +1062,15 @@ jasmine.Block = function(env, func, spec) {
 };
 
 jasmine.Block.prototype.execute = function(onComplete) {
-  try {
+  if (!jasmine.CATCH_EXCEPTIONS) {
     this.func.apply(this.spec);
-  } catch (e) {
-    this.spec.fail(e);
+  }
+  else {
+    try {
+      this.func.apply(this.spec);
+    } catch (e) {
+      this.spec.fail(e);
+    }
   }
   onComplete();
 };
@@ -1216,7 +1282,7 @@ jasmine.Matchers.prototype.toEqual = function(expected) {
 /**
  * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual
  * @param expected
- * @deprecated as of 1.0. Use not.toNotEqual() instead.
+ * @deprecated as of 1.0. Use not.toEqual() instead.
  */
 jasmine.Matchers.prototype.toNotEqual = function(expected) {
   return !this.env.equals_(this.actual, expected);
@@ -1262,6 +1328,17 @@ jasmine.Matchers.prototype.toBeNull = function() {
   return (this.actual === null);
 };
 
+/**
+ * Matcher that compares the actual to NaN.
+ */
+jasmine.Matchers.prototype.toBeNaN = function() {
+	this.message = function() {
+		return [ "Expected " + jasmine.pp(this.actual) + " to be NaN." ];
+	};
+
+	return (this.actual !== this.actual);
+};
+
 /**
  * Matcher that boolean not-nots the actual.
  */
@@ -1339,18 +1416,14 @@ jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
     throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
   }
   this.message = function() {
+    var invertedMessage = "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was.";
+    var positiveMessage = "";
     if (this.actual.callCount === 0) {
-      // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
-      return [
-        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
-        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
-      ];
+      positiveMessage = "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.";
     } else {
-      return [
-        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
-        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
-      ];
+      positiveMessage = "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but actual calls were " + jasmine.pp(this.actual.argsForCall).replace(/^\[ | \]$/g, '')
     }
+    return [positiveMessage, invertedMessage];
   };
 
   return this.env.contains_(this.actual.argsForCall, expectedArgs);
@@ -1389,7 +1462,7 @@ jasmine.Matchers.prototype.toContain = function(expected) {
  * Matcher that checks that the expected item is NOT an element in the actual Array.
  *
  * @param {Object} expected
- * @deprecated as of 1.0. Use not.toNotContain() instead.
+ * @deprecated as of 1.0. Use not.toContain() instead.
  */
 jasmine.Matchers.prototype.toNotContain = function(expected) {
   return !this.env.contains_(this.actual, expected);
@@ -1408,22 +1481,19 @@ jasmine.Matchers.prototype.toBeGreaterThan = function(expected) {
  * up to a given level of decimal precision (default 2).
  *
  * @param {Number} expected
- * @param {Number} precision
+ * @param {Number} precision, as number of decimal places
  */
 jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) {
   if (!(precision === 0)) {
     precision = precision || 2;
   }
-  var multiplier = Math.pow(10, precision);
-  var actual = Math.round(this.actual * multiplier);
-  expected = Math.round(expected * multiplier);
-  return expected == actual;
+  return Math.abs(expected - this.actual) < (Math.pow(10, -precision) / 2);
 };
 
 /**
  * Matcher that checks that the expected exception was thrown by the actual.
  *
- * @param {String} expected
+ * @param {String} [expected]
  */
 jasmine.Matchers.prototype.toThrow = function(expected) {
   var result = false;
@@ -1457,7 +1527,7 @@ jasmine.Matchers.Any = function(expectedClass) {
   this.expectedClass = expectedClass;
 };
 
-jasmine.Matchers.Any.prototype.matches = function(other) {
+jasmine.Matchers.Any.prototype.jasmineMatches = function(other) {
   if (this.expectedClass == String) {
     return typeof other == 'string' || other instanceof String;
   }
@@ -1477,10 +1547,222 @@ jasmine.Matchers.Any.prototype.matches = function(other) {
   return other instanceof this.expectedClass;
 };
 
-jasmine.Matchers.Any.prototype.toString = function() {
+jasmine.Matchers.Any.prototype.jasmineToString = function() {
   return '<jasmine.any(' + this.expectedClass + ')>';
 };
 
+jasmine.Matchers.ObjectContaining = function (sample) {
+  this.sample = sample;
+};
+
+jasmine.Matchers.ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) {
+  mismatchKeys = mismatchKeys || [];
+  mismatchValues = mismatchValues || [];
+
+  var env = jasmine.getEnv();
+
+  var hasKey = function(obj, keyName) {
+    return obj != null && obj[keyName] !== jasmine.undefined;
+  };
+
+  for (var property in this.sample) {
+    if (!hasKey(other, property) && hasKey(this.sample, property)) {
+      mismatchKeys.push("expected has key '" + property + "', but missing from actual.");
+    }
+    else if (!env.equals_(this.sample[property], other[property], mismatchKeys, mismatchValues)) {
+      mismatchValues.push("'" + property + "' was '" + (other[property] ? jasmine.util.htmlEscape(other[property].toString()) : other[property]) + "' in expected, but was '" + (this.sample[property] ? jasmine.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + "' in actual.");
+    }
+  }
+
+  return (mismatchKeys.length === 0 && mismatchValues.length === 0);
+};
+
+jasmine.Matchers.ObjectContaining.prototype.jasmineToString = function () {
+  return "<jasmine.objectContaining(" + jasmine.pp(this.sample) + ")>";
+};
+// Mock setTimeout, clearTimeout
+// Contributed by Pivotal Computer Systems, www.pivotalsf.com
+
+jasmine.FakeTimer = function() {
+  this.reset();
+
+  var self = this;
+  self.setTimeout = function(funcToCall, millis) {
+    self.timeoutsMade++;
+    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
+    return self.timeoutsMade;
+  };
+
+  self.setInterval = function(funcToCall, millis) {
+    self.timeoutsMade++;
+    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
+    return self.timeoutsMade;
+  };
+
+  self.clearTimeout = function(timeoutKey) {
+    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
+  };
+
+  self.clearInterval = function(timeoutKey) {
+    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
+  };
+
+};
+
+jasmine.FakeTimer.prototype.reset = function() {
+  this.timeoutsMade = 0;
+  this.scheduledFunctions = {};
+  this.nowMillis = 0;
+};
+
+jasmine.FakeTimer.prototype.tick = function(millis) {
+  var oldMillis = this.nowMillis;
+  var newMillis = oldMillis + millis;
+  this.runFunctionsWithinRange(oldMillis, newMillis);
+  this.nowMillis = newMillis;
+};
+
+jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
+  var scheduledFunc;
+  var funcsToRun = [];
+  for (var timeoutKey in this.scheduledFunctions) {
+    scheduledFunc = this.scheduledFunctions[timeoutKey];
+    if (scheduledFunc != jasmine.undefined &&
+        scheduledFunc.runAtMillis >= oldMillis &&
+        scheduledFunc.runAtMillis <= nowMillis) {
+      funcsToRun.push(scheduledFunc);
+      this.scheduledFunctions[timeoutKey] = jasmine.undefined;
+    }
+  }
+
+  if (funcsToRun.length > 0) {
+    funcsToRun.sort(function(a, b) {
+      return a.runAtMillis - b.runAtMillis;
+    });
+    for (var i = 0; i < funcsToRun.length; ++i) {
+      try {
+        var funcToRun = funcsToRun[i];
+        this.nowMillis = funcToRun.runAtMillis;
+        funcToRun.funcToCall();
+        if (funcToRun.recurring) {
+          this.scheduleFunction(funcToRun.timeoutKey,
+              funcToRun.funcToCall,
+              funcToRun.millis,
+              true);
+        }
+      } catch(e) {
+      }
+    }
+    this.runFunctionsWithinRange(oldMillis, nowMillis);
+  }
+};
+
+jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
+  this.scheduledFunctions[timeoutKey] = {
+    runAtMillis: this.nowMillis + millis,
+    funcToCall: funcToCall,
+    recurring: recurring,
+    timeoutKey: timeoutKey,
+    millis: millis
+  };
+};
+
+/**
+ * @namespace
+ */
+jasmine.Clock = {
+  defaultFakeTimer: new jasmine.FakeTimer(),
+
+  reset: function() {
+    jasmine.Clock.assertInstalled();
+    jasmine.Clock.defaultFakeTimer.reset();
+  },
+
+  tick: function(millis) {
+    jasmine.Clock.assertInstalled();
+    jasmine.Clock.defaultFakeTimer.tick(millis);
+  },
+
+  runFunctionsWithinRange: function(oldMillis, nowMillis) {
+    jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
+  },
+
+  scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
+    jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
+  },
+
+  useMock: function() {
+    if (!jasmine.Clock.isInstalled()) {
+      var spec = jasmine.getEnv().currentSpec;
+      spec.after(jasmine.Clock.uninstallMock);
+
+      jasmine.Clock.installMock();
+    }
+  },
+
+  installMock: function() {
+    jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
+  },
+
+  uninstallMock: function() {
+    jasmine.Clock.assertInstalled();
+    jasmine.Clock.installed = jasmine.Clock.real;
+  },
+
+  real: {
+    setTimeout: jasmine.getGlobal().setTimeout,
+    clearTimeout: jasmine.getGlobal().clearTimeout,
+    setInterval: jasmine.getGlobal().setInterval,
+    clearInterval: jasmine.getGlobal().clearInterval
+  },
+
+  assertInstalled: function() {
+    if (!jasmine.Clock.isInstalled()) {
+      throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
+    }
+  },
+
+  isInstalled: function() {
+    return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer;
+  },
+
+  installed: null
+};
+jasmine.Clock.installed = jasmine.Clock.real;
+
+//else for IE support
+jasmine.getGlobal().setTimeout = function(funcToCall, millis) {
+  if (jasmine.Clock.installed.setTimeout.apply) {
+    return jasmine.Clock.installed.setTimeout.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.setTimeout(funcToCall, millis);
+  }
+};
+
+jasmine.getGlobal().setInterval = function(funcToCall, millis) {
+  if (jasmine.Clock.installed.setInterval.apply) {
+    return jasmine.Clock.installed.setInterval.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.setInterval(funcToCall, millis);
+  }
+};
+
+jasmine.getGlobal().clearTimeout = function(timeoutKey) {
+  if (jasmine.Clock.installed.clearTimeout.apply) {
+    return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.clearTimeout(timeoutKey);
+  }
+};
+
+jasmine.getGlobal().clearInterval = function(timeoutKey) {
+  if (jasmine.Clock.installed.clearTimeout.apply) {
+    return jasmine.Clock.installed.clearInterval.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.clearInterval(timeoutKey);
+  }
+};
+
 /**
  * @constructor
  */
@@ -1609,10 +1891,6 @@ jasmine.PrettyPrinter = function() {
  * @param value
  */
 jasmine.PrettyPrinter.prototype.format = function(value) {
-  if (this.ppNestLevel_ > 40) {
-    throw new Error('jasmine.PrettyPrinter: format() nested too deeply!');
-  }
-
   this.ppNestLevel_++;
   try {
     if (value === jasmine.undefined) {
@@ -1621,8 +1899,8 @@ jasmine.PrettyPrinter.prototype.format = function(value) {
       this.emitScalar('null');
     } else if (value === jasmine.getGlobal()) {
       this.emitScalar('<global>');
-    } else if (value instanceof jasmine.Matchers.Any) {
-      this.emitScalar(value.toString());
+    } else if (value.jasmineToString) {
+      this.emitScalar(value.jasmineToString());
     } else if (typeof value === 'string') {
       this.emitString(value);
     } else if (jasmine.isSpy(value)) {
@@ -1655,6 +1933,7 @@ jasmine.PrettyPrinter.prototype.format = function(value) {
 
 jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) {
   for (var property in obj) {
+    if (!obj.hasOwnProperty(property)) continue;
     if (property == '__Jasmine_been_here_before__') continue;
     fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined &&
                                          obj.__lookupGetter__(property) !== null) : false);
@@ -1682,6 +1961,11 @@ jasmine.StringPrettyPrinter.prototype.emitString = function(value) {
 };
 
 jasmine.StringPrettyPrinter.prototype.emitArray = function(array) {
+  if (this.ppNestLevel_ > jasmine.MAX_PRETTY_PRINT_DEPTH) {
+    this.append("Array");
+    return;
+  }
+
   this.append('[ ');
   for (var i = 0; i < array.length; i++) {
     if (i > 0) {
@@ -1693,6 +1977,11 @@ jasmine.StringPrettyPrinter.prototype.emitArray = function(array) {
 };
 
 jasmine.StringPrettyPrinter.prototype.emitObject = function(obj) {
+  if (this.ppNestLevel_ > jasmine.MAX_PRETTY_PRINT_DEPTH) {
+    this.append("Object");
+    return;
+  }
+
   var self = this;
   this.append('{ ');
   var first = true;
@@ -1721,6 +2010,10 @@ jasmine.StringPrettyPrinter.prototype.append = function(value) {
 };
 jasmine.Queue = function(env) {
   this.env = env;
+
+  // parallel to blocks. each true value in this array means the block will
+  // get executed even if we abort
+  this.ensured = [];
   this.blocks = [];
   this.running = false;
   this.index = 0;
@@ -1728,15 +2021,30 @@ jasmine.Queue = function(env) {
   this.abort = false;
 };
 
-jasmine.Queue.prototype.addBefore = function(block) {
+jasmine.Queue.prototype.addBefore = function(block, ensure) {
+  if (ensure === jasmine.undefined) {
+    ensure = false;
+  }
+
   this.blocks.unshift(block);
+  this.ensured.unshift(ensure);
 };
 
-jasmine.Queue.prototype.add = function(block) {
+jasmine.Queue.prototype.add = function(block, ensure) {
+  if (ensure === jasmine.undefined) {
+    ensure = false;
+  }
+
   this.blocks.push(block);
+  this.ensured.push(ensure);
 };
 
-jasmine.Queue.prototype.insertNext = function(block) {
+jasmine.Queue.prototype.insertNext = function(block, ensure) {
+  if (ensure === jasmine.undefined) {
+    ensure = false;
+  }
+
+  this.ensured.splice((this.index + this.offset + 1), 0, ensure);
   this.blocks.splice((this.index + this.offset + 1), 0, block);
   this.offset++;
 };
@@ -1760,7 +2068,7 @@ jasmine.Queue.prototype.next_ = function() {
   while (goAgain) {
     goAgain = false;
 
-    if (self.index < self.blocks.length && !this.abort) {
+    if (self.index < self.blocks.length && !(this.abort && !this.ensured[self.index])) {
       var calledSynchronously = true;
       var completedSynchronously = false;
 
@@ -2051,7 +2359,7 @@ jasmine.Spec.prototype.finish = function(onComplete) {
 
 jasmine.Spec.prototype.after = function(doAfter) {
   if (this.queue.isRunning()) {
-    this.queue.add(new jasmine.Block(this.env, doAfter, this));
+    this.queue.add(new jasmine.Block(this.env, doAfter, this), true);
   } else {
     this.afterCallbacks.unshift(doAfter);
   }
@@ -2089,15 +2397,15 @@ jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() {
     this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this));
   }
   for (i = 0; i < this.afterCallbacks.length; i++) {
-    this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this));
+    this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this), true);
   }
   for (suite = this.suite; suite; suite = suite.parentSuite) {
     for (i = 0; i < suite.after_.length; i++) {
-      this.queue.add(new jasmine.Block(this.env, suite.after_[i], this));
+      this.queue.add(new jasmine.Block(this.env, suite.after_[i], this), true);
     }
   }
   for (i = 0; i < runner.after_.length; i++) {
-    this.queue.add(new jasmine.Block(this.env, runner.after_[i], this));
+    this.queue.add(new jasmine.Block(this.env, runner.after_[i], this), true);
   }
 };
 
@@ -2351,192 +2659,9 @@ jasmine.WaitsForBlock.MultiCompletion.prototype.buildCompletionFunction = functi
   };
 };
 
-// Mock setTimeout, clearTimeout
-// Contributed by Pivotal Computer Systems, www.pivotalsf.com
-
-jasmine.FakeTimer = function() {
-  this.reset();
-
-  var self = this;
-  self.setTimeout = function(funcToCall, millis) {
-    self.timeoutsMade++;
-    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
-    return self.timeoutsMade;
-  };
-
-  self.setInterval = function(funcToCall, millis) {
-    self.timeoutsMade++;
-    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
-    return self.timeoutsMade;
-  };
-
-  self.clearTimeout = function(timeoutKey) {
-    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
-  };
-
-  self.clearInterval = function(timeoutKey) {
-    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
-  };
-
-};
-
-jasmine.FakeTimer.prototype.reset = function() {
-  this.timeoutsMade = 0;
-  this.scheduledFunctions = {};
-  this.nowMillis = 0;
-};
-
-jasmine.FakeTimer.prototype.tick = function(millis) {
-  var oldMillis = this.nowMillis;
-  var newMillis = oldMillis + millis;
-  this.runFunctionsWithinRange(oldMillis, newMillis);
-  this.nowMillis = newMillis;
-};
-
-jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
-  var scheduledFunc;
-  var funcsToRun = [];
-  for (var timeoutKey in this.scheduledFunctions) {
-    scheduledFunc = this.scheduledFunctions[timeoutKey];
-    if (scheduledFunc != jasmine.undefined &&
-        scheduledFunc.runAtMillis >= oldMillis &&
-        scheduledFunc.runAtMillis <= nowMillis) {
-      funcsToRun.push(scheduledFunc);
-      this.scheduledFunctions[timeoutKey] = jasmine.undefined;
-    }
-  }
-
-  if (funcsToRun.length > 0) {
-    funcsToRun.sort(function(a, b) {
-      return a.runAtMillis - b.runAtMillis;
-    });
-    for (var i = 0; i < funcsToRun.length; ++i) {
-      try {
-        var funcToRun = funcsToRun[i];
-        this.nowMillis = funcToRun.runAtMillis;
-        funcToRun.funcToCall();
-        if (funcToRun.recurring) {
-          this.scheduleFunction(funcToRun.timeoutKey,
-              funcToRun.funcToCall,
-              funcToRun.millis,
-              true);
-        }
-      } catch(e) {
-      }
-    }
-    this.runFunctionsWithinRange(oldMillis, nowMillis);
-  }
-};
-
-jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
-  this.scheduledFunctions[timeoutKey] = {
-    runAtMillis: this.nowMillis + millis,
-    funcToCall: funcToCall,
-    recurring: recurring,
-    timeoutKey: timeoutKey,
-    millis: millis
-  };
-};
-
-/**
- * @namespace
- */
-jasmine.Clock = {
-  defaultFakeTimer: new jasmine.FakeTimer(),
-
-  reset: function() {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.defaultFakeTimer.reset();
-  },
-
-  tick: function(millis) {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.defaultFakeTimer.tick(millis);
-  },
-
-  runFunctionsWithinRange: function(oldMillis, nowMillis) {
-    jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
-  },
-
-  scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
-    jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
-  },
-
-  useMock: function() {
-    if (!jasmine.Clock.isInstalled()) {
-      var spec = jasmine.getEnv().currentSpec;
-      spec.after(jasmine.Clock.uninstallMock);
-
-      jasmine.Clock.installMock();
-    }
-  },
-
-  installMock: function() {
-    jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
-  },
-
-  uninstallMock: function() {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.installed = jasmine.Clock.real;
-  },
-
-  real: {
-    setTimeout: jasmine.getGlobal().setTimeout,
-    clearTimeout: jasmine.getGlobal().clearTimeout,
-    setInterval: jasmine.getGlobal().setInterval,
-    clearInterval: jasmine.getGlobal().clearInterval
-  },
-
-  assertInstalled: function() {
-    if (!jasmine.Clock.isInstalled()) {
-      throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
-    }
-  },
-
-  isInstalled: function() {
-    return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer;
-  },
-
-  installed: null
-};
-jasmine.Clock.installed = jasmine.Clock.real;
-
-//else for IE support
-jasmine.getGlobal().setTimeout = function(funcToCall, millis) {
-  if (jasmine.Clock.installed.setTimeout.apply) {
-    return jasmine.Clock.installed.setTimeout.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.setTimeout(funcToCall, millis);
-  }
-};
-
-jasmine.getGlobal().setInterval = function(funcToCall, millis) {
-  if (jasmine.Clock.installed.setInterval.apply) {
-    return jasmine.Clock.installed.setInterval.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.setInterval(funcToCall, millis);
-  }
-};
-
-jasmine.getGlobal().clearTimeout = function(timeoutKey) {
-  if (jasmine.Clock.installed.clearTimeout.apply) {
-    return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.clearTimeout(timeoutKey);
-  }
-};
-
-jasmine.getGlobal().clearInterval = function(timeoutKey) {
-  if (jasmine.Clock.installed.clearTimeout.apply) {
-    return jasmine.Clock.installed.clearInterval.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.clearInterval(timeoutKey);
-  }
-};
-
 jasmine.version_= {
   "major": 1,
-  "minor": 1,
-  "build": 0,
-  "revision": 1315677058
+  "minor": 3,
+  "build": 1,
+  "revision": 1354556913
 };

From 0a46020914886e16de177bc06fde325dec94b185 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 14:18:52 -0800
Subject: [PATCH 119/133] line up results with input box

---
 themes/atom-dark-ui/command-panel.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/atom-dark-ui/command-panel.css b/themes/atom-dark-ui/command-panel.css
index 7d9d43376..6d0f9775b 100644
--- a/themes/atom-dark-ui/command-panel.css
+++ b/themes/atom-dark-ui/command-panel.css
@@ -8,7 +8,7 @@
 .command-panel .preview-list {
   max-height: 300px;
   overflow: auto;
-  margin: 0 0 5px 10px;
+  margin: 0 1px 5px 10px;
   position: relative;
   background-color: #1e1e1e;
   color: #C5C8C6;

From 52285e4c7897f441986b4b93317b4e12fff5b131 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 14:19:39 -0800
Subject: [PATCH 120/133] delete key defeats the :octocat:

---
 themes/atom-dark-ui/atom.css | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/themes/atom-dark-ui/atom.css b/themes/atom-dark-ui/atom.css
index ab9dbc365..73a667189 100644
--- a/themes/atom-dark-ui/atom.css
+++ b/themes/atom-dark-ui/atom.css
@@ -4,17 +4,6 @@ html, body,
   background-color: #333333;
 }
 
-#root-view #panes:before {
-  display: block;
-  content: "\f208";
-  font-family: 'Octicons Regular';
-  color: #303030;
-  -webkit-font-smoothing: antialiased;
-  font-size: 100vmin;
-  line-height: 100vmin;
-  text-align: center;
-}
-
 #root-view #panes .row > * + * {
   -webkit-box-shadow:
     -2px 0 rgba(0, 0, 0, 0.3),

From 4e60bf6501dc2eb7fc3d11bd52ebfe8dcf92e88d Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Fri, 1 Feb 2013 14:46:05 -0800
Subject: [PATCH 121/133] Fix focused spec bug

---
 vendor/jasmine-atom-reporter.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/vendor/jasmine-atom-reporter.js b/vendor/jasmine-atom-reporter.js
index d69ec1d9f..6feb1dd41 100644
--- a/vendor/jasmine-atom-reporter.js
+++ b/vendor/jasmine-atom-reporter.js
@@ -215,12 +215,9 @@ jasmine.AtomReporter.ReporterView = function(dom) {
   };
 
   this.specStarted = function(spec) {
-    if (isUndefined(this.resultsMenu)) {
-      this.createResultsMenu();
-      dom.alert.appendChild(this.resultsMenu);
+    if (this.currentSpecMenuItem) {
+      this.currentSpecMenuItem.innerHTML = spec.getFullName()
     }
-
-    this.currentSpecMenuItem.innerHTML = spec.getFullName()
   }
 
   this.specComplete = function(spec) {
@@ -259,6 +256,11 @@ jasmine.AtomReporter.ReporterView = function(dom) {
   };
 
   this.refresh = function() {
+    if (isUndefined(this.resultsMenu)) {
+      this.createResultsMenu();
+      dom.alert.appendChild(this.resultsMenu);
+    }
+
     // summary info
     this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount);
     this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing";

From 672a4a17a7ebabd92cb205b2307859a954f2d070 Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Fri, 1 Feb 2013 15:22:08 -0800
Subject: [PATCH 122/133] kill the svg namespace, d3 uses createElementNS

---
 .../command-logger/src/command-logger-view.coffee      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/packages/command-logger/src/command-logger-view.coffee b/src/packages/command-logger/src/command-logger-view.coffee
index ce8c8dbbb..9dfa03360 100644
--- a/src/packages/command-logger/src/command-logger-view.coffee
+++ b/src/packages/command-logger/src/command-logger-view.coffee
@@ -144,10 +144,10 @@ class CommandLoggerView extends ScrollView
             .append('div')
             .style('width', "#{w}px")
             .style('height', "#{h}px")
-            .append('svg:svg')
+            .append('svg')
             .attr('width', w)
             .attr('height', h)
-            .append('svg:g')
+            .append('g')
             .attr('transform', 'translate(.5,.5)')
 
     nodes = treemap.nodes(root).filter((d) -> not d.children)
@@ -155,17 +155,17 @@ class CommandLoggerView extends ScrollView
     cell = svg.selectAll('g')
               .data(nodes)
               .enter()
-              .append('svg:g')
+              .append('g')
               .attr('class', 'node')
               .attr('transform', (d) -> "translate(#{d.x},#{d.y})")
               .on('click', (d) -> if node is d.parent then zoom(root) else zoom(d.parent))
 
-    cell.append('svg:rect')
+    cell.append('rect')
         .attr('width', (d) -> d.dx - 1)
         .attr('height', (d) -> d.dy - 1)
         .style('fill', (d) -> color(d.parent.name))
 
-    cell.append('svg:foreignObject')
+    cell.append('foreignObject')
         .attr('width', (d) -> d.dx - 1)
         .attr('height', (d) -> d.dy - 1)
         .attr('class', 'foreign-object')

From e54c3d8fbbde8f8bac08192a2ca9caf719f25f7e Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Fri, 1 Feb 2013 18:40:53 -0500
Subject: [PATCH 123/133] adding is-focused to body, and styling light ui

---
 spec/app/window-spec.coffee        |  8 ++++++++
 src/app/window.coffee              |  1 +
 themes/atom-light-ui/tabs.css      | 14 ++++++++++++-
 themes/atom-light-ui/tree-view.css | 32 ++++++++++++++++++++++++++----
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/spec/app/window-spec.coffee b/spec/app/window-spec.coffee
index 2471d6cc3..c8a61920b 100644
--- a/spec/app/window-spec.coffee
+++ b/spec/app/window-spec.coffee
@@ -13,6 +13,14 @@ describe "Window", ->
     atom.setRootViewStateForPath(rootView.project.getPath(), null)
     $(window).off 'beforeunload'
 
+  describe "window is loaded", ->
+    it "has .is-focused on the body tag", ->
+      expect($("body").hasClass("is-focused")).toBe true
+
+    it "doesn't have .is-focused on the window blur", ->
+      $(window).blur()
+      expect($("body").hasClass("is-focused")).toBe false
+
   describe ".close()", ->
     it "is triggered by the 'core:close' event", ->
       spyOn window, 'close'
diff --git a/src/app/window.coffee b/src/app/window.coffee
index d990b28a4..d0cad8b32 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -28,6 +28,7 @@ windowAdditions =
 
     $(window).on 'core:close', => @close()
     $(window).command 'window:close', => @close()
+    $(window).on 'focus blur', => $("body").toggleClass("is-focused")
 
   # This method is intended only to be run when starting a normal application
   # Note: RootView assigns itself on window on initialization so that
diff --git a/themes/atom-light-ui/tabs.css b/themes/atom-light-ui/tabs.css
index 9e909e32d..ffa248c8f 100644
--- a/themes/atom-light-ui/tabs.css
+++ b/themes/atom-light-ui/tabs.css
@@ -6,7 +6,7 @@
   margin-bottom: 1px;
 }
 
-.tab {
+.is-focused .tab {
   cursor: default;
   padding: 2px 21px 2px 9px;
   background-image: -webkit-linear-gradient(#e0e0e0, #bfbfbf);
@@ -17,6 +17,18 @@
   color: #323232;
 }
 
+.tab {
+  cursor: default;
+  padding: 2px 21px 2px 9px;
+  background-image: none;
+  background-color: #e0e0e0);
+  border-top: none;
+  border-right: 1px solid #959595;
+  border-bottom: 1px solid #959595;
+  box-shadow: inset 0 0 5px #eee, 0 1px 0 #eee, inset -1px 0 0 #e0e0e0, inset 1px 0 0 #e0e0e0;
+  color: #323232;
+}
+
 .tab:hover {
   background-image: -webkit-linear-gradient(#e2e2e2, #e0e0e0);
 }
diff --git a/themes/atom-light-ui/tree-view.css b/themes/atom-light-ui/tree-view.css
index c0f599fc2..7a833b7a2 100644
--- a/themes/atom-light-ui/tree-view.css
+++ b/themes/atom-light-ui/tree-view.css
@@ -1,8 +1,13 @@
-.tree-view {
+.is-focused .tree-view {
   background: #dde3e8;
   border-right: 1px solid #989898;
 }
 
+.tree-view {
+  background: #f3f3f3;
+  border-right: 1px solid #c5c5c5;
+}
+
 .tree-view .entry {
   text-shadow: 0 1px 0 #fff;
 }
@@ -20,7 +25,7 @@
   color: #262626;
 }
 
-.tree-view .selected > .highlight {
+.is-focused .tree-view .selected > .highlight {
   box-sizing: border-box;
   border-top: 1px solid #97a4a7;
   border-bottom: 1px solid #97a4a7;
@@ -28,12 +33,27 @@
   background-image: -webkit-linear-gradient(#cad5d8, #bcccce);
 }
 
-.tree-view:focus .selected > .highlight {
+.tree-view .selected > .highlight {
+  box-sizing: border-box;
+  border-top: 1px solid #97a4a7;
+  border-bottom: 1px solid #97a4a7;
+  background-image: none;
+  background-color: #DFDFDF;
+}
+
+.is-focused .tree-view:focus .selected > .highlight {
   border-top: 1px solid #3D4552;
   border-bottom: 1px solid #3D4552;
   background-image: -webkit-linear-gradient(#7e868d, #69717b);
 }
 
+.tree-view:focus .selected > .highlight {
+  border-top: 1px solid #3D4552;
+  border-bottom: 1px solid #3D4552;
+  background-image: none;
+  background-color: #69717b;
+}
+
 .tree-view:focus .directory.selected > .header > .name,
 .tree-view:focus .selected > .name,
 .tree-view:focus .directory.selected > .header > .name:before,
@@ -50,10 +70,14 @@
   color: #262626;
 }
 
-.tree-view .name:before {
+.is-focused .tree-view .name:before {
   color: #7e8692;
 }
 
+.tree-view .name:before {
+  color: #7e7e7e;
+}
+
 .tree-view .entry:hover,
 .tree-view .directory .header:hover .name,
 .tree-view .directory .header:hover .disclosure-arrow  {

From a004433edd374a630c073f59219de2d0d1cf37b3 Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Fri, 1 Feb 2013 19:15:39 -0500
Subject: [PATCH 124/133] adding dark theme focused

---
 themes/atom-dark-ui/tabs.css      | 75 +++++++++++++++++++++++--------
 themes/atom-dark-ui/tree-view.css | 14 +++++-
 2 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/themes/atom-dark-ui/tabs.css b/themes/atom-dark-ui/tabs.css
index c30c9c1ad..91a635180 100644
--- a/themes/atom-dark-ui/tabs.css
+++ b/themes/atom-dark-ui/tabs.css
@@ -6,7 +6,7 @@
   margin-bottom: 1px;
 }
 
-.tab {
+.is-focused .tab {
   cursor: default;
   padding: 2px 21px 2px 9px;
   background-image: -webkit-linear-gradient(#444, #3d3d3d);
@@ -16,6 +16,42 @@
   box-shadow: inset 0 0 5px #383838, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a, inset 1px 0 0 #4a4a4a;
 }
 
+.is-focused .tab:first-child {
+  box-shadow: inset 0 0 5px #383838, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a;
+}
+
+.is-focused .tab.active,
+.is-focused .tab.active:hover {
+  border-top: 1px solid #4a4a4a;
+  box-shadow: inset -1px 0 0 #595959, inset 1px 0 0 #595959;
+  border-bottom-color: #424242;
+  background-image: -webkit-linear-gradient(#555555, #424242);
+}
+
+.tab {
+  cursor: default;
+  padding: 2px 21px 2px 9px;
+  background-color: #555;
+  background-image: none;
+  border-top: 1px solid #383838;
+  border-right: 1px solid #2e2e2e;
+  border-bottom: 1px solid #2e2e2e;
+  box-shadow: inset 0 0 5px #555, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a, inset 1px 0 0 #4a4a4a;
+}
+
+.tab:first-child {
+  box-shadow: inset 0 0 5px #555, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a;
+}
+
+.tab.active,
+.tab.active:hover {
+  border-top: 1px solid #4a4a4a;
+  box-shadow: inset -1px 0 0 #595959, inset 1px 0 0 #595959;
+  border-bottom-color: #424242;
+  background-image: none;
+  background-color: #424242;
+}
+
 .tab,
 .tab .close-icon {
   color: #aaa;
@@ -25,9 +61,9 @@
   border-color: #aaa;
 }
 
-.tab.active,
-.tab.active:hover,
-.tab.active .close-icon {
+.is-focused .tab.active,
+.is-focused .tab.active:hover,
+.is-focused .tab.active .close-icon {
   color: #e6e6e6;
 }
 
@@ -49,23 +85,11 @@
   content: "";
 }
 
-.tab:first-child {
-  box-shadow: inset 0 0 5px #383838, 0 1px 0 #585858, inset -1px 0 0 #4a4a4a;
-}
-
-.tab.active:first-child,
-.tab.active:first-child:hover {
+.is-focused .tab.active:first-child,
+.is-focused .tab.active:first-child:hover {
   box-shadow: inset -1px 0 0 #595959;
 }
 
-.tab.active,
-.tab.active:hover {
-  border-top: 1px solid #4a4a4a;
-  box-shadow: inset -1px 0 0 #595959, inset 1px 0 0 #595959;
-  border-bottom-color: #424242;
-  background-image: -webkit-linear-gradient(#555555, #424242);
-}
-
 .tab.active:before,
 .tab.active:after {
   position: absolute;
@@ -76,6 +100,19 @@
   z-index: 3;
   border: 1px solid #595959;
 }
+
+.is-focused .tab.active:before {
+  border-bottom-right-radius: 4px;
+  border-width: 0 1px 1px 0;
+  box-shadow: 2px 2px 0 #424242;
+  left: -4px;
+}
+.is-focused .tab.active:after {
+  right: -4px;
+  border-bottom-left-radius: 4px;
+  border-width: 0 0 1px 1px;
+  box-shadow: -2px 2px 0 #424242;
+}
 .tab.active:before {
   border-bottom-right-radius: 4px;
   border-width: 0 1px 1px 0;
@@ -88,7 +125,7 @@
   border-width: 0 0 1px 1px;
   box-shadow: -2px 2px 0 #424242;
 }
-.tab.active:first-child:before {
+.is-focused .tab.active:first-child:before {
   display: none;
 }
 
diff --git a/themes/atom-dark-ui/tree-view.css b/themes/atom-dark-ui/tree-view.css
index d8e69ab64..7a282e53a 100644
--- a/themes/atom-dark-ui/tree-view.css
+++ b/themes/atom-dark-ui/tree-view.css
@@ -1,8 +1,13 @@
-.tree-view {
+.is-focused .tree-view {
   background: #1e1e1e;
   border-right: 1px solid #191919;
 }
 
+.tree-view {
+  background: #2e2e2e;
+  border-right: 1px solid #191919;
+}
+
 .tree-view .entry {
   text-shadow: 0 -1px 0 #000;
 }
@@ -20,10 +25,15 @@
   color: #d2d2d2;
 }
 
-.tree-view .selected > .highlight {
+.is-focused .tree-view .selected > .highlight {
   background-image: -webkit-linear-gradient(#4e4e4e, #434343);
 }
 
+.tree-view .selected > .highlight {
+  background-image: none;
+  background-color: #6e6e6e;
+}
+
 .tree-view:focus .selected > .highlight {
   background-image: -webkit-linear-gradient(#7e7e7e, #737373);
 }

From 83b6a93684c6893a2a2a2e70d4eee8f2b07bb142 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 16:15:54 -0800
Subject: [PATCH 125/133] Add initial CSON pretty printer

---
 spec/stdlib/cson-spec.coffee | 56 ++++++++++++++++++++++++
 src/stdlib/cson.coffee       | 84 ++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)
 create mode 100644 spec/stdlib/cson-spec.coffee
 create mode 100644 src/stdlib/cson.coffee

diff --git a/spec/stdlib/cson-spec.coffee b/spec/stdlib/cson-spec.coffee
new file mode 100644
index 000000000..b865ca33d
--- /dev/null
+++ b/spec/stdlib/cson-spec.coffee
@@ -0,0 +1,56 @@
+CSON = require 'cson'
+
+fdescribe "CSON", ->
+  describe "@stringify(object)", ->
+    describe "when the object is undefined", ->
+      it "throws an exception", ->
+        expect(-> CSON.stringify()).toThrow()
+
+    describe "when the object is a function", ->
+      it "throws an exception", ->
+        expect(-> CSON.stringify(-> 'function')).toThrow()
+
+    describe "when the object contains a function", ->
+      it "throws an exception", ->
+        expect(-> CSON.stringify(a:  -> 'function')).toThrow()
+
+    describe "when formatting an undefined key", ->
+      it "does not include the key in the formatted CSON", ->
+        expect(CSON.stringify(b: 1, c: undefined)).toBe "'b': 1\n"
+
+    describe "when formatting an empty object", ->
+      it "returns the empty string", ->
+      expect(CSON.stringify({})).toBe ""
+
+    describe "when formatting a string", ->
+      it "returns formatted CSON", ->
+        expect(CSON.stringify(a: 'b')).toBe "'a': 'b'\n"
+
+      it "escapes single quotes", ->
+        expect(CSON.stringify(a: "'b'")).toBe "'a': '\\\'b\\\''\n"
+
+      it "doesn't escape double quotes", ->
+        expect(CSON.stringify(a: '"b"')).toBe "'a': '\"b\"'\n"
+
+    describe "when formatting a boolean", ->
+      it "returns formatted CSON", ->
+        expect(CSON.stringify(a: true)).toBe "'a': true\n"
+        expect(CSON.stringify(a: false)).toBe "'a': false\n"
+
+    describe "when formatting a number", ->
+      it "returns formatted CSON", ->
+        expect(CSON.stringify(a: 14)).toBe "'a': 14\n"
+        expect(CSON.stringify(a: 1.23)).toBe "'a': 1.23\n"
+
+    describe "when formatting null", ->
+      it "returns formatted CSON", ->
+        expect(CSON.stringify(a: null)).toBe "'a': null\n"
+
+    describe "when formatting an array", ->
+      it "returns formatted CSON", ->
+        expect(CSON.stringify(a: ['b'])).toBe "'a': [\n  'b'\n]\n"
+        expect(CSON.stringify(a: ['b', 4])).toBe "'a': [\n  'b'\n  4\n]\n"
+
+    describe "when formatting an object", ->
+      it "returns formatted CSON", ->
+        expect(CSON.stringify(a: {b: 'c'})).toBe "'a':\n  'b': 'c'\n"
diff --git a/src/stdlib/cson.coffee b/src/stdlib/cson.coffee
new file mode 100644
index 000000000..8dd627c71
--- /dev/null
+++ b/src/stdlib/cson.coffee
@@ -0,0 +1,84 @@
+_ = require 'underscore'
+
+module.exports =
+  stringifyIndent: (level=0) -> _.multiplyString(' ', Math.max(level, 0))
+
+  stringifyString: (string) ->
+    string = JSON.stringify(string)
+    string = string[1...-1]               # Remove surrounding double quotes
+    string = string.replace(/\\"/g, '"')  # Unescape escaped double quotes
+    string = string.replace(/'/g, '\\\'') # Escape single quotes
+    "'#{string}'"                         # Wrap in single quotes
+
+  stringifyBoolean: (boolean) -> "#{boolean}"
+
+  stringifyNumber: (number) -> "#{number}"
+
+  stringifyNull: -> 'null'
+
+  stringifyArray: (array, indentLevel=0) ->
+    cson = '[\n'
+    for value in array
+      cson += @stringifyIndent(indentLevel + 2)
+      if _.isString(value)
+        cson += @stringifyString(value)
+      else if _.isBoolean(value)
+        cson += @stringifyBoolean(value)
+      else if _.isNumber(value)
+        cson += @stringifyNumber(value)
+      else if _.isNull(value)
+        cson += @stringifyNull(value)
+      else if _.isArray(value)
+        cson += @stringifyArray(value, indentLevel + 2)
+      else if _.isObject(value)
+        cson += @stringifyObject(value, indentLevel + 2)
+      else
+        throw new Error("Unrecognized type for array value: #{value}")
+      cson += '\n'
+    "#{cson}#{@stringifyIndent(indentLevel)}]"
+
+  stringifyObject: (object, indentLevel=0) ->
+    cson = ''
+    prefix = ''
+    for key, value of object
+      continue if value is undefined
+      if _.isFunction(value)
+        throw new Error("Function specified as value to key: #{key}")
+
+      cson += "#{prefix}#{@stringifyIndent(indentLevel)}'#{key}':"
+      if _.isString(value)
+        cson += " #{@stringifyString(value)}"
+      else if _.isBoolean(value)
+        cson += " #{@stringifyBoolean(value)}"
+      else if _.isNumber(value)
+        cson += " #{@stringifyNumber(value)}"
+      else if _.isNull(value)
+        cson += " #{@stringifyNull(value)}"
+      else if _.isArray(value)
+        cson += " #{@stringifyArray(value, indentLevel)}"
+      else if _.isObject(value)
+        cson += "\n#{@stringifyObject(value, indentLevel + 2)}"
+      else
+        throw new Error("Unrecognized value type for key: #{key} with value: #{value}")
+      prefix = '\n'
+    cson
+
+  stringify: (object) ->
+    throw new Error("Cannot stringify undefined object") if object is undefined
+    if _.isFunction(object)
+      throw new Error("Cannot stringify function: #{object}")
+
+    return @stringifyString(object) if _.isString(object)
+    return @stringifyBoolean(object) if _.isBoolean(object)
+    return @stringifyNumber(object) if _.isNumber(object)
+    return @stringifyNull(object) if _.isNull(object)
+    if _.isArray(object)
+      cson = @stringifyArray(object)
+      cson = "#{cson}\n" if cson
+      return cson
+    if _.isObject(object)
+      cson = @stringifyObject(object)
+      cson = "#{cson}\n" if cson
+      return cson
+
+    throw new Error("Unrecognized type to stringify: #{object}")

From 69097bee501429224eac24e5b31fe93c56e6fc26 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 16:20:25 -0800
Subject: [PATCH 126/133] Kill trailing newline and inline empty arrays

---
 spec/stdlib/cson-spec.coffee | 30 +++++++++++++++++-------------
 src/stdlib/cson.coffee       | 12 ++++--------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/spec/stdlib/cson-spec.coffee b/spec/stdlib/cson-spec.coffee
index b865ca33d..d14ef3467 100644
--- a/spec/stdlib/cson-spec.coffee
+++ b/spec/stdlib/cson-spec.coffee
@@ -1,6 +1,6 @@
 CSON = require 'cson'
 
-fdescribe "CSON", ->
+describe "CSON", ->
   describe "@stringify(object)", ->
     describe "when the object is undefined", ->
       it "throws an exception", ->
@@ -16,7 +16,7 @@ fdescribe "CSON", ->
 
     describe "when formatting an undefined key", ->
       it "does not include the key in the formatted CSON", ->
-        expect(CSON.stringify(b: 1, c: undefined)).toBe "'b': 1\n"
+        expect(CSON.stringify(b: 1, c: undefined)).toBe "'b': 1"
 
     describe "when formatting an empty object", ->
       it "returns the empty string", ->
@@ -24,33 +24,37 @@ fdescribe "CSON", ->
 
     describe "when formatting a string", ->
       it "returns formatted CSON", ->
-        expect(CSON.stringify(a: 'b')).toBe "'a': 'b'\n"
+        expect(CSON.stringify(a: 'b')).toBe "'a': 'b'"
 
       it "escapes single quotes", ->
-        expect(CSON.stringify(a: "'b'")).toBe "'a': '\\\'b\\\''\n"
+        expect(CSON.stringify(a: "'b'")).toBe "'a': '\\\'b\\\''"
 
       it "doesn't escape double quotes", ->
-        expect(CSON.stringify(a: '"b"')).toBe "'a': '\"b\"'\n"
+        expect(CSON.stringify(a: '"b"')).toBe "'a': '\"b\"'"
 
     describe "when formatting a boolean", ->
       it "returns formatted CSON", ->
-        expect(CSON.stringify(a: true)).toBe "'a': true\n"
-        expect(CSON.stringify(a: false)).toBe "'a': false\n"
+        expect(CSON.stringify(a: true)).toBe "'a': true"
+        expect(CSON.stringify(a: false)).toBe "'a': false"
 
     describe "when formatting a number", ->
       it "returns formatted CSON", ->
-        expect(CSON.stringify(a: 14)).toBe "'a': 14\n"
-        expect(CSON.stringify(a: 1.23)).toBe "'a': 1.23\n"
+        expect(CSON.stringify(a: 14)).toBe "'a': 14"
+        expect(CSON.stringify(a: 1.23)).toBe "'a': 1.23"
 
     describe "when formatting null", ->
       it "returns formatted CSON", ->
-        expect(CSON.stringify(a: null)).toBe "'a': null\n"
+        expect(CSON.stringify(a: null)).toBe "'a': null"
 
     describe "when formatting an array", ->
+      describe "when the array is empty", ->
+        it "puts the array on a single line", ->
+          expect(CSON.stringify([])).toBe "[]"
+
       it "returns formatted CSON", ->
-        expect(CSON.stringify(a: ['b'])).toBe "'a': [\n  'b'\n]\n"
-        expect(CSON.stringify(a: ['b', 4])).toBe "'a': [\n  'b'\n  4\n]\n"
+        expect(CSON.stringify(a: ['b'])).toBe "'a': [\n  'b'\n]"
+        expect(CSON.stringify(a: ['b', 4])).toBe "'a': [\n  'b'\n  4\n]"
 
     describe "when formatting an object", ->
       it "returns formatted CSON", ->
-        expect(CSON.stringify(a: {b: 'c'})).toBe "'a':\n  'b': 'c'\n"
+        expect(CSON.stringify(a: {b: 'c'})).toBe "'a':\n  'b': 'c'"
diff --git a/src/stdlib/cson.coffee b/src/stdlib/cson.coffee
index 8dd627c71..7cc43d496 100644
--- a/src/stdlib/cson.coffee
+++ b/src/stdlib/cson.coffee
@@ -17,6 +17,8 @@ module.exports =
   stringifyNull: -> 'null'
 
   stringifyArray: (array, indentLevel=0) ->
+    return '[]' if array.length is 0
+
     cson = '[\n'
     for value in array
       cson += @stringifyIndent(indentLevel + 2)
@@ -72,13 +74,7 @@ module.exports =
     return @stringifyBoolean(object) if _.isBoolean(object)
     return @stringifyNumber(object) if _.isNumber(object)
     return @stringifyNull(object) if _.isNull(object)
-    if _.isArray(object)
-      cson = @stringifyArray(object)
-      cson = "#{cson}\n" if cson
-      return cson
-    if _.isObject(object)
-      cson = @stringifyObject(object)
-      cson = "#{cson}\n" if cson
-      return cson
+    return @stringifyArray(object) if _.isArray(object)
+    return @stringifyObject(object) if _.isObject(object)
 
     throw new Error("Unrecognized type to stringify: #{object}")

From 999bca58715f595497bae8a438608a0d1cb428af Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 1 Feb 2013 16:21:14 -0800
Subject: [PATCH 127/133] :lipstick:

---
 src/stdlib/cson.coffee | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/stdlib/cson.coffee b/src/stdlib/cson.coffee
index 7cc43d496..eab575a11 100644
--- a/src/stdlib/cson.coffee
+++ b/src/stdlib/cson.coffee
@@ -67,8 +67,7 @@ module.exports =
 
   stringify: (object) ->
     throw new Error("Cannot stringify undefined object") if object is undefined
-    if _.isFunction(object)
-      throw new Error("Cannot stringify function: #{object}")
+    throw new Error("Cannot stringify function: #{object}") if _.isFunction(object)
 
     return @stringifyString(object) if _.isString(object)
     return @stringifyBoolean(object) if _.isBoolean(object)

From 0d2a328dcc8accc0ed4869aa74de89b7cdf542be Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Fri, 1 Feb 2013 19:23:52 -0500
Subject: [PATCH 128/133] making the editor .focused .is-focused for symmetry

---
 docs/styling.md                | 6 +++---
 spec/app/editor-spec.coffee    | 4 ++--
 src/app/editor.coffee          | 4 ++--
 src/app/text-mate-theme.coffee | 6 +++---
 static/editor.css              | 4 ++--
 themes/atom-dark-syntax.css    | 6 +++---
 themes/atom-light-syntax.css   | 6 +++---
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/styling.md b/docs/styling.md
index 1632c4e54..847df3fbb 100644
--- a/docs/styling.md
+++ b/docs/styling.md
@@ -9,8 +9,8 @@ gutter.
 You can change the background color using the following CSS:
 
 ```css
-.editor.focused .line.cursor-line,
-.editor.focused .line-number.cursor-line {
+.editor.is-focused .line.cursor-line,
+.editor.is-focused .line-number.cursor-line {
   background-color: green;
 }
 ```
@@ -18,7 +18,7 @@ You can change the background color using the following CSS:
 You can change the line number foreground color using the following CSS:
 
 ```css
-.editor.focused .line-number.cursor-line {
+.editor.is-focused .line-number.cursor-line {
   color: blue;
 }
 ```
diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index dee1224d0..2d04e5c7d 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -111,11 +111,11 @@ describe "Editor", ->
       editor.isFocused = false
       editor.hiddenInput.focus()
       expect(editor.isFocused).toBeTruthy()
-      expect(editor).toHaveClass('focused')
+      expect(editor).toHaveClass('is-focused')
 
       editor.hiddenInput.focusout()
       expect(editor.isFocused).toBeFalsy()
-      expect(editor).not.toHaveClass('focused')
+      expect(editor).not.toHaveClass('is-focused')
 
   describe "when the activeEditSession's file is modified on disk", ->
     it "triggers an alert", ->
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 01b8ac40f..161e7505e 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -351,11 +351,11 @@ class Editor extends View
     @hiddenInput.on 'focus', =>
       @rootView()?.editorFocused(this)
       @isFocused = true
-      @addClass 'focused'
+      @addClass 'is-focused'
 
     @hiddenInput.on 'focusout', =>
       @isFocused = false
-      @removeClass 'focused'
+      @removeClass 'is-focused'
       @autosave() if config.get "editor.autosave"
 
     @underlayer.on 'click', (e) =>
diff --git a/src/app/text-mate-theme.coffee b/src/app/text-mate-theme.coffee
index cb1d3558a..f2c1d1f92 100644
--- a/src/app/text-mate-theme.coffee
+++ b/src/app/text-mate-theme.coffee
@@ -44,17 +44,17 @@ class TextMateTheme extends Theme
         'color': @translateColor(foreground)
 
     @rulesets.push
-      selector: '.editor.focused .cursor'
+      selector: '.editor.is-focused .cursor'
       properties:
         'border-color': @translateColor(caret)
 
     @rulesets.push
-      selector: '.editor.focused .selection .region'
+      selector: '.editor.is-focused .selection .region'
       properties:
         'background-color': @translateColor(selection)
 
     @rulesets.push
-      selector: '.editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line'
+      selector: '.editor.is-focused .line-number.cursor-line-no-selection, .editor.is-focused .line.cursor-line'
       properties:
         'background-color': @translateColor(lineHighlight)
 
diff --git a/static/editor.css b/static/editor.css
index f840736cd..ebd85aeaf 100644
--- a/static/editor.css
+++ b/static/editor.css
@@ -85,8 +85,8 @@
   border-left: 1px solid;
 }
 
-.editor:not(.focused) .cursor,
-.editor.focused .cursor.blink-off {
+.editor:not(.is-focused) .cursor,
+.editor.is-focused .cursor.blink-off {
   visibility: hidden;
 }
 
diff --git a/themes/atom-dark-syntax.css b/themes/atom-dark-syntax.css
index fbac8c47c..92f39d650 100644
--- a/themes/atom-dark-syntax.css
+++ b/themes/atom-dark-syntax.css
@@ -3,15 +3,15 @@
   color: #c5c8c6;
 }
 
-.editor.focused .cursor {
+.editor.is-focused .cursor {
   border-color: #FFFFFF;
 }
 
-.editor.focused .selection .region {
+.editor.is-focused .selection .region {
   background-color: #333333;
 }
 
-.editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line {
+.editor.is-focused .line-number.cursor-line-no-selection, .editor.is-focused .line.cursor-line {
   background-color: rgba(255, 255, 255, 0.14);
 }
 
diff --git a/themes/atom-light-syntax.css b/themes/atom-light-syntax.css
index e7332f155..c86205d69 100644
--- a/themes/atom-light-syntax.css
+++ b/themes/atom-light-syntax.css
@@ -3,15 +3,15 @@
   color: #555;
 }
 
-.editor.focused .cursor {
+.editor.is-focused .cursor {
   border-color: #000;
 }
 
-.editor.focused .selection .region {
+.editor.is-focused .selection .region {
   background-color: #afc4da;
 }
 
-.editor.focused .line-number.cursor-line-no-selection, .editor.focused .line.cursor-line {
+.editor.is-focused .line-number.cursor-line-no-selection, .editor.is-focused .line.cursor-line {
   background-color: rgba(255, 255, 134, 0.34);
 }
 

From 387e73bb50a11b15a7dd3c35990b47d41cdef871 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sat, 2 Feb 2013 11:25:38 -0800
Subject: [PATCH 129/133] Clear previous interval before setting new one

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index bd93cc1c3..52e6cb918 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -72,6 +72,7 @@ class EditorStatsView extends ScrollView
       .attr('class', 'bar')
 
     setTimeout((=> @update()), 100)
+    clearInterval(@updateInterval)
     @updateInterval = setInterval((=> @update()), 5000)
 
   update: ->

From a3b95a923d095d6290afffc1bc8972f4ae944771 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sat, 2 Feb 2013 11:28:29 -0800
Subject: [PATCH 130/133] Don't update unless view is on the DOM

---
 src/packages/editor-stats/src/editor-stats-view.coffee | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/packages/editor-stats/src/editor-stats-view.coffee b/src/packages/editor-stats/src/editor-stats-view.coffee
index 52e6cb918..aea6ca303 100644
--- a/src/packages/editor-stats/src/editor-stats-view.coffee
+++ b/src/packages/editor-stats/src/editor-stats-view.coffee
@@ -21,6 +21,7 @@ class EditorStatsView extends ScrollView
     super
 
     resizer = =>
+      return unless @isOnDom()
       @draw()
       @update()
     @subscribe $(window), 'resize', _.debounce(resizer, 300)
@@ -71,9 +72,10 @@ class EditorStatsView extends ScrollView
       .attr('width', @x.rangeBand())
       .attr('class', 'bar')
 
-    setTimeout((=> @update()), 100)
     clearInterval(@updateInterval)
-    @updateInterval = setInterval((=> @update()), 5000)
+    updater = => @update() if @isOnDom()
+    setTimeout(updater, 100)
+    @updateInterval = setInterval(updater, 5000)
 
   update: ->
     newData = d3.entries @stats.eventLog

From 5cd3c047021e99d35febf2f51c879bdff76b056d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sat, 2 Feb 2013 12:47:46 -0800
Subject: [PATCH 131/133] Load fuzzy finder paths in web worker at startup

Previously the paths were first loaded when the fuzzy finder
view was first attached.

Now a web worker is started when the package activates that
sets the paths on the fuzzy finder view the first time it
displays if the worker has completed by the time an event occurs
that displays the view.
---
 src/app/git.coffee                            | 12 +++---
 src/packages/fuzzy-finder/index.coffee        | 12 +++++-
 .../spec/fuzzy-finder-spec.coffee             | 40 +++++++++----------
 .../fuzzy-finder/src/fuzzy-finder-view.coffee | 14 +++----
 .../src/load-paths-handler.coffee             | 20 ++++++++++
 .../fuzzy-finder/src/load-paths-task.coffee   | 17 ++++++++
 6 files changed, 79 insertions(+), 36 deletions(-)
 create mode 100644 src/packages/fuzzy-finder/src/load-paths-handler.coffee
 create mode 100644 src/packages/fuzzy-finder/src/load-paths-task.coffee

diff --git a/src/app/git.coffee b/src/app/git.coffee
index f862fe6b8..db1376b17 100644
--- a/src/app/git.coffee
+++ b/src/app/git.coffee
@@ -1,4 +1,3 @@
-$ = require 'jquery'
 _ = require 'underscore'
 Subscriber = require 'subscriber'
 GitRepository = require 'git-repository'
@@ -6,9 +5,9 @@ GitRepository = require 'git-repository'
 module.exports =
 class Git
 
-  @open: (path) ->
+  @open: (path, options) ->
     try
-      new Git(path)
+      new Git(path, options)
     catch e
       null
 
@@ -24,9 +23,12 @@ class Git
     working_dir_typechange: 1 << 10
     ignore: 1 << 14
 
-  constructor: (path) ->
+  constructor: (path, options={}) ->
     @repo = new GitRepository(path)
-    @subscribe $(window), 'focus', => @refreshIndex()
+    refreshIndexOnFocus = options.refreshIndexOnFocus ? true
+    if refreshIndexOnFocus
+      $ = require 'jquery'
+      @subscribe $(window), 'focus', => @refreshIndex()
 
   getRepo: ->
     unless @repo?
diff --git a/src/packages/fuzzy-finder/index.coffee b/src/packages/fuzzy-finder/index.coffee
index 1d815057e..5e4338fc8 100644
--- a/src/packages/fuzzy-finder/index.coffee
+++ b/src/packages/fuzzy-finder/index.coffee
@@ -1,8 +1,8 @@
 DeferredAtomPackage = require 'deferred-atom-package'
+LoadPathsTask = require './src/load-paths-task'
 
 module.exports =
 class FuzzyFinder extends DeferredAtomPackage
-
   loadEvents: [
     'fuzzy-finder:toggle-file-finder'
     'fuzzy-finder:toggle-buffer-finder'
@@ -11,7 +11,17 @@ class FuzzyFinder extends DeferredAtomPackage
 
   instanceClass: 'fuzzy-finder/src/fuzzy-finder-view'
 
+  activate: (rootView) ->
+    super
+
+    callback = (paths) => @projectPaths = paths
+    new LoadPathsTask(rootView, callback).start()
+
   onLoadEvent: (event, instance) ->
+    if @projectPaths? and not @instance.projectPaths?
+      @instance.projectPaths = @projectPaths
+      @instance.reloadProjectPaths = false;
+
     switch event.type
       when 'fuzzy-finder:toggle-file-finder'
         instance.toggleFileFinder()
diff --git a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
index ad40e0010..76f8bd476 100644
--- a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
+++ b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
@@ -1,5 +1,6 @@
 RootView = require 'root-view'
 FuzzyFinder = require 'fuzzy-finder/src/fuzzy-finder-view'
+LoadPathsTask = require 'fuzzy-finder/src/load-paths-task'
 $ = require 'jquery'
 {$$} = require 'space-pen'
 fs = require 'fs'
@@ -48,14 +49,13 @@ describe 'FuzzyFinder', ->
           expect(finder.find(".loading")).toBeVisible()
           expect(finder.find(".loading")).toHaveText "Indexing..."
 
-          waitsForPromise ->
-            rootView.project.getFilePaths().done (foundPaths) -> paths = foundPaths
-
-          waitsFor ->
-            finder.list.children('li').length > 0
+          waitsFor "all project paths to load", 5000, ->
+            if finder.projectPaths?.length > 0
+              paths = finder.projectPaths
+              true
 
           runs ->
-            expect(finder.list.children('li').length).toBe paths.length, finder.maxResults
+            expect(finder.list.children('li').length).toBe paths.length
             for path in paths
               expect(finder.list.find("li:contains(#{fs.base(path)})")).toExist()
             expect(finder.list.children().first()).toHaveClass 'selected'
@@ -222,15 +222,15 @@ describe 'FuzzyFinder', ->
 
   describe "cached file paths", ->
     it "caches file paths after first time", ->
-      spyOn(rootView.project, "getFilePaths").andCallThrough()
+      spyOn(LoadPathsTask.prototype, "start").andCallThrough()
       rootView.trigger 'fuzzy-finder:toggle-file-finder'
 
       waitsFor ->
         finder.list.children('li').length > 0
 
       runs ->
-        expect(rootView.project.getFilePaths).toHaveBeenCalled()
-        rootView.project.getFilePaths.reset()
+        expect(finder.loadPathsTask.start).toHaveBeenCalled()
+        finder.loadPathsTask.start.reset()
         rootView.trigger 'fuzzy-finder:toggle-file-finder'
         rootView.trigger 'fuzzy-finder:toggle-file-finder'
 
@@ -238,45 +238,44 @@ describe 'FuzzyFinder', ->
         finder.list.children('li').length > 0
 
       runs ->
-        expect(rootView.project.getFilePaths).not.toHaveBeenCalled()
+        expect(finder.loadPathsTask.start).not.toHaveBeenCalled()
 
     it "doesn't cache buffer paths", ->
-      spyOn(rootView.project, "getFilePaths").andCallThrough()
+      spyOn(rootView, "getOpenBufferPaths").andCallThrough()
       rootView.trigger 'fuzzy-finder:toggle-buffer-finder'
 
       waitsFor ->
         finder.list.children('li').length > 0
 
       runs ->
-        expect(rootView.project.getFilePaths).not.toHaveBeenCalled()
-        rootView.project.getFilePaths.reset()
+        expect(rootView.getOpenBufferPaths).toHaveBeenCalled()
+        rootView.getOpenBufferPaths.reset()
+        rootView.trigger 'fuzzy-finder:toggle-buffer-finder'
         rootView.trigger 'fuzzy-finder:toggle-buffer-finder'
-        rootView.trigger 'fuzzy-finder:toggle-file-finder'
 
       waitsFor ->
         finder.list.children('li').length > 0
 
       runs ->
-        expect(rootView.project.getFilePaths).toHaveBeenCalled()
+        expect(rootView.getOpenBufferPaths).toHaveBeenCalled()
 
     it "busts the cache when the window gains focus", ->
-      spyOn(rootView.project, "getFilePaths").andCallThrough()
+      spyOn(LoadPathsTask.prototype, "start").andCallThrough()
       rootView.trigger 'fuzzy-finder:toggle-file-finder'
 
       waitsFor ->
         finder.list.children('li').length > 0
 
       runs ->
-        expect(rootView.project.getFilePaths).toHaveBeenCalled()
-        rootView.project.getFilePaths.reset()
+        expect(finder.loadPathsTask.start).toHaveBeenCalled()
+        finder.loadPathsTask.start.reset()
         $(window).trigger 'focus'
         rootView.trigger 'fuzzy-finder:toggle-file-finder'
         rootView.trigger 'fuzzy-finder:toggle-file-finder'
-        expect(rootView.project.getFilePaths).toHaveBeenCalled()
+        expect(finder.loadPathsTask.start).toHaveBeenCalled()
 
   describe "path ignoring", ->
     it "ignores paths that match entries in config.fuzzyFinder.ignoredNames", ->
-      spyOn(rootView.project, "getFilePaths").andCallThrough()
       config.set("fuzzyFinder.ignoredNames", ["tree-view.js"])
       rootView.trigger 'fuzzy-finder:toggle-file-finder'
       finder.maxItems = Infinity
@@ -293,7 +292,6 @@ describe 'FuzzyFinder', ->
     beforeEach ->
       editor = rootView.getActiveEditor()
       rootView.attachToDom()
-      spyOn(rootView.project, "getFilePaths").andCallThrough()
 
     it "opens the fuzzy finder window when there are multiple matches", ->
       editor.setText("sample")
diff --git a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee
index 2365fc4d7..ac5a3a3a5 100644
--- a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee
+++ b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee
@@ -3,6 +3,7 @@ SelectList = require 'select-list'
 _ = require 'underscore'
 $ = require 'jquery'
 fs = require 'fs'
+LoadPathsTask = require 'fuzzy-finder/src/load-paths-task'
 
 module.exports =
 class FuzzyFinderView extends SelectList
@@ -126,16 +127,9 @@ class FuzzyFinderView extends SelectList
       @setLoading("Indexing...")
 
     if @reloadProjectPaths
-      @rootView.project.getFilePaths().done (paths) =>
-        ignoredNames = config.get("fuzzyFinder.ignoredNames") or []
-        ignoredNames = ignoredNames.concat(config.get("core.ignoredNames") or [])
+      @loadPathsTask?.terminate()
+      callback = (paths) =>
         @projectPaths = paths
-        if ignoredNames
-          @projectPaths = @projectPaths.filter (path) ->
-            for segment in path.split("/")
-              return false if _.contains(ignoredNames, segment)
-            return true
-
         @reloadProjectPaths = false
         listedItems =
           if options.filter?
@@ -146,6 +140,8 @@ class FuzzyFinderView extends SelectList
 
         @setArray(listedItems)
         options.done(listedItems) if options.done?
+      @loadPathsTask = new LoadPathsTask(@rootView, callback)
+      @loadPathsTask.start()
 
   populateOpenBufferPaths: ->
     @paths = @rootView.getOpenBufferPaths().map (path) =>
diff --git a/src/packages/fuzzy-finder/src/load-paths-handler.coffee b/src/packages/fuzzy-finder/src/load-paths-handler.coffee
new file mode 100644
index 000000000..41ed34fa8
--- /dev/null
+++ b/src/packages/fuzzy-finder/src/load-paths-handler.coffee
@@ -0,0 +1,20 @@
+fs = require 'fs'
+_ = require 'underscore'
+Git = require 'git'
+
+module.exports =
+  loadPaths: (rootPath, ignoredNames, ignoreGitIgnoredFiles) ->
+    paths = []
+    repo = Git.open(rootPath, refreshIndexOnFocus: false) if ignoreGitIgnoredFiles
+    isIgnored = (path) ->
+      for segment in path.split('/')
+        return true if _.contains(ignoredNames, segment)
+      return true if repo?.isPathIgnored(fs.join(rootPath, path))
+      false
+    onFile = (path) ->
+      paths.push(path) unless isIgnored(path)
+    onDirectory = (path) ->
+      not isIgnored(path)
+    fs.traverseTree(rootPath, onFile, onDirectory)
+    repo?.destroy()
+    callTaskMethod('pathsLoaded', paths)
diff --git a/src/packages/fuzzy-finder/src/load-paths-task.coffee b/src/packages/fuzzy-finder/src/load-paths-task.coffee
new file mode 100644
index 000000000..7f7a31baa
--- /dev/null
+++ b/src/packages/fuzzy-finder/src/load-paths-task.coffee
@@ -0,0 +1,17 @@
+Task = require 'task'
+
+module.exports =
+class LoadPathsTask extends Task
+  constructor: (@rootView, @callback)->
+    super('fuzzy-finder/src/load-paths-handler')
+
+  started: ->
+    ignoredNames = config.get("fuzzyFinder.ignoredNames") ? []
+    ignoredNames = ignoredNames.concat(config.get("core.ignoredNames") ? [])
+    ignoreGitIgnoredFiles = config.get("core.hideGitIgnoredFiles")
+    rootPath = @rootView.project.getPath()
+    @callWorkerMethod('loadPaths', rootPath, ignoredNames, ignoreGitIgnoredFiles)
+
+  pathsLoaded: (paths) ->
+    @terminate()
+    @callback(paths)

From 6efdd7b54b8072d6c8f801259f568ca2920c27f8 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sat, 2 Feb 2013 14:09:59 -0800
Subject: [PATCH 132/133] Only start worker if project has path

---
 src/packages/fuzzy-finder/index.coffee | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/packages/fuzzy-finder/index.coffee b/src/packages/fuzzy-finder/index.coffee
index 5e4338fc8..d232e2004 100644
--- a/src/packages/fuzzy-finder/index.coffee
+++ b/src/packages/fuzzy-finder/index.coffee
@@ -14,8 +14,9 @@ class FuzzyFinder extends DeferredAtomPackage
   activate: (rootView) ->
     super
 
-    callback = (paths) => @projectPaths = paths
-    new LoadPathsTask(rootView, callback).start()
+    if rootView.project.getPath()?
+      callback = (paths) => @projectPaths = paths
+      new LoadPathsTask(rootView, callback).start()
 
   onLoadEvent: (event, instance) ->
     if @projectPaths? and not @instance.projectPaths?

From 04cfdc7c61032a7c334451c5e92345842bd7beb1 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sat, 2 Feb 2013 14:10:32 -0800
Subject: [PATCH 133/133] :lipstick:

---
 src/packages/fuzzy-finder/index.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/fuzzy-finder/index.coffee b/src/packages/fuzzy-finder/index.coffee
index d232e2004..66f212187 100644
--- a/src/packages/fuzzy-finder/index.coffee
+++ b/src/packages/fuzzy-finder/index.coffee
@@ -21,7 +21,7 @@ class FuzzyFinder extends DeferredAtomPackage
   onLoadEvent: (event, instance) ->
     if @projectPaths? and not @instance.projectPaths?
       @instance.projectPaths = @projectPaths
-      @instance.reloadProjectPaths = false;
+      @instance.reloadProjectPaths = false
 
     switch event.type
       when 'fuzzy-finder:toggle-file-finder'