fix #47, partially fix #46

lib/filesystem.js

@@ -9,6 +9,7 @@ define(function (require, exports, module) {
   var CommandManager = brackets.getModule('command/CommandManager')
   var Commands = brackets.getModule('command/Commands')
   var FileUtils = brackets.getModule('file/FileUtils')
+  var MainViewManager = brackets.getModule('view/MainViewManager')
 
   var EditorWrapper = require('./editor')
 
@@ -38,6 +39,8 @@ define(function (require, exports, module) {
       for (var i = 0; i < allFiles.length; i++) {
         ;(function (i) {
           allFiles[i].read(function (err, contents, stat) {
+            if (err) return console.error(err)
+
             var filePath = FileUtils.getRelativeFilename(
               EditorWrapper.projectPath,
               allFiles[i].fullPath
@@ -116,6 +119,8 @@ define(function (require, exports, module) {
       self.changeQueues[absPath] = [change]
 
       self._buildPath(absPath, false, function () {
+        if (!self.changeQueues[absPath]) return
+
         // Empty the queue that built up
         while (self.changeQueues[absPath][0]) {
           self._pushChangeToDocument(absPath, self.changeQueues[absPath].shift())
@@ -152,12 +157,12 @@ define(function (require, exports, module) {
 
   FileSystemWrapper.prototype._pushChangeToDocument = function (absPath, change, saveAfter) {
     var self = this
-
+    var isWorkingFile = !!MainViewManager.findInAllWorkingSets(absPath).length
+
     return DocumentManager.getDocumentForPath(absPath).then(function (doc) {
       console.log(change.fn)
       if (change.fn === 'setValue') {
-        doc._ensureMasterEditor()
-        doc._masterEditor._codeMirror.setValue(change.content)
+        doc.refreshText(change.content, doc.diskTimestamp, true)
       } else if (change.fn === 'replaceRange') {
         doc.replaceRange(change.text, change.from, change.to)
       } else {
@@ -168,6 +173,10 @@ define(function (require, exports, module) {
         CommandManager.execute(Commands.FILE_SAVE, {doc: doc}).then(noop).fail(noop)
         ProjectManager.refreshFileTree()
       }
+
+      if (!isWorkingFile) {
+        CommandManager.execute(Commands.FILE_CLOSE_LIST, {fileList: [doc.file]});
+      }
     })
   }
 

package.json

@@ -3,7 +3,7 @@
   "title": "Multihack",
   "description": "Realtime collaboration for programmers. ALPHA",
   "homepage": "https://github.com/RationalCoding/multihack-brackets",
-  "version": "4.2.3",
+  "version": "4.2.4",
   "author": "Thomas Mullen",
   "license": "MIT",
   "scripts": {