Upgrade Electron to v1.6.x

benchmarks/text-editor-large-file-construction.bench.js

@@ -26,7 +26,7 @@ export default async function ({test}) {
 
     let t0 = window.performance.now()
     const buffer = new TextBuffer({text})
-    const editor = new TextEditor({buffer, largeFileMode: true})
+    const editor = new TextEditor({buffer, autoHeight: false, largeFileMode: true})
     atom.workspace.getActivePane().activateItem(editor)
     let t1 = window.performance.now()
 

benchmarks/text-editor-long-lines.bench.js

@@ -33,7 +33,7 @@ export default async function ({test}) {
 
     let t0 = window.performance.now()
     const buffer = new TextBuffer({text})
-    const editor = new TextEditor({buffer, largeFileMode: true})
+    const editor = new TextEditor({buffer, autoHeight: false, largeFileMode: true})
     editor.setGrammar(atom.grammars.grammarForScopeName('source.js'))
     atom.workspace.getActivePane().activateItem(editor)
     let t1 = window.performance.now()

package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "MIT",
-  "electronVersion": "1.3.15",
+  "electronVersion": "1.6.9",
   "dependencies": {
     "async": "0.2.6",
     "atom-keymap": "8.1.2",
@@ -27,9 +27,10 @@
     "color": "^0.7.3",
     "dedent": "^0.6.0",
     "devtron": "1.3.0",
+    "etch": "^0.12.4",
     "event-kit": "^2.3.0",
     "find-parent-dir": "^0.3.0",
-    "first-mate": "7.0.4",
+    "first-mate": "7.0.6",
     "fs-plus": "^3.0.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
@@ -40,7 +41,7 @@
     "jasmine-tagged": "^1.1.4",
     "key-path-helpers": "^0.4.0",
     "less-cache": "1.1.0",
-    "line-top-index": "0.2.0",
+    "line-top-index": "0.3.1",
     "marked": "^0.3.6",
     "minimatch": "^3.0.3",
     "mocha": "2.5.1",
@@ -64,7 +65,7 @@
     "sinon": "1.17.4",
     "@atom/source-map-support": "^0.3.4",
     "temp": "^0.8.3",
-    "text-buffer": "11.4.1",
+    "text-buffer": "12.1.4",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.6",
     "winreg": "^1.2.1",
@@ -94,15 +95,15 @@
     "autosave": "0.24.3",
     "background-tips": "0.27.0",
     "bookmarks": "0.44.4",
-    "bracket-matcher": "0.85.5",
+    "bracket-matcher": "0.85.6",
     "command-palette": "0.40.4",
     "dalek": "0.2.1",
     "deprecation-cop": "0.56.7",
     "dev-live-reload": "0.47.1",
     "encoding-selector": "0.23.3",
     "exception-reporting": "0.41.4",
     "find-and-replace": "0.208.1",
-    "fuzzy-finder": "1.5.6",
+    "fuzzy-finder": "1.5.7",
     "github": "0.1.1",
     "git-diff": "1.3.6",
     "go-to-line": "0.32.1",
@@ -113,7 +114,7 @@
     "line-ending-selector": "0.6.3",
     "link": "0.31.3",
     "markdown-preview": "0.159.12",
-    "metrics": "1.2.3",
+    "metrics": "1.2.4",
     "notifications": "0.67.1",
     "open-on-github": "1.2.1",
     "package-generator": "1.1.1",
@@ -125,7 +126,7 @@
     "symbols-view": "0.116.0",
     "tabs": "0.106.0",
     "timecop": "0.36.0",
-    "tree-view": "0.217.0-7",
+    "tree-view": "0.217.0-8",
     "update-package-dependencies": "0.12.0",
     "welcome": "0.36.3",
     "whitespace": "0.36.2",
@@ -185,7 +186,12 @@
       "spyOn",
       "waitsFor",
       "waitsForPromise",
-      "indexedDB"
+      "indexedDB",
+      "IntersectionObserver",
+      "FocusEvent",
+      "requestAnimationFrame",
+      "HTMLElement",
+      "snapshotResult"
     ]
   }
 }

script/package.json

@@ -7,10 +7,10 @@
     "coffeelint": "1.15.7",
     "colors": "1.1.2",
     "csslint": "1.0.2",
-    "donna": "1.0.13",
-    "electron-chromedriver": "~1.3",
+    "donna": "1.0.16",
+    "electron-chromedriver": "~1.6",
     "electron-link": "0.0.24",
-    "electron-mksnapshot": "~1.3",
+    "electron-mksnapshot": "~1.6",
     "electron-packager": "7.3.0",
     "electron-winstaller": "2.5.2",
     "fs-extra": "0.30.0",

spec/atom-environment-spec.coffee

@@ -29,10 +29,12 @@ describe "AtomEnvironment", ->
         atom.setSize(originalSize.width, originalSize.height)
 
       it 'sets the size of the window, and can retrieve the size just set', ->
-        newWidth = originalSize.width + 12
-        newHeight = originalSize.height + 23
-        atom.setSize(newWidth, newHeight)
-        expect(atom.getSize()).toEqual width: newWidth, height: newHeight
+        newWidth = originalSize.width - 12
+        newHeight = originalSize.height - 23
+        waitsForPromise ->
+          atom.setSize(newWidth, newHeight)
+        runs ->
+          expect(atom.getSize()).toEqual width: newWidth, height: newHeight
 
   describe ".isReleasedVersion()", ->
     it "returns false if the version is a SHA and true otherwise", ->
@@ -221,44 +223,70 @@ describe "AtomEnvironment", ->
         atom.loadState().then (state) -> expect(state).toEqual(serializedState)
 
     it "saves state when the CPU is idle after a keydown or mousedown event", ->
-      spyOn(atom, 'saveState')
+      atomEnv = new AtomEnvironment({
+        applicationDelegate: global.atom.applicationDelegate,
+      })
       idleCallbacks = []
-      spyOn(window, 'requestIdleCallback').andCallFake (callback) -> idleCallbacks.push(callback)
+      atomEnv.initialize({
+        window: {
+          requestIdleCallback: (callback) -> idleCallbacks.push(callback),
+          addEventListener: ->
+          removeEventListener: ->
+        },
+        document: document.implementation.createHTMLDocument()
+      })
+
+      spyOn(atomEnv, 'saveState')
 
       keydown = new KeyboardEvent('keydown')
-      atom.document.dispatchEvent(keydown)
-      advanceClock atom.saveStateDebounceInterval
+      atomEnv.document.dispatchEvent(keydown)
+      advanceClock atomEnv.saveStateDebounceInterval
       idleCallbacks.shift()()
-      expect(atom.saveState).toHaveBeenCalledWith({isUnloading: false})
-      expect(atom.saveState).not.toHaveBeenCalledWith({isUnloading: true})
+      expect(atomEnv.saveState).toHaveBeenCalledWith({isUnloading: false})
+      expect(atomEnv.saveState).not.toHaveBeenCalledWith({isUnloading: true})
 
-      atom.saveState.reset()
+      atomEnv.saveState.reset()
       mousedown = new MouseEvent('mousedown')
-      atom.document.dispatchEvent(mousedown)
-      advanceClock atom.saveStateDebounceInterval
+      atomEnv.document.dispatchEvent(mousedown)
+      advanceClock atomEnv.saveStateDebounceInterval
       idleCallbacks.shift()()
-      expect(atom.saveState).toHaveBeenCalledWith({isUnloading: false})
-      expect(atom.saveState).not.toHaveBeenCalledWith({isUnloading: true})
+      expect(atomEnv.saveState).toHaveBeenCalledWith({isUnloading: false})
+      expect(atomEnv.saveState).not.toHaveBeenCalledWith({isUnloading: true})
+
+      atomEnv.destroy()
 
     it "ignores mousedown/keydown events happening after calling unloadEditorWindow", ->
-      spyOn(atom, 'saveState')
+      atomEnv = new AtomEnvironment({
+        applicationDelegate: global.atom.applicationDelegate,
+      })
       idleCallbacks = []
-      spyOn(window, 'requestIdleCallback').andCallFake (callback) -> idleCallbacks.push(callback)
+      atomEnv.initialize({
+        window: {
+          requestIdleCallback: (callback) -> idleCallbacks.push(callback),
+          addEventListener: ->
+          removeEventListener: ->
+        },
+        document: document.implementation.createHTMLDocument()
+      })
+
+      spyOn(atomEnv, 'saveState')
 
       mousedown = new MouseEvent('mousedown')
-      atom.document.dispatchEvent(mousedown)
-      atom.unloadEditorWindow()
-      expect(atom.saveState).not.toHaveBeenCalled()
+      atomEnv.document.dispatchEvent(mousedown)
+      atomEnv.unloadEditorWindow()
+      expect(atomEnv.saveState).not.toHaveBeenCalled()
 
-      advanceClock atom.saveStateDebounceInterval
+      advanceClock atomEnv.saveStateDebounceInterval
       idleCallbacks.shift()()
-      expect(atom.saveState).not.toHaveBeenCalled()
+      expect(atomEnv.saveState).not.toHaveBeenCalled()
 
       mousedown = new MouseEvent('mousedown')
-      atom.document.dispatchEvent(mousedown)
-      advanceClock atom.saveStateDebounceInterval
+      atomEnv.document.dispatchEvent(mousedown)
+      advanceClock atomEnv.saveStateDebounceInterval
       idleCallbacks.shift()()
-      expect(atom.saveState).not.toHaveBeenCalled()
+      expect(atomEnv.saveState).not.toHaveBeenCalled()
+
+      atomEnv.destroy()
 
     it "serializes the project state with all the options supplied in saveState", ->
       spyOn(atom.project, 'serialize').andReturn({foo: 42})
@@ -288,10 +316,13 @@ describe "AtomEnvironment", ->
             }
           )
         })
+        atom2.initialize({document, window})
         atom2.deserialize(atom.serialize())
 
         expect(atom2.textEditors.getGrammarOverride(editor)).toBe('text.plain')
 
+        atom2.destroy()
+
   describe "openInitialEmptyEditorIfNecessary", ->
     describe "when there are no paths set", ->
       beforeEach ->
@@ -452,11 +483,14 @@ describe "AtomEnvironment", ->
       }
       atomEnvironment = new AtomEnvironment({applicationDelegate: atom.applicationDelegate})
       atomEnvironment.initialize({window, document: fakeDocument})
-      spyOn(atomEnvironment.packages, 'getAvailablePackagePaths').andReturn []
-      spyOn(atomEnvironment, 'displayWindow').andReturn Promise.resolve()
-      atomEnvironment.startEditorWindow()
-      atomEnvironment.unloadEditorWindow()
-      atomEnvironment.destroy()
+      spyOn(atomEnvironment.packages, 'loadPackages').andReturn(Promise.resolve())
+      spyOn(atomEnvironment.packages, 'activate').andReturn(Promise.resolve())
+      spyOn(atomEnvironment, 'displayWindow').andReturn(Promise.resolve())
+      waitsForPromise ->
+        atomEnvironment.startEditorWindow()
+      runs ->
+        atomEnvironment.unloadEditorWindow()
+        atomEnvironment.destroy()
 
   describe "::whenShellEnvironmentLoaded()", ->
     [atomEnvironment, envLoaded, spy] = []
@@ -471,21 +505,19 @@ describe "AtomEnvironment", ->
         applicationDelegate: atom.applicationDelegate
         updateProcessEnv: -> promise
       atomEnvironment.initialize({window, document})
-      spyOn(atomEnvironment.packages, 'getAvailablePackagePaths').andReturn []
-      spyOn(atomEnvironment, 'displayWindow').andReturn Promise.resolve()
       spy = jasmine.createSpy()
-      atomEnvironment.startEditorWindow()
 
     afterEach ->
-      atomEnvironment.unloadEditorWindow()
       atomEnvironment.destroy()
 
     it "is triggered once the shell environment is loaded", ->
       atomEnvironment.whenShellEnvironmentLoaded spy
+      atomEnvironment.updateProcessEnvAndTriggerHooks()
       envLoaded()
       runs -> expect(spy).toHaveBeenCalled()
 
     it "triggers the callback immediately if the shell environment is already loaded", ->
+      atomEnvironment.updateProcessEnvAndTriggerHooks()
       envLoaded()
       runs ->
         atomEnvironment.whenShellEnvironmentLoaded spy

spec/atom-reporter.coffee

@@ -21,8 +21,8 @@ formatStackTrace = (spec, message='', stackTrace) ->
   lines.shift() if message.trim() is errorMatch?[1]?.trim()
 
   for line, index in lines
-    # Remove prefix of lines matching: at .<anonymous> (path:1:2)
-    prefixMatch = line.match(/at \.<anonymous> \(([^)]+)\)/)
+    # Remove prefix of lines matching: at jasmine.Spec.<anonymous> (path:1:2)
+    prefixMatch = line.match(/at jasmine\.Spec\.<anonymous> \(([^)]+)\)/)
     line = "at #{prefixMatch[1]}" if prefixMatch
 
     # Relativize locations to spec directory

spec/babel-spec.coffee

@@ -43,6 +43,7 @@ describe "Babel transpiler support", ->
 
   describe "when a .js file does not start with 'use babel';", ->
     it "does not transpile it using babel", ->
+      spyOn(console, 'error')
       expect(-> require('./fixtures/babel/invalid.js')).toThrow()
 
     it "does not try to log to stdout or stderr while parsing the file", ->