Start to fix specs

Author: Wliu

lib/directory-view.js

@@ -89,7 +89,7 @@ class DirectoryView {
     this.subscriptions.add(this.directory.onDidAddEntries(addedEntries => {
       if (!this.isExpanded) return
 
-      let numberOfEntries = this.entries.children.length
+      const numberOfEntries = this.entries.children.length
 
       for (let entry of addedEntries) {
         const view = this.createViewForEntry(entry)
@@ -113,20 +113,14 @@ class DirectoryView {
   }
 
   createViewForEntry(entry) {
-    let view
-    if (entry instanceof Directory) {
-      view = new DirectoryView(entry)
-    } else {
-      view = new FileView(entry)
-    }
+    const view = entry instanceof Directory ? new DirectoryView(entry) : new FileView(entry)
 
-    var subscription = this.directory.onDidRemoveEntries(removedEntries => {
+    this.subscriptions.add(this.directory.onDidRemoveEntries(removedEntries => {
       if (removedEntries.has(entry)) {
         view.element.remove()
         subscription.dispose()
       }
-    })
-    this.subscriptions.add(subscription)
+    }))
 
     return view
   }

lib/directory.js

@@ -48,9 +48,9 @@ class Directory {
     // of time has passed since @expansionState.entries
     // has been converted to a Map
     if (!(this.expansionState.entries instanceof Map)) {
-      var convertEntriesToMap = entries => {
+      const convertEntriesToMap = entries => {
         const temp = new Map()
-        for (name in entries) {
+        for (let name in entries) {
           const entry = entries[name]
           if (entry.entries != null) {
             entry.entries = convertEntriesToMap(entry.entries)
@@ -235,7 +235,7 @@ class Directory {
       this.watchSubscription = null
     }
 
-    for(let [key, entry] of entries) {
+    for(let [key, entry] of this.entries) {
       entry.destroy()
       this.entries.delete(key)
     }
@@ -337,7 +337,7 @@ class Directory {
     const removedEntries = new Map(this.entries)
 
     let index = 0
-    for (var entry of this.getEntries()) {
+    for (let entry of this.getEntries()) {
       if (this.entries.has(entry)) {
         removedEntries.delete(entry)
         index++
@@ -369,7 +369,7 @@ class Directory {
     }
 
     if (newEntries.length > 0) {
-      for (entry of newEntries) {
+      for (let entry of newEntries) {
         this.entries.set(entry.name, entry)
       }
       this.emitter.emit('did-add-entries', newEntries)
@@ -398,7 +398,7 @@ class Directory {
     expansionState.isExpanded = this.expansionState.isExpanded
     expansionState.entries = new Map()
     for (let [name, entry] of this.entries) {
-      if (entry.expansionState == null) return
+      if (entry.expansionState == null) break
       expansionState.entries.set(name, entry.serializeExpansionState())
     }
     return expansionState