atom · nathansobo · Jan 3, 2018 · Nov 6, 2017 · Dec 21, 2017 · Dec 21, 2017
diff --git a/package.json b/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",

diff --git a/script/lib/generate-startup-snapshot.js b/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

diff --git a/script/package.json b/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",

diff --git a/spec/atom-environment-spec.js b/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,

diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js
diff --git a/src/atom-environment.js b/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)
+      })
     })
   }
 

diff --git a/src/pane-resize-handle-element.coffee b/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()

diff --git a/src/text-editor-component.js b/src/text-editor-component.js
@@ -1716,27 +1716,14 @@ class TextEditorComponent {
       return
     }
 
-    if (this.getChromeVersion() === 56) {
-      this.getHiddenInput().value = ''
-    }
-
     this.compositionCheckpoint = this.props.model.createCheckpoint()
     if (this.accentedCharacterMenuIsOpen) {
       this.props.model.selectLeft()
     }
   }
 
   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'
     }

diff --git a/src/text-editor.js b/src/text-editor.js
@@ -3604,7 +3604,7 @@ class TextEditor {
   // coordinates. Useful with {Config::get}.
   //
   // For example, if called with a position inside the parameter list of an
-  // anonymous CoffeeScript function, this method returns a {ScopeDescriptor} with 
+  // anonymous CoffeeScript function, this method returns a {ScopeDescriptor} with
   // the following scopes array:
   // `["source.coffee", "meta.function.inline.coffee", "meta.parameters.coffee", "variable.parameter.function.coffee"]`
   //