From 13232de4b9f56c112f1bd277e432b4463ca273cf Mon Sep 17 00:00:00 2001
From: probablycorey <cj@github.com>
Date: Mon, 7 Oct 2013 11:46:03 -0700
Subject: [PATCH] Chain promises better

---
 src/project.coffee     | 15 +++++++--------
 src/text-buffer.coffee |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/project.coffee b/src/project.coffee
index cf8f14880..a1166baf2 100644
--- a/src/project.coffee
+++ b/src/project.coffee
@@ -192,15 +192,14 @@ class Project
   #
   # Returns a promise that resolves to an {EditSession}.
   openAsync: (filePath, options={}) ->
-    for opener in @openers
-      return Q(resource) if resource = opener(filePath, options)
+    resource = null
+    _.find @openers, (opener) -> resource = opener(filePath, options)
 
-    deferred = Q.defer()
-    @bufferForPathAsync(filePath).then (buffer) =>
-      editSession = @buildEditSessionForBuffer(buffer, options)
-      deferred.resolve(editSession)
-
-    deferred.promise
+    if resource
+      Q(resource)
+    else
+      @bufferForPathAsync(filePath).then (buffer) =>
+        editSession = @buildEditSessionForBuffer(buffer, options)
 
   # Private: DEPRECATED
   open: (filePath, options={}) ->
diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee
index 9a27b5946..a0828ccca 100644
--- a/src/text-buffer.coffee
+++ b/src/text-buffer.coffee
@@ -75,7 +75,7 @@ class TextBuffer
     @updateCachedDiskContentsAsync().then =>
       @reload() if @loadFromDisk and @isModified()
       @text.clearUndoStack()
-      Q(this)
+      this
 
   ### Internal ###