Merge pull request #16282 from atom/io-electron-1.7

Upgrade electron to 1.7.10

package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "MIT",
-  "electronVersion": "1.6.15",
+  "electronVersion": "1.7.10",
   "dependencies": {
     "@atom/nsfw": "^1.0.18",
     "@atom/source-map-support": "^0.3.4",

script/lib/generate-startup-snapshot.js

@@ -46,6 +46,7 @@ module.exports = function (packagedAppPath) {
         relativePath === path.join('..', 'node_modules', 'less', 'index.js') ||
         relativePath === path.join('..', 'node_modules', 'less', 'lib', 'less', 'fs.js') ||
         relativePath === path.join('..', 'node_modules', 'less', 'lib', 'less-node', 'index.js') ||
+        relativePath === path.join('..', 'node_modules', 'lodash.isequal', 'index.js') ||
         relativePath === path.join('..', 'node_modules', 'node-fetch', 'lib', 'fetch-error.js') ||
         relativePath === path.join('..', 'node_modules', 'superstring', 'index.js') ||
         relativePath === path.join('..', 'node_modules', 'oniguruma', 'src', 'oniguruma.js') ||
@@ -85,7 +86,7 @@ module.exports = function (packagedAppPath) {
     console.log(`Generating startup blob at "${generatedStartupBlobPath}"`)
     childProcess.execFileSync(
       path.join(CONFIG.repositoryRootPath, 'script', 'node_modules', 'electron-mksnapshot', 'bin', 'mksnapshot'),
-      [snapshotScriptPath, '--startup_blob', generatedStartupBlobPath]
+      ['--no-use_ic', snapshotScriptPath, '--startup_blob', generatedStartupBlobPath]
     )
 
     let startupBlobDestinationPath

script/package.json

@@ -8,9 +8,9 @@
     "colors": "1.1.2",
     "csslint": "1.0.2",
     "donna": "1.0.16",
-    "electron-chromedriver": "~1.6",
+    "electron-chromedriver": "~1.7",
     "electron-link": "0.1.2",
-    "electron-mksnapshot": "~1.6",
+    "electron-mksnapshot": "~1.7",
     "electron-packager": "7.3.0",
     "electron-winstaller": "2.6.3",
     "fs-admin": "^0.1.5",

spec/atom-environment-spec.js

@@ -592,7 +592,7 @@ describe('AtomEnvironment', () => {
       const promise = new Promise((r) => { resolve = r })
       envLoaded = () => {
         resolve()
-        promise
+        return promise
       }
       atomEnvironment = new AtomEnvironment({
         applicationDelegate: atom.applicationDelegate,

spec/text-editor-component-spec.js

@@ -3678,421 +3678,198 @@ describe('TextEditorComponent', () => {
   })
 
   describe('keyboard input', () => {
-    describe('on Chrome 56', () => {
-      it('handles inserted accented characters via the press-and-hold menu on macOS correctly', async () => {
-        const {editor, component, element} = buildComponent({text: '', chromeVersion: 56})
-        editor.insertText('x')
-        editor.setCursorBufferPosition([0, 1])
+    it('handles inserted accented characters via the press-and-hold menu on macOS correctly', () => {
+      const {editor, component, element} = buildComponent({text: '', chromeVersion: 57})
+      editor.insertText('x')
+      editor.setCursorBufferPosition([0, 1])
 
-        // Simulate holding the A key to open the press-and-hold menu,
-        // then closing it via ESC.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'Escape'})
-        component.didKeyup({code: 'Escape'})
-        expect(editor.getText()).toBe('xa')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xaa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
+      // Simulate holding the A key to open the press-and-hold menu,
+      // then closing it via ESC.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeyup({code: 'KeyA'})
+      component.didKeydown({code: 'Escape'})
+      component.didKeyup({code: 'Escape'})
+      expect(editor.getText()).toBe('xa')
+      // Ensure another "a" can be typed correctly.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeyup({code: 'KeyA'})
+      expect(editor.getText()).toBe('xaa')
+      editor.undo()
+      expect(editor.getText()).toBe('x')
 
-        // Simulate holding the A key to open the press-and-hold menu,
-        // then selecting an alternative by typing a number.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'Digit2'})
-        component.didKeyup({code: 'Digit2'})
-        component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
-        expect(editor.getText()).toBe('xá')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xáa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
+      // Simulate holding the A key to open the press-and-hold menu,
+      // then selecting an alternative by typing a number.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeyup({code: 'KeyA'})
+      component.didKeydown({code: 'Digit2'})
+      component.didKeyup({code: 'Digit2'})
+      component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
+      expect(editor.getText()).toBe('xá')
+      // Ensure another "a" can be typed correctly.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeyup({code: 'KeyA'})
+      expect(editor.getText()).toBe('xáa')
+      editor.undo()
+      expect(editor.getText()).toBe('x')
 
-        // Simulate holding the A key to open the press-and-hold menu,
-        // then selecting an alternative by clicking on it.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
-        expect(editor.getText()).toBe('xá')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xáa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
+      // Simulate holding the A key to open the press-and-hold menu,
+      // then selecting an alternative by clicking on it.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeyup({code: 'KeyA'})
+      component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
+      expect(editor.getText()).toBe('xá')
+      // Ensure another "a" can be typed correctly.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeyup({code: 'KeyA'})
+      expect(editor.getText()).toBe('xáa')
+      editor.undo()
+      expect(editor.getText()).toBe('x')
 
-        // Simulate holding the A key to open the press-and-hold menu,
-        // cycling through the alternatives with the arrows, then selecting one of them with Enter.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionStart({data: ''})
-        component.didCompositionUpdate({data: 'à'})
-        component.getHiddenInput().value = 'à'
-        component.didKeyup({code: 'ArrowRight'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xà')
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionUpdate({data: 'á'})
-        component.getHiddenInput().value = 'á'
-        component.didKeyup({code: 'ArrowRight'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xá')
-        component.didKeydown({code: 'Enter'})
-        component.didCompositionUpdate({data: 'á'})
-        component.getHiddenInput().value = 'á'
-        component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didCompositionEnd({data: 'á', target: component.getHiddenInput()})
-        component.didKeyup({code: 'Enter'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xá')
+      // Simulate holding the A key to open the press-and-hold menu,
+      // cycling through the alternatives with the arrows, then selecting one of them with Enter.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeyup({code: 'KeyA'})
+      component.didKeydown({code: 'ArrowRight'})
+      component.didCompositionStart({data: ''})
+      component.didCompositionUpdate({data: 'à'})
+      component.didKeyup({code: 'ArrowRight'})
+      expect(editor.getText()).toBe('xà')
+      component.didKeydown({code: 'ArrowRight'})
+      component.didCompositionUpdate({data: 'á'})
+      component.didKeyup({code: 'ArrowRight'})
+      expect(editor.getText()).toBe('xá')
+      component.didKeydown({code: 'Enter'})
+      component.didCompositionUpdate({data: 'á'})
+      component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didCompositionEnd({data: 'á', target: component.refs.cursorsAndInput.refs.hiddenInput})
+      component.didKeyup({code: 'Enter'})
+      expect(editor.getText()).toBe('xá')
+      // Ensure another "a" can be typed correctly.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeyup({code: 'KeyA'})
+      expect(editor.getText()).toBe('xáa')
+      editor.undo()
+      expect(editor.getText()).toBe('x')
 
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xáa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
+      // Simulate holding the A key to open the press-and-hold menu,
+      // cycling through the alternatives with the arrows, then closing it via ESC.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeyup({code: 'KeyA'})
+      component.didKeydown({code: 'ArrowRight'})
+      component.didCompositionStart({data: ''})
+      component.didCompositionUpdate({data: 'à'})
+      component.didKeyup({code: 'ArrowRight'})
+      expect(editor.getText()).toBe('xà')
+      component.didKeydown({code: 'ArrowRight'})
+      component.didCompositionUpdate({data: 'á'})
+      component.didKeyup({code: 'ArrowRight'})
+      expect(editor.getText()).toBe('xá')
+      component.didKeydown({code: 'Escape'})
+      component.didCompositionUpdate({data: 'a'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didCompositionEnd({data: 'a', target: component.refs.cursorsAndInput.refs.hiddenInput})
+      component.didKeyup({code: 'Escape'})
+      expect(editor.getText()).toBe('xa')
+      // Ensure another "a" can be typed correctly.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeyup({code: 'KeyA'})
+      expect(editor.getText()).toBe('xaa')
+      editor.undo()
+      expect(editor.getText()).toBe('x')
 
-        // Simulate holding the A key to open the press-and-hold menu,
-        // cycling through the alternatives with the arrows, then closing it via ESC.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionStart({data: ''})
-        component.didCompositionUpdate({data: 'à'})
-        component.getHiddenInput().value = 'à'
-        component.didKeyup({code: 'ArrowRight'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xà')
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionUpdate({data: 'á'})
-        component.getHiddenInput().value = 'á'
-        component.didKeyup({code: 'ArrowRight'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xá')
-        component.didKeydown({code: 'Escape'})
-        component.didCompositionUpdate({data: 'a'})
-        component.getHiddenInput().value = 'a'
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didCompositionEnd({data: 'a', target: component.refs.cursorsAndInput.refs.hiddenInput})
-        component.didKeyup({code: 'Escape'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xa')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xaa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
+      // Simulate pressing the O key and holding the A key to open the press-and-hold menu right before releasing the O key,
+      // cycling through the alternatives with the arrows, then closing it via ESC.
+      component.didKeydown({code: 'KeyO'})
+      component.didKeypress({code: 'KeyO'})
+      component.didTextInput({data: 'o', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeyup({code: 'KeyO'})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeydown({code: 'ArrowRight'})
+      component.didCompositionStart({data: ''})
+      component.didCompositionUpdate({data: 'à'})
+      component.didKeyup({code: 'ArrowRight'})
+      expect(editor.getText()).toBe('xoà')
+      component.didKeydown({code: 'ArrowRight'})
+      component.didCompositionUpdate({data: 'á'})
+      component.didKeyup({code: 'ArrowRight'})
+      expect(editor.getText()).toBe('xoá')
+      component.didKeydown({code: 'Escape'})
+      component.didCompositionUpdate({data: 'a'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didCompositionEnd({data: 'a', target: component.refs.cursorsAndInput.refs.hiddenInput})
+      component.didKeyup({code: 'Escape'})
+      expect(editor.getText()).toBe('xoa')
+      // Ensure another "a" can be typed correctly.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeyup({code: 'KeyA'})
+      editor.undo()
+      expect(editor.getText()).toBe('x')
 
-        // Simulate pressing the O key and holding the A key to open the press-and-hold menu right before releasing the O key,
-        // cycling through the alternatives with the arrows, then closing it via ESC.
-        component.didKeydown({code: 'KeyO'})
-        component.didKeypress({code: 'KeyO'})
-        component.didTextInput({data: 'o', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyO'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionStart({data: ''})
-        component.didCompositionUpdate({data: 'à'})
-        component.getHiddenInput().value = 'à'
-        component.didKeyup({code: 'ArrowRight'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xoà')
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionUpdate({data: 'á'})
-        component.getHiddenInput().value = 'á'
-        component.didKeyup({code: 'ArrowRight'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xoá')
-        component.didKeydown({code: 'Escape'})
-        component.didCompositionUpdate({data: 'a'})
-        component.getHiddenInput().value = 'a'
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didCompositionEnd({data: 'a', target: component.refs.cursorsAndInput.refs.hiddenInput})
-        component.didKeyup({code: 'Escape'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xoa')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        editor.undo()
-        expect(editor.getText()).toBe('x')
-
-        // Simulate holding the A key to open the press-and-hold menu,
-        // cycling through the alternatives with the arrows, then closing it by changing focus.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionStart({data: ''})
-        component.didCompositionUpdate({data: 'à'})
-        component.getHiddenInput().value = 'à'
-        component.didKeyup({code: 'ArrowRight'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xà')
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionUpdate({data: 'á'})
-        component.getHiddenInput().value = 'á'
-        component.didKeyup({code: 'ArrowRight'})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xá')
-        component.didCompositionUpdate({data: 'á'})
-        component.getHiddenInput().value = 'á'
-        component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didCompositionEnd({data: 'á', target: component.refs.cursorsAndInput.refs.hiddenInput})
-        await getNextTickPromise()
-        expect(editor.getText()).toBe('xá')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xáa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
-      })
-    })
-
-    describe('on other versions of Chrome', () => {
-      it('handles inserted accented characters via the press-and-hold menu on macOS correctly', () => {
-        const {editor, component, element} = buildComponent({text: '', chromeVersion: 57})
-        editor.insertText('x')
-        editor.setCursorBufferPosition([0, 1])
-
-        // Simulate holding the A key to open the press-and-hold menu,
-        // then closing it via ESC.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'Escape'})
-        component.didKeyup({code: 'Escape'})
-        expect(editor.getText()).toBe('xa')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xaa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
-
-        // Simulate holding the A key to open the press-and-hold menu,
-        // then selecting an alternative by typing a number.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'Digit2'})
-        component.didKeyup({code: 'Digit2'})
-        component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
-        expect(editor.getText()).toBe('xá')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xáa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
-
-        // Simulate holding the A key to open the press-and-hold menu,
-        // then selecting an alternative by clicking on it.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
-        expect(editor.getText()).toBe('xá')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xáa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
-
-        // Simulate holding the A key to open the press-and-hold menu,
-        // cycling through the alternatives with the arrows, then selecting one of them with Enter.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionStart({data: ''})
-        component.didCompositionUpdate({data: 'à'})
-        component.didKeyup({code: 'ArrowRight'})
-        expect(editor.getText()).toBe('xà')
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionUpdate({data: 'á'})
-        component.didKeyup({code: 'ArrowRight'})
-        expect(editor.getText()).toBe('xá')
-        component.didKeydown({code: 'Enter'})
-        component.didCompositionUpdate({data: 'á'})
-        component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didCompositionEnd({data: 'á', target: component.refs.cursorsAndInput.refs.hiddenInput})
-        component.didKeyup({code: 'Enter'})
-        expect(editor.getText()).toBe('xá')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xáa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
-
-        // Simulate holding the A key to open the press-and-hold menu,
-        // cycling through the alternatives with the arrows, then closing it via ESC.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionStart({data: ''})
-        component.didCompositionUpdate({data: 'à'})
-        component.didKeyup({code: 'ArrowRight'})
-        expect(editor.getText()).toBe('xà')
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionUpdate({data: 'á'})
-        component.didKeyup({code: 'ArrowRight'})
-        expect(editor.getText()).toBe('xá')
-        component.didKeydown({code: 'Escape'})
-        component.didCompositionUpdate({data: 'a'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didCompositionEnd({data: 'a', target: component.refs.cursorsAndInput.refs.hiddenInput})
-        component.didKeyup({code: 'Escape'})
-        expect(editor.getText()).toBe('xa')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xaa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
-
-        // Simulate pressing the O key and holding the A key to open the press-and-hold menu right before releasing the O key,
-        // cycling through the alternatives with the arrows, then closing it via ESC.
-        component.didKeydown({code: 'KeyO'})
-        component.didKeypress({code: 'KeyO'})
-        component.didTextInput({data: 'o', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyO'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionStart({data: ''})
-        component.didCompositionUpdate({data: 'à'})
-        component.didKeyup({code: 'ArrowRight'})
-        expect(editor.getText()).toBe('xoà')
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionUpdate({data: 'á'})
-        component.didKeyup({code: 'ArrowRight'})
-        expect(editor.getText()).toBe('xoá')
-        component.didKeydown({code: 'Escape'})
-        component.didCompositionUpdate({data: 'a'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didCompositionEnd({data: 'a', target: component.refs.cursorsAndInput.refs.hiddenInput})
-        component.didKeyup({code: 'Escape'})
-        expect(editor.getText()).toBe('xoa')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        editor.undo()
-        expect(editor.getText()).toBe('x')
-
-        // Simulate holding the A key to open the press-and-hold menu,
-        // cycling through the alternatives with the arrows, then closing it by changing focus.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeydown({code: 'KeyA'})
-        component.didKeyup({code: 'KeyA'})
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionStart({data: ''})
-        component.didCompositionUpdate({data: 'à'})
-        component.didKeyup({code: 'ArrowRight'})
-        expect(editor.getText()).toBe('xà')
-        component.didKeydown({code: 'ArrowRight'})
-        component.didCompositionUpdate({data: 'á'})
-        component.didKeyup({code: 'ArrowRight'})
-        expect(editor.getText()).toBe('xá')
-        component.didCompositionUpdate({data: 'á'})
-        component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didCompositionEnd({data: 'á', target: component.refs.cursorsAndInput.refs.hiddenInput})
-        expect(editor.getText()).toBe('xá')
-        // Ensure another "a" can be typed correctly.
-        component.didKeydown({code: 'KeyA'})
-        component.didKeypress({code: 'KeyA'})
-        component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
-        component.didKeyup({code: 'KeyA'})
-        expect(editor.getText()).toBe('xáa')
-        editor.undo()
-        expect(editor.getText()).toBe('x')
-      })
+      // Simulate holding the A key to open the press-and-hold menu,
+      // cycling through the alternatives with the arrows, then closing it by changing focus.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeydown({code: 'KeyA'})
+      component.didKeyup({code: 'KeyA'})
+      component.didKeydown({code: 'ArrowRight'})
+      component.didCompositionStart({data: ''})
+      component.didCompositionUpdate({data: 'à'})
+      component.didKeyup({code: 'ArrowRight'})
+      expect(editor.getText()).toBe('xà')
+      component.didKeydown({code: 'ArrowRight'})
+      component.didCompositionUpdate({data: 'á'})
+      component.didKeyup({code: 'ArrowRight'})
+      expect(editor.getText()).toBe('xá')
+      component.didCompositionUpdate({data: 'á'})
+      component.didTextInput({data: 'á', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didCompositionEnd({data: 'á', target: component.refs.cursorsAndInput.refs.hiddenInput})
+      expect(editor.getText()).toBe('xá')
+      // Ensure another "a" can be typed correctly.
+      component.didKeydown({code: 'KeyA'})
+      component.didKeypress({code: 'KeyA'})
+      component.didTextInput({data: 'a', stopPropagation: () => {}, preventDefault: () => {}})
+      component.didKeyup({code: 'KeyA'})
+      expect(editor.getText()).toBe('xáa')
+      editor.undo()
+      expect(editor.getText()).toBe('x')
     })
   })
 

src/atom-environment.js

@@ -1013,8 +1013,10 @@ class AtomEnvironment {
   }
 
   addProjectFolder () {
-    this.pickFolder((selectedPaths = []) => {
-      this.addToProject(selectedPaths)
+    return new Promise((resolve) => {
+      this.pickFolder((selectedPaths) => {
+        this.addToProject(selectedPaths || []).then(resolve)
+      })
     })
   }
 

src/pane-resize-handle-element.coffee

@@ -9,8 +9,12 @@ class PaneResizeHandleElement extends HTMLElement
     @addEventListener 'mousedown', @resizeStarted.bind(this)
 
   attachedCallback: ->
-    @isHorizontal = @parentElement.classList.contains("horizontal")
-    @classList.add if @isHorizontal then 'horizontal' else 'vertical'
+    # For some reason Chromium 58 is firing the attached callback after the
+    # element has been detached, so we ignore the callback when a parent element
+    # can't be found.
+    if @parentElement
+      @isHorizontal = @parentElement.classList.contains("horizontal")
+      @classList.add if @isHorizontal then 'horizontal' else 'vertical'
 
   detachedCallback: ->
     @resizeStopped()

src/text-editor-component.js

@@ -1716,10 +1716,6 @@ class TextEditorComponent {
       return
     }
 
-    if (this.getChromeVersion() === 56) {
-      this.getHiddenInput().value = ''
-    }
-
     this.compositionCheckpoint = this.props.model.createCheckpoint()
     if (this.accentedCharacterMenuIsOpen) {
       this.props.model.selectLeft()
@@ -1727,16 +1723,7 @@ class TextEditorComponent {
   }
 
   didCompositionUpdate (event) {
-    if (this.getChromeVersion() === 56) {
-      process.nextTick(() => {
-        if (this.compositionCheckpoint != null) {
-          const previewText = this.getHiddenInput().value
-          this.props.model.insertText(previewText, {select: true})
-        }
-      })
-    } else {
-      this.props.model.insertText(event.data, {select: true})
-    }
+    this.props.model.insertText(event.data, {select: true})
   }
 
   didCompositionEnd (event) {
@@ -3023,7 +3010,7 @@ class DummyScrollbarComponent {
 
     const outerStyle = {
       position: 'absolute',
-      contain: 'strict',
+      contain: 'content',
       zIndex: 1,
       willChange: 'transform'
     }