From 31a3d0621c3fe7de929d4492536b308c9ae106e4 Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Tue, 4 Oct 2016 00:23:54 +0200
Subject: [PATCH 1/7] GH-286 React to file system changes in file browser

---
 VimR/AppDelegate.swift          |  3 +--
 VimR/FileBrowserComponent.swift | 18 ++++++++++++++++++
 VimR/FileItem.swift             |  2 +-
 VimR/FileItemService.swift      | 11 ++++++++++-
 VimR/MainWindowComponent.swift  |  2 ++
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/VimR/AppDelegate.swift b/VimR/AppDelegate.swift
index 6eb09a9a..8a8389e0 100644
--- a/VimR/AppDelegate.swift
+++ b/VimR/AppDelegate.swift
@@ -75,7 +75,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         })
       .addDisposableTo(self.disposeBag)
 
-    let changeFlows: [Flow] = [ self.prefStore ]
+    let changeFlows: [Flow] = [ self.prefStore, self.fileItemService ]
     let actionFlows: [Flow] = [ self.prefWindowComponent, self.mainWindowManager ]
 
     changeFlows
@@ -84,7 +84,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
       .subscribe(self.changeSubject)
       .addDisposableTo(self.disposeBag)
 
-
     actionFlows
       .map { $0.sink }
       .toMergedObservables()
diff --git a/VimR/FileBrowserComponent.swift b/VimR/FileBrowserComponent.swift
index 58f7f2ff..4aa952ef 100644
--- a/VimR/FileBrowserComponent.swift
+++ b/VimR/FileBrowserComponent.swift
@@ -50,6 +50,24 @@ class FileBrowserComponent: ViewComponent, NSOutlineViewDataSource, NSOutlineVie
         }
       })
       .addDisposableTo(self.disposeBag)
+
+    self.fileItemService.sink
+      .filter { $0 is FileItemServiceChange }
+      .map { $0 as! FileItemServiceChange }
+      .subscribe(onNext: { [unowned self] action in
+        switch action {
+        case let .childrenChanged(root, fileItem):
+          guard root == self.cwd else {
+            return
+          }
+
+//          NSLog("\(root) -> \(fileItem)")
+          DispatchUtils.gui {
+            self.fileView.reloadItem(fileItem, reloadChildren: true)
+          }
+        }
+        })
+      .addDisposableTo(self.disposeBag)
   }
 
   override func addViews() {
diff --git a/VimR/FileItem.swift b/VimR/FileItem.swift
index d3d91eeb..5a2c7303 100644
--- a/VimR/FileItem.swift
+++ b/VimR/FileItem.swift
@@ -28,7 +28,7 @@ class FileItem : CustomStringConvertible {
   var children: [FileItem] = []
 
   var description: String {
-    return "<FileItem: \(self.url), dir=\(self.dir), hidden=\(self.hidden), package=\(self.package)"
+    return "<FileItem: \(self.url), dir=\(self.dir), hidden=\(self.hidden), package=\(self.package), "
       + "needsScan=\(self.needsScanChildren), childrenScanned=\(self.childrenScanned), "
       + "ignore=\(self.ignore), ignoreToken=\(self.ignoreToken), "
       + "children=\(self.children.count)>"
diff --git a/VimR/FileItemService.swift b/VimR/FileItemService.swift
index be8da327..ecbbde3a 100644
--- a/VimR/FileItemService.swift
+++ b/VimR/FileItemService.swift
@@ -7,6 +7,11 @@ import Cocoa
 import RxSwift
 import EonilFileSystemEvents
 
+enum FileItemServiceChange {
+
+  case childrenChanged(root: URL, fileItem: FileItem?)
+}
+
 class FileItemService: StandardFlow {
 
   /// Used to cache fnmatch calls in `FileItem`.
@@ -71,7 +76,11 @@ class FileItemService: StandardFlow {
     { [unowned self] events in
       let urls = events.map { URL(fileURLWithPath: $0.path) }
       let parent = FileUtils.commonParent(ofUrls: urls)
-      self.fileItem(for: parent)?.needsScanChildren = true
+
+      let parentItem = self.fileItem(for: parent)
+
+      parentItem?.needsScanChildren = true
+      self.publish(event: FileItemServiceChange.childrenChanged(root: url, fileItem: parentItem))
     }
 
     self.monitors[url] = monitor
diff --git a/VimR/MainWindowComponent.swift b/VimR/MainWindowComponent.swift
index 74382daf..b57fcdde 100644
--- a/VimR/MainWindowComponent.swift
+++ b/VimR/MainWindowComponent.swift
@@ -92,6 +92,8 @@ class MainWindowComponent: WindowComponent, NSWindowDelegate, NSUserInterfaceVal
 
     self.workspace.delegate = self
 
+    // FIXME: We do not use [self.sink, source].toMergedObservables. If we do so, then self.sink seems to live as long
+    // as source, i.e. forever. Thus, self (MainWindowComponent) does not get deallocated. Not nice...
     let fileBrowser = FileBrowserComponent(source: self.sink, fileItemService: fileItemService)
     let fileBrowserTool = WorkspaceToolComponent(title: "Files", viewComponent: fileBrowser, minimumDimension: 100)
     self.tools[.fileBrowser] = fileBrowserTool

From 8685b2168a563d20af60c2e3f990fd3f81a28ed6 Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Tue, 4 Oct 2016 19:26:15 +0200
Subject: [PATCH 2/7] GH-284 Remove unused param

---
 NeoVimServer/server_ui.m             | 19 ++++++++-----------
 SwiftNeoVim/Grid.swift               |  1 -
 SwiftNeoVim/NeoVimAgent.m            | 12 ++++++------
 SwiftNeoVim/NeoVimUiBridgeProtocol.h |  6 +++---
 SwiftNeoVim/NeoVimView.swift         |  9 +++------
 5 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/NeoVimServer/server_ui.m b/NeoVimServer/server_ui.m
index e1c990db..96046a71 100644
--- a/NeoVimServer/server_ui.m
+++ b/NeoVimServer/server_ui.m
@@ -302,12 +302,11 @@ static void server_ui_flush(UI *ui __unused) {
 
 static void server_ui_update_fg(UI *ui __unused, int fg) {
   queue(^{
-    int value[2];
-    value[1] = *p_bg == 'd' ? true : false;
+    int value[1];
 
     if (fg == -1) {
       value[0] = _default_foreground;
-      NSData *data = [[NSData alloc] initWithBytes:value length:(2 * sizeof(int))];
+      NSData *data = [[NSData alloc] initWithBytes:value length:(1 * sizeof(int))];
       [_neovim_server sendMessageWithId:NeoVimServerMsgIdSetForeground data:data];
       [data release];
 
@@ -317,7 +316,7 @@ static void server_ui_update_fg(UI *ui __unused, int fg) {
     _default_foreground = pun_type(unsigned int, fg);
 
     value[0] = fg;
-    NSData *data = [[NSData alloc] initWithBytes:value length:(2 * sizeof(int))];
+    NSData *data = [[NSData alloc] initWithBytes:value length:(1 * sizeof(int))];
     [_neovim_server sendMessageWithId:NeoVimServerMsgIdSetForeground data:data];
     [data release];
   });
@@ -325,12 +324,11 @@ static void server_ui_update_fg(UI *ui __unused, int fg) {
 
 static void server_ui_update_bg(UI *ui __unused, int bg) {
   queue(^{
-    int value[2];
-    value[1] = *p_bg == 'd' ? true : false;
+    int value[1];
 
     if (bg == -1) {
       value[0] = _default_background;
-      NSData *data = [[NSData alloc] initWithBytes:value length:(2 * sizeof(int))];
+      NSData *data = [[NSData alloc] initWithBytes:value length:(1 * sizeof(int))];
       [_neovim_server sendMessageWithId:NeoVimServerMsgIdSetBackground data:data];
       [data release];
 
@@ -339,7 +337,7 @@ static void server_ui_update_bg(UI *ui __unused, int bg) {
 
     _default_background = pun_type(unsigned int, bg);
     value[0] = bg;
-    NSData *data = [[NSData alloc] initWithBytes:value length:(2 * sizeof(int))];
+    NSData *data = [[NSData alloc] initWithBytes:value length:(1 * sizeof(int))];
     [_neovim_server sendMessageWithId:NeoVimServerMsgIdSetBackground data:data];
     [data release];
   });
@@ -348,11 +346,10 @@ static void server_ui_update_bg(UI *ui __unused, int bg) {
 static void server_ui_update_sp(UI *ui __unused, int sp) {
   queue(^{
     int value[2];
-    value[1] = *p_bg == 'd' ? true : false;
 
     if (sp == -1) {
       value[0] = _default_special;
-      NSData *data = [[NSData alloc] initWithBytes:&value length:(2 * sizeof(int))];
+      NSData *data = [[NSData alloc] initWithBytes:&value length:(1 * sizeof(int))];
       [_neovim_server sendMessageWithId:NeoVimServerMsgIdSetSpecial data:data];
       [data release];
 
@@ -361,7 +358,7 @@ static void server_ui_update_sp(UI *ui __unused, int sp) {
 
     _default_special = pun_type(unsigned int, sp);
     value[0] = sp;
-    NSData *data = [[NSData alloc] initWithBytes:&value length:(2 * sizeof(int))];
+    NSData *data = [[NSData alloc] initWithBytes:&value length:(1 * sizeof(int))];
     [_neovim_server sendMessageWithId:NeoVimServerMsgIdSetSpecial data:data];
     [data release];
   });
diff --git a/SwiftNeoVim/Grid.swift b/SwiftNeoVim/Grid.swift
index ee732cd1..0dbec8e6 100644
--- a/SwiftNeoVim/Grid.swift
+++ b/SwiftNeoVim/Grid.swift
@@ -92,7 +92,6 @@ class Grid: CustomStringConvertible {
   var foreground = qDefaultForeground
   var background = qDefaultBackground
   var special = qDefaultSpecial
-  var dark = false
   
   var attrs: CellAttributes = CellAttributes(
     fontTrait: .none,
diff --git a/SwiftNeoVim/NeoVimAgent.m b/SwiftNeoVim/NeoVimAgent.m
index cb687420..2c1c2c75 100644
--- a/SwiftNeoVim/NeoVimAgent.m
+++ b/SwiftNeoVim/NeoVimAgent.m
@@ -443,20 +443,20 @@ static CFDataRef local_server_callback(CFMessagePortRef local, SInt32 msgid, CFD
       return;
 
     case NeoVimServerMsgIdSetForeground: {
-      int *values = data_to_int_array(data, 2);
-      [_bridge updateForeground:values[0] dark:(bool) values[1]];
+      int *values = data_to_int_array(data, 1);
+      [_bridge updateForeground:values[0]];
       return;
     }
 
     case NeoVimServerMsgIdSetBackground: {
-      int *values = data_to_int_array(data, 2);
-      [_bridge updateBackground:values[0] dark:(bool) values[1]];
+      int *values = data_to_int_array(data, 1);
+      [_bridge updateBackground:values[0]];
       return;
     }
 
     case NeoVimServerMsgIdSetSpecial: {
-      int *values = data_to_int_array(data, 2);
-      [_bridge updateSpecial:values[0] dark:(bool) values[1]];
+      int *values = data_to_int_array(data, 1);
+      [_bridge updateSpecial:values[0]];
       return;
     }
 
diff --git a/SwiftNeoVim/NeoVimUiBridgeProtocol.h b/SwiftNeoVim/NeoVimUiBridgeProtocol.h
index 32ba1742..ea6a62ee 100644
--- a/SwiftNeoVim/NeoVimUiBridgeProtocol.h
+++ b/SwiftNeoVim/NeoVimUiBridgeProtocol.h
@@ -97,17 +97,17 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Set the default foreground color.
  */
-- (void)updateForeground:(int)fg dark:(bool)dark;
+- (void)updateForeground:(int)fg;
 
 /**
  * Set the default background color.
  */
-- (void)updateBackground:(int)bg dark:(bool)dark;
+- (void)updateBackground:(int)bg;
 
 /**
  * Set the default special color, eg curly underline for spelling errors.
  */
-- (void)updateSpecial:(int)sp dark:(bool)dark;
+- (void)updateSpecial:(int)sp;
 
 - (void)suspend;
 - (void)setTitle:(NSString *)title;
diff --git a/SwiftNeoVim/NeoVimView.swift b/SwiftNeoVim/NeoVimView.swift
index 203623f0..5e254443 100644
--- a/SwiftNeoVim/NeoVimView.swift
+++ b/SwiftNeoVim/NeoVimView.swift
@@ -1225,26 +1225,23 @@ extension NeoVimView: NeoVimUiBridgeProtocol {
 //    NSLog("\(#function)")
   }
   
-  public func updateForeground(_ fg: Int32, dark: Bool) {
+  public func updateForeground(_ fg: Int32) {
     DispatchUtils.gui {
-      self.grid.dark = dark
       self.grid.foreground = UInt32(bitPattern: fg)
 //      NSLog("\(ColorUtils.colorIgnoringAlpha(UInt32(fg)))")
     }
   }
   
-  public func updateBackground(_ bg: Int32, dark: Bool) {
+  public func updateBackground(_ bg: Int32) {
     DispatchUtils.gui {
-      self.grid.dark = dark
       self.grid.background = UInt32(bitPattern: bg)
       self.layer?.backgroundColor = ColorUtils.colorIgnoringAlpha(self.grid.background).cgColor
 //      NSLog("\(ColorUtils.colorIgnoringAlpha(UInt32(bg)))")
     }
   }
   
-  public func updateSpecial(_ sp: Int32, dark: Bool) {
+  public func updateSpecial(_ sp: Int32) {
     DispatchUtils.gui {
-      self.grid.dark = dark
       self.grid.special = UInt32(bitPattern: sp)
     }
   }

From ccdd690b64052d48b21cc37a23a531dfadc5a107 Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Tue, 4 Oct 2016 19:37:19 +0200
Subject: [PATCH 3/7] GH-284 Use queue in autocmds groups callback

---
 NeoVimServer/server_ui.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NeoVimServer/server_ui.m b/NeoVimServer/server_ui.m
index 96046a71..3b0d3e56 100644
--- a/NeoVimServer/server_ui.m
+++ b/NeoVimServer/server_ui.m
@@ -545,7 +545,7 @@ void custom_ui_start(void) {
 void custom_ui_autocmds_groups(
     event_T event, char_u *fname, char_u *fname_io, int group, bool force, buf_T *buf, exarg_T *eap
 ) {
-  @autoreleasepool {
+  queue(^{
     DLOG("got event %d for file %s in group %d.", event, fname, group);
     switch (event) {
       // Did we get them all?
@@ -563,7 +563,7 @@ void custom_ui_autocmds_groups(
       default:
         return;
     }
-  }
+  });
 }
 
 void server_start_neovim() {

From 025edf7e238c1896cacb1162c474fa53f6610665 Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Tue, 4 Oct 2016 19:38:37 +0200
Subject: [PATCH 4/7] GH-284 Reformat

---
 SwiftNeoVim/Grid.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SwiftNeoVim/Grid.swift b/SwiftNeoVim/Grid.swift
index 0dbec8e6..666f3af0 100644
--- a/SwiftNeoVim/Grid.swift
+++ b/SwiftNeoVim/Grid.swift
@@ -6,6 +6,7 @@
 import Cocoa
 
 struct Cell: CustomStringConvertible {
+  
   fileprivate let attributes: CellAttributes
 
   let string: String

From 7324e5447ce74ea82e96e1a9918eebd3351dd386 Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Tue, 4 Oct 2016 20:49:02 +0200
Subject: [PATCH 5/7] GH-284 Wrap in main queue

---
 SwiftNeoVim/NeoVimView.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SwiftNeoVim/NeoVimView.swift b/SwiftNeoVim/NeoVimView.swift
index 5e254443..e6836cb6 100644
--- a/SwiftNeoVim/NeoVimView.swift
+++ b/SwiftNeoVim/NeoVimView.swift
@@ -1137,7 +1137,9 @@ extension NeoVimView: NeoVimUiBridgeProtocol {
   
   public func modeChange(_ mode: Mode) {
 //    NSLog("mode changed to: %02x", mode.rawValue)
-    self.mode = mode
+    DispatchUtils.gui {
+      self.mode = mode
+    }
   }
   
   public func setScrollRegionToTop(_ top: Int32, bottom: Int32, left: Int32, right: Int32) {

From eebb19280d8f8c3ca37ac994120488b41e7b8061 Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Tue, 4 Oct 2016 22:48:07 +0200
Subject: [PATCH 6/7] GH-284 Sync stupidly every API function of Grid

---
 SwiftNeoVim/Grid.swift       | 76 +++++++++++++++++++++++++++++++-----
 SwiftNeoVim/NeoVimView.swift |  7 ++++
 VimR/FileOutlineView.swift   |  1 -
 3 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/SwiftNeoVim/Grid.swift b/SwiftNeoVim/Grid.swift
index 666f3af0..aedc69de 100644
--- a/SwiftNeoVim/Grid.swift
+++ b/SwiftNeoVim/Grid.swift
@@ -85,6 +85,8 @@ struct Region: CustomStringConvertible {
 /// Almost a verbatim copy of ugrid.c of NeoVim
 class Grid: CustomStringConvertible {
 
+  fileprivate let lock = NSRecursiveLock()
+
   fileprivate(set) var region = Region.zero
   fileprivate(set) var size = Size.zero
   fileprivate(set) var putPosition = Position.zero
@@ -102,7 +104,11 @@ class Grid: CustomStringConvertible {
   fileprivate(set) var cells: [[Cell]] = []
 
   var hasData: Bool {
-    return !self.cells.isEmpty
+    lock.lock()
+    let result = !self.cells.isEmpty
+    lock.unlock()
+
+    return result
   }
   
   var description: String {
@@ -110,6 +116,7 @@ class Grid: CustomStringConvertible {
   }
   
   func resize(_ size: Size) {
+    lock.lock()
     self.region = Region(top: 0, bottom: size.height - 1, left: 0, right: size.width - 1)
     self.size = size
     self.putPosition = Position.zero
@@ -119,10 +126,13 @@ class Grid: CustomStringConvertible {
     
     let emptyRow = Array(repeating: Cell(string: " ", attrs: emptyCellAttrs), count: size.width)
     self.cells = Array(repeating: emptyRow, count: size.height)
+    lock.unlock()
   }
   
   func clear() {
+    lock.lock()
     self.clearRegion(self.region)
+    lock.unlock()
   }
   
   func eolClear() {
@@ -133,10 +143,13 @@ class Grid: CustomStringConvertible {
   }
   
   func setScrollRegion(_ region: Region) {
+    lock.lock()
     self.region = region
+    lock.unlock()
   }
   
   func scroll(_ count: Int) {
+    lock.lock()
     var start, stop, step : Int
     if count > 0 {
       start = self.region.top;
@@ -164,17 +177,23 @@ class Grid: CustomStringConvertible {
       clearTop = stop + count + 1
     }
     self.clearRegion(Region(top: clearTop, bottom: clearBottom, left: self.region.left, right: self.region.right))
+    lock.unlock()
   }
   
   func goto(_ position: Position) {
+    lock.lock()
     self.putPosition = position
+    lock.unlock()
   }
   
   func moveCursor(_ position: Position) {
+    lock.lock()
     self.screenCursor = position
+    lock.unlock()
   }
   
   func put(_ string: String) {
+    lock.lock()
     // FIXME: handle the following situation:
     // |abcde | <- type ㅎ
     // =>
@@ -185,32 +204,44 @@ class Grid: CustomStringConvertible {
     // Increment the column of the put position because neovim calls sets the position only once when drawing
     // consecutive cells in the same line
     self.putPosition.column += 1
+    lock.unlock()
   }
 
   func putMarkedText(_ string: String) {
+    lock.lock()
     // NOTE: Maybe there's a better way to indicate marked text than inverting...
     self.cells[self.putPosition.row][self.putPosition.column] = Cell(string: string, attrs: self.attrs, marked: true)
     self.putPosition.column += 1
+    lock.unlock()
   }
 
   func unmarkCell(_ position: Position) {
-//    NSLog("\(#function): \(position)")
+    lock.lock()
+    //    NSLog("\(#function): \(position)")
     self.cells[position.row][position.column].marked = false
+    lock.unlock()
   }
 
   func singleIndexFrom(_ position: Position) -> Int {
-    return position.row * self.size.width + position.column
+    lock.lock()
+    let result = position.row * self.size.width + position.column
+    lock.unlock()
+
+    return result
   }
 
   func regionOfWord(at position: Position) -> Region {
+    lock.lock()
     let row = position.row
     let column = position.column
 
     guard row < self.size.height else {
+      lock.unlock()
       return Region.zero
     }
 
     guard column < self.size.width else {
+      lock.unlock()
       return Region.zero
     }
 
@@ -231,48 +262,75 @@ class Grid: CustomStringConvertible {
         break
       }
     }
-    
+    lock.unlock()
+
     return Region(top: row, bottom: row, left: left, right: right)
   }
 
   func positionFromSingleIndex(_ idx: Int) -> Position {
+    lock.lock()
     let row = Int(floor(Double(idx) / Double(self.size.width)))
     let column = idx - row * self.size.width
+    lock.unlock()
 
     return Position(row: row, column: column)
   }
 
   func isCellEmpty(_ position: Position) -> Bool {
+    lock.lock()
     guard self.isSane(position: position) else {
+      lock.unlock()
       return false
     }
 
     if self.cells[position.row][position.column].string.characters.count == 0 {
+      lock.unlock()
       return true
     }
 
+    lock.unlock()
     return false
   }
 
   func isPreviousCellEmpty(_ position: Position) -> Bool {
-    return self.isCellEmpty(self.previousCellPosition(position))
+    lock.lock()
+    let result = self.isCellEmpty(self.previousCellPosition(position))
+    lock.unlock()
+
+    return result
   }
 
   func isNextCellEmpty(_ position: Position) -> Bool {
-    return self.isCellEmpty(self.nextCellPosition(position))
+    lock.lock()
+    let result = self.isCellEmpty(self.nextCellPosition(position))
+    lock.unlock()
+
+    return result
   }
 
   func previousCellPosition(_ position: Position) -> Position {
-    return Position(row: position.row, column: max(position.column - 1, 0))
+    lock.lock()
+    let result = Position(row: position.row, column: max(position.column - 1, 0))
+    lock.unlock()
+
+    return result
   }
   
   func nextCellPosition(_ position: Position) -> Position {
-    return Position(row: position.row, column: min(position.column + 1, self.size.width - 1))
+    lock.lock()
+    let result = Position(row: position.row, column: min(position.column + 1, self.size.width - 1))
+    lock.unlock()
+
+    return result
   }
   
   func cellForSingleIndex(_ idx: Int) -> Cell {
+    lock.unlock()
     let position = self.positionFromSingleIndex(idx)
-    return self.cells[position.row][position.column]
+    let result = self.cells[position.row][position.column]
+    lock.unlock()
+
+    return result
   }
 
   fileprivate func clearRegion(_ region: Region) {
diff --git a/SwiftNeoVim/NeoVimView.swift b/SwiftNeoVim/NeoVimView.swift
index e6836cb6..3cbe1b58 100644
--- a/SwiftNeoVim/NeoVimView.swift
+++ b/SwiftNeoVim/NeoVimView.swift
@@ -270,6 +270,12 @@ extension NeoVimView {
 // MARK: - Resizing
 extension NeoVimView {
 
+  fileprivate func test() {
+    if Thread.current != Thread.main {
+      NSLog("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+    }
+  }
+
   override open func setFrameSize(_ newSize: NSSize) {
     super.setFrameSize(newSize)
 
@@ -295,6 +301,7 @@ extension NeoVimView {
   }
 
   fileprivate func resizeNeoVimUiTo(size: CGSize) {
+    test()
 //    NSLog("\(#function): \(size)")
     let discreteSize = self.discreteSize(size: size)
 
diff --git a/VimR/FileOutlineView.swift b/VimR/FileOutlineView.swift
index 97100562..783278ec 100644
--- a/VimR/FileOutlineView.swift
+++ b/VimR/FileOutlineView.swift
@@ -27,7 +27,6 @@ class FileOutlineView: NSOutlineView, Flow {
     self.flow = EmbeddableComponent(source: source)
 
     super.init(frame: CGRect.zero)
-    self.translatesAutoresizingMaskIntoConstraints = false
   }
 
   override func keyDown(with event: NSEvent) {

From 242c4511f6fee9fb90a4e535738037afd4588aff Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Sat, 7 Jan 2017 20:29:50 +0100
Subject: [PATCH 7/7] Bump appcast to SNAPSHOT-158

---
 appcast_snapshot.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/appcast_snapshot.xml b/appcast_snapshot.xml
index e7163095..f1893492 100644
--- a/appcast_snapshot.xml
+++ b/appcast_snapshot.xml
@@ -7,22 +7,22 @@
     <description>Most recent changes with links to updates for VimR.</description>
     <language>en</language>
     <item>
-      <title>SNAPSHOT-155</title>
+      <title>SNAPSHOT-158</title>
       <description><![CDATA[
     <ul>
-<li>GH-376: Bugfix: Exiting full-screen sometimes causes crashes.</li>
+<li>GH-376: Bugfix, cf. GH-376</li>
 </ul>
   ]]></description>
       <releaseNotesLink>
-        https://github.com/qvacua/vimr/releases/tag/snapshot/155
+        https://github.com/qvacua/vimr/releases/tag/snapshot/158
       </releaseNotesLink>
-      <pubDate>2017-01-03T16:31:51.572342</pubDate>
+      <pubDate>2017-01-07T20:29:50.456369</pubDate>
       <minimumSystemVersion>10.10.0</minimumSystemVersion>
-      <enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/155/VimR-SNAPSHOT-155.tar.bz2"
-                 sparkle:version="155"
-                 sparkle:shortVersionString="SNAPSHOT-155"
-                 sparkle:dsaSignature="MC0CFChO38SeiLdPgBlj+bCPGkfidJrzAhUA0wW+82GFrpOSo4lMO0o6+RgtsfM="
-                 length="9308132"
+      <enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/158/VimR-SNAPSHOT-158.tar.bz2"
+                 sparkle:version="158"
+                 sparkle:shortVersionString="SNAPSHOT-158"
+                 sparkle:dsaSignature="MC0CFG92LrV5qxhgvETvF+5Tarn4uOGlAhUA51FNIy+3zlaMwtGsrRgAzy+69o8="
+                 length="9308252"
                  type="application/octet-stream"/>
     </item>
   </channel>