Merge pull request #1069 from atom/aw/accept-a-promise

Understand observeEmbeddedTextEditor to follow embedded TextEditor changes

Author: smashwilson

lib/find.coffee

@@ -21,6 +21,7 @@ module.exports =
       new ResultsPaneView() if filePath is ResultsPaneView.URI
 
     @subscriptions = new CompositeDisposable
+    @currentItemSub = new Disposable
     @findHistory = new History(findHistory)
     @replaceHistory = new History(replaceHistory)
     @pathsHistory = new History(pathsHistory)
@@ -30,8 +31,16 @@ module.exports =
     @resultsModel = new ResultsModel(@findOptions)
 
     @subscriptions.add atom.workspace.getCenter().observeActivePaneItem (paneItem) =>
+      @subscriptions.delete @currentItemSub
+      @currentItemSub.dispose()
+
       if atom.workspace.isTextEditor(paneItem)
         @findModel.setEditor(paneItem)
+      else if paneItem?.observeEmbeddedTextEditor?
+        @currentItemSub = paneItem.observeEmbeddedTextEditor (editor) =>
+          if atom.workspace.getCenter().getActivePaneItem() is paneItem
+            @findModel.setEditor(editor)
+        @subscriptions.add @currentItemSub
       else if paneItem?.getEmbeddedTextEditor?
         @findModel.setEditor(paneItem.getEmbeddedTextEditor())
       else

spec/find-spec.js

@@ -2,13 +2,15 @@ const {it, fit, ffit, beforeEach, afterEach} = require('./async-spec-helpers') /
 
 const BufferSearch = require('../lib/buffer-search')
 const EmbeddedEditorItem = require('./item/embedded-editor-item')
+const DeferredEditorItem = require('./item/deferred-editor-item');
 const UnrecognizedItem = require('./item/unrecognized-item');
 
 describe('Find', () => {
   describe('updating the find model', () => {
     beforeEach(async () => {
       atom.workspace.addOpener(EmbeddedEditorItem.opener)
       atom.workspace.addOpener(UnrecognizedItem.opener)
+      atom.workspace.addOpener(DeferredEditorItem.opener)
 
       const activationPromise = atom.packages.activatePackage('find-and-replace')
       atom.commands.dispatch(atom.views.getView(atom.workspace), 'find-and-replace:show')
@@ -30,6 +32,17 @@ describe('Find', () => {
       expect(BufferSearch.prototype.setEditor).toHaveBeenCalledWith(embedded.refs.theEditor)
     })
 
+    it("sets the find model's editor to an embedded text editor after activation", async () => {
+      const deferred = await atom.workspace.open(DeferredEditorItem.uri)
+      expect(BufferSearch.prototype.setEditor).not.toHaveBeenCalled()
+
+      await deferred.showEditor()
+      expect(BufferSearch.prototype.setEditor).toHaveBeenCalledWith(deferred.refs.theEditor)
+
+      await deferred.hideEditor()
+      expect(BufferSearch.prototype.setEditor).toHaveBeenCalledWith(null)
+    })
+
     it("sets the find model's editor to null if a non-editor is focused", async () => {
       await atom.workspace.open(UnrecognizedItem.uri)
       expect(BufferSearch.prototype.setEditor).toHaveBeenCalledWith(null)

spec/item/deferred-editor-item.js

@@ -0,0 +1,71 @@
+// An active workspace item that embeds an AtomTextEditor we wish to expose to Find and Replace that does not become
+// available until some time after the item is activated.
+
+const etch = require('etch');
+const $ = etch.dom;
+
+const { TextEditor, Emitter } = require('atom');
+
+class DeferredEditorItem {
+  static opener(u) {
+    if (u === DeferredEditorItem.uri) {
+      return new DeferredEditorItem();
+    } else {
+      return undefined;
+    }
+  }
+
+  constructor() {
+    this.editorShown = false;
+    this.emitter = new Emitter();
+
+    etch.initialize(this);
+  }
+
+  render() {
+    if (this.editorShown) {
+      return (
+        $.div({className: 'wrapper'},
+          etch.dom(TextEditor, {ref: 'theEditor'})
+        )
+      )
+    } else {
+      return (
+        $.div({className: 'wrapper'}, 'Empty')
+      )
+    }
+  }
+
+  update() {
+    return etch.update(this)
+  }
+
+  observeEmbeddedTextEditor(cb) {
+    if (this.editorShown) {
+      cb(this.refs.theEditor)
+    }
+    return this.emitter.on('did-change-embedded-text-editor', cb)
+  }
+
+  async showEditor() {
+    const wasShown = this.editorShown
+    this.editorShown = true
+    await this.update()
+    if (!wasShown) {
+      this.emitter.emit('did-change-embedded-text-editor', this.refs.theEditor)
+    }
+  }
+
+  async hideEditor() {
+    const wasShown = this.editorShown
+    this.editorShown = false
+    await this.update()
+    if (wasShown) {
+      this.emitter.emit('did-change-embedded-text-editor', null)
+    }
+  }
+}
+
+DeferredEditorItem.uri = 'atom://find-and-replace/spec/deferred-editor'
+
+module.exports = DeferredEditorItem