Upgrade to release-notes@v0.35.0

Streamline character width remeasurement to hopefully avoid exceptions

apm/package.json

@@ -6,6 +6,6 @@
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "0.70.0"
+    "atom-package-manager": "0.71.0"
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.110.0",
+  "version": "0.113.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -93,7 +93,7 @@
     "metrics": "0.32.0",
     "open-on-github": "0.29.0",
     "package-generator": "0.31.0",
-    "release-notes": "0.32.0",
+    "release-notes": "0.35.0",
     "settings-view": "0.132.0",
     "snippets": "0.47.0",
     "spell-check": "0.38.0",
@@ -126,12 +126,12 @@
     "language-php": "0.15.0",
     "language-property-list": "0.7.0",
     "language-python": "0.18.0",
-    "language-ruby": "0.31.0",
+    "language-ruby": "0.32.0",
     "language-ruby-on-rails": "0.15.0",
     "language-sass": "0.13.0",
     "language-shellscript": "0.8.0",
     "language-source": "0.7.0",
-    "language-sql": "0.8.0",
+    "language-sql": "0.9.0",
     "language-text": "0.6.0",
     "language-todo": "0.10.0",
     "language-toml": "0.12.0",

spec/atom-spec.coffee

@@ -535,3 +535,18 @@ describe "the `atom` global", ->
       expect(atom.isReleasedVersion()).toBe true
       version = '36b5518'
       expect(atom.isReleasedVersion()).toBe false
+
+  describe "window:update-available", ->
+    it "is triggered when the auto-updater sends the update-downloaded event", ->
+      updateAvailableHandler = jasmine.createSpy("update-available-handler")
+      atom.workspaceView.on 'window:update-available', updateAvailableHandler
+      autoUpdater = require('remote').require('auto-updater')
+      autoUpdater.emit 'update-downloaded', null, "notes", "version"
+
+      waitsFor ->
+        updateAvailableHandler.callCount > 0
+
+      runs ->
+        [event, version, notes] = updateAvailableHandler.mostRecentCall.args
+        expect(notes).toBe 'notes'
+        expect(version).toBe 'version'

spec/display-buffer-spec.coffee

@@ -342,8 +342,6 @@ describe "DisplayBuffer", ->
           fold2 = displayBuffer.createFold(4, 9)
           fold1 = displayBuffer.createFold(0, 4)
 
-          displayBuffer.logLines(0, 20)
-
           expect(displayBuffer.lineForRow(0).text).toMatch /^0/
           expect(displayBuffer.lineForRow(1).text).toMatch /^10/
 
@@ -1053,8 +1051,8 @@ describe "DisplayBuffer", ->
       expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id][0]).toBe decoration
 
       decoration.destroy()
-      expect(!!displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id]).toBeFalsy()
-      expect(!!displayBuffer.decorationForId(decoration.id)).toBeFalsy()
+      expect(displayBuffer.decorationsForScreenRowRange(2, 3)[marker.id]).not.toBeDefined()
+      expect(displayBuffer.decorationForId(decoration.id)).not.toBeDefined()
 
     it "will not fail if the decoration is removed twice", ->
       decoration.destroy()

spec/editor-component-spec.coffee

@@ -610,6 +610,8 @@ describe "EditorComponent", ->
       expect(cursorRect.left).toBe rangeRect.left
       expect(cursorRect.width).toBe rangeRect.width
 
+      atom.themes.removeStylesheet('test')
+
     it "sets the cursor to the default character width at the end of a line", ->
       editor.setCursorScreenPosition([0, Infinity])
       runSetImmediateCallbacks()
@@ -1837,6 +1839,29 @@ describe "EditorComponent", ->
         line0Right = node.querySelector('.line > span:last-child').getBoundingClientRect().right
         expect(cursorLeft).toBe line0Right
 
+    describe "when stylesheets change while the editor is hidden", ->
+      afterEach ->
+        atom.themes.removeStylesheet('test')
+
+      it "does not re-measure character widths until the editor is shown again", ->
+        atom.config.set('editor.fontFamily', 'sans-serif')
+
+        wrapperView.hide()
+        atom.themes.applyStylesheet 'test', """
+          .function.js {
+            font-weight: bold;
+          }
+        """
+        runSetImmediateCallbacks()
+
+        wrapperView.show()
+        editor.setCursorBufferPosition([0, Infinity])
+        runSetImmediateCallbacks()
+
+        cursorLeft = node.querySelector('.cursor').getBoundingClientRect().left
+        line0Right = node.querySelector('.line > span:last-child').getBoundingClientRect().right
+        expect(cursorLeft).toBe line0Right
+
     describe "when lines are changed while the editor is hidden", ->
       it "does not measure new characters until the editor is shown again", ->
         editor.setText('')

src/browser/atom-window.coffee

@@ -138,6 +138,7 @@ class AtomWindow
           when 'window:reload' then @reload()
           when 'window:toggle-dev-tools' then @toggleDevTools()
           when 'window:close' then @close()
+          when 'window:update-available' then @sendCommandToBrowserWindow(command, args...) # For spec testing
     else if @isWebViewFocused()
       @sendCommandToBrowserWindow(command, args...)
     else

src/browser/auto-update-manager.coffee

@@ -1,3 +1,4 @@
+https = require 'https'
 autoUpdater = require 'auto-updater'
 dialog = require 'dialog'
 _ = require 'underscore-plus'
@@ -16,11 +17,12 @@ class AutoUpdateManager
 
   constructor: (@version) ->
     @state = IDLE_STATE
+    @feedUrl = "https://atom.io/api/updates?version=#{@version}"
 
-    # Only released versions should check for updates.
-    return if /\w{7}/.test(@version)
+    if process.platform is 'win32'
+      autoUpdater.checkForUpdates = => @checkForUpdatesShim()
 
-    autoUpdater.setFeedUrl "https://atom.io/api/updates?version=#{@version}"
+    autoUpdater.setFeedUrl @feedUrl
 
     autoUpdater.on 'checking-for-update', =>
       @setState(CHECKING_STATE)
@@ -39,7 +41,25 @@ class AutoUpdateManager
       @setState(UPDATE_AVAILABLE_STATE)
       @emitUpdateAvailableEvent(@getWindows()...)
 
-    @check(hidePopups: true)
+    # Only released versions should check for updates.
+    unless /\w{7}/.test(@version)
+      @check(hidePopups: true)
+
+  # Windows doesn't have an auto-updater, so use this method to shim the events.
+  checkForUpdatesShim: ->
+    autoUpdater.emit 'checking-for-update'
+    request = https.get @feedUrl, (response) ->
+      if response.statusCode == 200
+        body = ""
+        response.on 'data', (chunk) -> body += chunk
+        response.on 'end', ->
+          {notes, name} = JSON.parse(body)
+          autoUpdater.emit 'update-downloaded', null, notes, name
+      else
+        autoUpdater.emit 'update-not-available'
+
+    request.on 'error', (error) ->
+      autoUpdater.emit 'error', null, error.message
 
   emitUpdateAvailableEvent: (windows...) ->
     return unless @releaseVersion? and @releaseNotes

src/editor-component.coffee

@@ -28,7 +28,6 @@ EditorComponent = React.createClass
   updateRequested: false
   updatesPaused: false
   updateRequestedWhilePaused: false
-  characterWidthRemeasurementRequested: false
   cursorsMoved: false
   selectionChanged: false
   selectionAdded: false
@@ -43,7 +42,7 @@ EditorComponent = React.createClass
   scrollSensitivity: 0.4
   scrollViewMeasurementRequested: false
   measureLineHeightAndDefaultCharWidthWhenShown: false
-  remeasureCharacterWidthsWhenShown: false
+  remeasureCharacterWidthsIfVisibleAfterNextUpdate: false
   inputEnabled: true
   scrollViewMeasurementInterval: 100
   scopedCharacterWidthsChangeCount: null
@@ -655,7 +654,8 @@ EditorComponent = React.createClass
 
   onStylesheetsChanged: (stylesheet) ->
     @refreshScrollbars() if @containsScrollbarSelector(stylesheet)
-    @requestCharacterWidthRemeasurement()
+    @remeasureCharacterWidthsIfVisibleAfterNextUpdate = true
+    @requestUpdate() if @state.visible
 
   onScreenLinesChanged: (change) ->
     {editor} = @props
@@ -792,19 +792,12 @@ EditorComponent = React.createClass
       if @state.visible
         @remeasureCharacterWidths()
       else
-        @remeasureCharacterWidthsWhenShown = true
-    else if @remeasureCharacterWidthsWhenShown and @state.visible and not prevState.visible
+        @remeasureCharacterWidthsIfVisibleAfterNextUpdate = true
+    else if @remeasureCharacterWidthsIfVisibleAfterNextUpdate and @state.visible
+      @remeasureCharacterWidthsIfVisibleAfterNextUpdate = false
       @remeasureCharacterWidths()
 
-  requestCharacterWidthRemeasurement: ->
-    unless @characterWidthRemeasurementRequested
-      @characterWidthRemeasurementRequested = true
-      setImmediate =>
-        @characterWidthRemeasurementRequested = false
-        @remeasureCharacterWidths()
-
   remeasureCharacterWidths: ->
-    @remeasureCharacterWidthsWhenShown = false
     @refs.lines.remeasureCharacterWidths()
 
   onGutterWidthChanged: (@gutterWidth) ->

static/buttons.less

@@ -64,15 +64,15 @@
 }
 
 .btn-toolbar {
-  > .btn-group {
+  > .btn-group + .btn-group, > .btn-group + .btn, > .btn + .btn {
     float: none;
     display: inline-block;
-  }
-  > * {
-    margin-right: 0;
-    margin-left: @component-padding/2;
-  }
-  > *:first-child {
     margin-left: 0;
   }
+  > * {
+    margin-right: @component-padding / 2;
+  }
+  > *:last-child {
+    margin-right: 0;
+  }
 }