Merge branch 'master' into remove-release-notes

keymaps/linux.cson

@@ -13,7 +13,7 @@
   'ctrl-alt-o': 'application:add-project-folder'
   'ctrl-shift-pageup': 'pane:move-item-left'
   'ctrl-shift-pagedown': 'pane:move-item-right'
-  'F11': 'window:toggle-full-screen'
+  'f11': 'window:toggle-full-screen'
 
   # Sublime Parity
   'ctrl-,': 'application:show-settings'

keymaps/win32.cson

@@ -19,7 +19,7 @@
   'ctrl-alt-o': 'application:add-project-folder'
   'ctrl-shift-left': 'pane:move-item-left'
   'ctrl-shift-right': 'pane:move-item-right'
-  'F11': 'window:toggle-full-screen'
+  'f11': 'window:toggle-full-screen'
 
   # Sublime Parity
   'ctrl-,': 'application:show-settings'

package.json

@@ -104,7 +104,7 @@
     "package-generator": "0.41.0",
     "settings-view": "0.232.3",
     "snippets": "1.0.1",
-    "spell-check": "0.63.0",
+    "spell-check": "0.65.0",
     "status-bar": "0.80.0",
     "styleguide": "0.45.0",
     "symbols-view": "0.110.1",
@@ -136,7 +136,7 @@
     "language-php": "0.36.0",
     "language-property-list": "0.8.0",
     "language-python": "0.43.0",
-    "language-ruby": "0.67.0",
+    "language-ruby": "0.68.0",
     "language-ruby-on-rails": "0.25.0",
     "language-sass": "0.45.0",
     "language-shellscript": "0.21.0",

spec/display-buffer-spec.coffee

@@ -1253,6 +1253,13 @@ describe "DisplayBuffer", ->
       decoration.destroy()
       expect(displayBuffer.decorationForId(decoration.id)).not.toBeDefined()
 
+    it "does not allow destroyed markers to be decorated", ->
+      marker.destroy()
+      expect(->
+        displayBuffer.decorateMarker(marker, {type: 'overlay', item: document.createElement('div')})
+      ).toThrow("Cannot decorate a destroyed marker")
+      expect(displayBuffer.getOverlayDecorations()).toEqual []
+
     describe "when a decoration is updated via Decoration::update()", ->
       it "emits an 'updated' event containing the new and old params", ->
         decoration.onDidChangeProperties updatedSpy = jasmine.createSpy()

src/display-buffer.coffee

@@ -812,6 +812,7 @@ class DisplayBuffer extends Model
     decorationsState
 
   decorateMarker: (marker, decorationParams) ->
+    throw new Error("Cannot decorate a destroyed marker") if marker.isDestroyed()
     marker = @getMarkerLayer(marker.layer.id).getMarker(marker.id)
     decoration = new Decoration(marker, this, decorationParams)
     @decorationsByMarkerId[marker.id] ?= []