Upgrade notifications for issue searching and dupe handling

when there is a parse error

exports/atom.coffee

@@ -33,7 +33,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   Object.defineProperty module.exports, 'WorkspaceView', get: ->
     deprecate """
       Requiring `WorkspaceView` from `atom` is no longer supported.
-      Use `atom.view.getView(atom.workspace)` instead.
+      Use `atom.views.getView(atom.workspace)` instead.
     """
     require '../src/workspace-view'
 
@@ -119,8 +119,8 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
     require 'react-atom-fork'
 
   Object.defineProperty module.exports, 'Reactionary', get: ->
-    deprecate "Please require `reactionary` instead: `Reactionary = require 'reactionary'`. Add `\"reactionary\": \"^0.9\"` to your package dependencies."
-    require 'reactionary'
+    deprecate "Please require `reactionary-atom-fork` instead: `Reactionary = require 'reactionary-atom-fork'`. Add `\"reactionary-atom-fork\": \"^0.9\"` to your package dependencies."
+    require 'reactionary-atom-fork'
 
 Object.defineProperty module.exports, 'Git', get: ->
   deprecate "Please require `GitRepository` instead of `Git`: `{GitRepository} = require 'atom'`"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.152.0",
+  "version": "0.153.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -20,7 +20,7 @@
   "atomShellVersion": "0.19.4",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^2.2.2",
+    "atom-keymap": "^2.3.0",
     "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
@@ -45,7 +45,7 @@
     "nslog": "^1.0.1",
     "oniguruma": "^3.0.4",
     "optimist": "0.4.0",
-    "pathwatcher": "^2.3.2",
+    "pathwatcher": "2.3.2",
     "property-accessors": "^1",
     "q": "^1.0.1",
     "random-words": "0.0.1",
@@ -67,15 +67,15 @@
   },
   "packageDependencies": {
     "atom-dark-syntax": "0.23.0",
-    "atom-dark-ui": "0.41.0",
+    "atom-dark-ui": "0.42.0",
     "atom-light-syntax": "0.22.0",
-    "atom-light-ui": "0.35.0",
+    "atom-light-ui": "0.36.0",
     "base16-tomorrow-dark-theme": "0.22.0",
     "base16-tomorrow-light-theme": "0.5.0",
     "solarized-dark-syntax": "0.23.0",
     "solarized-light-syntax": "0.13.0",
     "archive-view": "0.37.0",
-    "autocomplete": "0.33.0",
+    "autocomplete": "0.33.1",
     "autoflow": "0.18.0",
     "autosave": "0.18.0",
     "background-tips": "0.17.0",
@@ -97,13 +97,14 @@
     "link": "0.26.0",
     "markdown-preview": "0.110.0",
     "metrics": "0.39.0",
+    "notifications": "0.4.0",
     "open-on-github": "0.30.0",
     "package-generator": "0.32.0",
     "release-notes": "0.36.0",
     "settings-view": "0.161.0",
-    "snippets": "0.56.0",
+    "snippets": "0.57.0",
     "spell-check": "0.44.0",
-    "status-bar": "0.47.0",
+    "status-bar": "0.48.0",
     "styleguide": "0.30.0",
     "symbols-view": "0.68.0",
     "tabs": "0.56.0",

spec/config-spec.coffee

@@ -554,11 +554,13 @@ describe "Config", ->
     describe "when the config file contains invalid cson", ->
       beforeEach ->
         spyOn(console, 'error')
+        spyOn(atom.notifications, 'addError')
         fs.writeFileSync(atom.config.configFilePath, "{{{{{")
 
       it "logs an error to the console and does not overwrite the config file on a subsequent save", ->
         atom.config.loadUserConfig()
         expect(console.error).toHaveBeenCalled()
+        expect(atom.notifications.addError.callCount).toBe 1
         atom.config.set("hair", "blonde") # trigger a save
         expect(atom.config.save).not.toHaveBeenCalled()
 
@@ -692,7 +694,6 @@ describe "Config", ->
             expect(atom.config.get(['.source.ruby'], 'foo.bar')).toBe 'baz'
             expect(atom.config.get(['.source.ruby'], 'foo.scoped')).toBe true
 
-
     describe "when the config file changes to omit a setting with a default", ->
       it "resets the setting back to the default", ->
         fs.writeFileSync(atom.config.configFilePath, "foo: { baz: 'new'}")

spec/panel-container-element-spec.coffee

@@ -43,6 +43,19 @@ describe "PanelContainerElement", ->
     expect(element.parentNode).not.toBe jasmineContent
 
   describe "adding and removing panels", ->
+    it "allows panels to be inserted at any position", ->
+      panel1 = new Panel({viewRegistry, item: new TestPanelContainerItem(), priority: 10})
+      panel2 = new Panel({viewRegistry, item: new TestPanelContainerItem(), priority: 5})
+      panel3 = new Panel({viewRegistry, item: new TestPanelContainerItem(), priority: 8})
+
+      container.addPanel(panel1)
+      container.addPanel(panel2)
+      container.addPanel(panel3)
+
+      expect(element.childNodes[2].getModel()).toBe(panel1)
+      expect(element.childNodes[1].getModel()).toBe(panel3)
+      expect(element.childNodes[0].getModel()).toBe(panel2)
+
     describe "when the container is at the left location", ->
       it "adds atom-panel elements when a new panel is added to the container; removes them when the panels are destroyed", ->
         expect(element.childNodes.length).toBe 0
@@ -51,6 +64,8 @@ describe "PanelContainerElement", ->
         container.addPanel(panel1)
         expect(element.childNodes.length).toBe 1
         expect(element.childNodes[0]).toHaveClass 'left'
+        expect(element.childNodes[0]).toHaveClass 'tool-panel' # legacy selector support
+        expect(element.childNodes[0]).toHaveClass 'panel-left' # legacy selector support
 
         expect(element.childNodes[0].tagName).toBe 'ATOM-PANEL'
 
@@ -80,6 +95,8 @@ describe "PanelContainerElement", ->
         container.addPanel(panel1)
         expect(element.childNodes.length).toBe 1
         expect(element.childNodes[0]).toHaveClass 'bottom'
+        expect(element.childNodes[0]).toHaveClass 'tool-panel' # legacy selector support
+        expect(element.childNodes[0]).toHaveClass 'panel-bottom' # legacy selector support
         expect(element.childNodes[0].tagName).toBe 'ATOM-PANEL'
         expect(panel1.getView()).toHaveClass 'one'
 
@@ -116,3 +133,14 @@ describe "PanelContainerElement", ->
 
       expect(panel1.getView().style.display).not.toBe 'none'
       expect(panel2.getView().style.display).toBe 'none'
+
+    it "adds the 'modal' class to panels", ->
+      panel1 = new Panel({viewRegistry, item: new TestPanelContainerItem()})
+      container.addPanel(panel1)
+
+      expect(panel1.getView()).toHaveClass 'modal'
+
+      # legacy selector support
+      expect(panel1.getView()).not.toHaveClass 'tool-panel'
+      expect(panel1.getView()).toHaveClass 'overlay'
+      expect(panel1.getView()).toHaveClass 'from-top'

spec/spec-helper.coffee

@@ -9,7 +9,8 @@ _ = require 'underscore-plus'
 fs = require 'fs-plus'
 Grim = require 'grim'
 KeymapManager = require '../src/keymap-extensions'
-{$, WorkspaceView, Workspace} = require 'atom'
+Workspace = require '../src/workspace'
+{$} = require '../src/space-pen-extensions'
 Config = require '../src/config'
 {Point} = require 'text-buffer'
 Project = require '../src/project'

spec/workspace-spec.coffee

@@ -500,4 +500,3 @@ describe "Workspace", ->
 
         expect(panel).toBeDefined()
         expect(addPanelSpy).toHaveBeenCalledWith({panel, index: 0})
-        expect(panel.getClassName()).toBe 'overlay from-top' # the default

src/atom.coffee

@@ -249,6 +249,7 @@ class Atom extends Model
     @config = new Config({configDirPath, resourcePath})
     @keymaps = new KeymapManager({configDirPath, resourcePath})
     @keymap = @keymaps # Deprecated
+    @keymaps.subscribeToFileReadFailure()
     @tooltips = new TooltipManager
     @notifications = new NotificationManager
     @commands = new CommandRegistry

src/config.coffee

@@ -526,6 +526,9 @@ class Config
 
   # Extended: Restore the global setting at `keyPath` to its default value.
   #
+  # * `scopeSelector` (optional) {String}. eg. '.source.ruby'
+  #   See [the scopes docs](https://atom.io/docs/latest/advanced/scopes-and-scope-descriptors)
+  #   for more information.
   # * `keyPath` The {String} name of the key.
   #
   # Returns the new value.
@@ -721,21 +724,26 @@ class Config
       @configFileHasErrors = false
     catch error
       @configFileHasErrors = true
-      console.error "Failed to load user config '#{@configFilePath}'", error.message
-      console.error error.stack
+      @notifyFailure('Failed to load config.cson', error)
 
   observeUserConfig: ->
     try
       @watchSubscription ?= pathWatcher.watch @configFilePath, (eventType) =>
         @loadUserConfig() if eventType is 'change' and @watchSubscription?
     catch error
-      console.error "Failed to watch user config '#{@configFilePath}'", error.message
-      console.error error.stack
+      @notifyFailure('Failed to watch user config', error)
 
   unobserveUserConfig: ->
     @watchSubscription?.close()
     @watchSubscription = null
 
+  notifyFailure: (errorMessage, error) ->
+    message = "#{errorMessage}"
+    detail = error.stack
+    atom.notifications.addError(message, {detail, closable: true})
+    console.error message
+    console.error detail
+
   save: ->
     allSettings = global: @settings
     allSettings = _.extend allSettings, @scopedSettingsStore.propertiesForSource('user-config')

src/keymap-extensions.coffee

@@ -23,6 +23,10 @@ KeymapManager::loadUserKeymap = ->
   if fs.isFileSync(userKeymapPath)
     @loadKeymap(userKeymapPath, watch: true, suppressErrors: true)
 
+KeymapManager::subscribeToFileReadFailure = ->
+  this.onDidFailToReadFile (error) ->
+    atom.notifications.addError('Failed to load keymap.cson', {detail: error.stack, closable: true})
+
 # This enables command handlers registered via jQuery to call
 # `.abortKeyBinding()` on the `jQuery.Event` object passed to the handler.
 jQuery.Event::abortKeyBinding = ->

src/notification.coffee

@@ -13,7 +13,12 @@ class Notification
 
   getTimestamp: -> @timestamp
 
-  getDetail: -> @optons.detail
+  getDetail: -> @options.detail
+
+  isEqual: (other) ->
+    @getMessage() == other.getMessage() \
+      and @getType() == other.getType() \
+      and @getDetail() == other.getDetail()
 
   isClosable: ->
     !!@options.closable

src/panel-container-element.coffee

@@ -15,10 +15,15 @@ class PanelContainerElement extends HTMLElement
   panelAdded: ({panel, index}) ->
     panelElement = panel.getView()
     panelElement.classList.add(@model.getLocation())
+    if @model.isModal()
+      panelElement.classList.add("overlay", "from-top")
+    else
+      panelElement.classList.add("tool-panel", "panel-#{@model.getLocation()}")
+
     if index >= @childNodes.length
       @appendChild(panelElement)
     else
-      referenceItem = @childNodes[index + 1]
+      referenceItem = @childNodes[index]
       @insertBefore(panelElement, referenceItem)
 
     if @model.isModal()

src/space-pen-extensions.coffee

@@ -12,7 +12,7 @@ jQuery.cleanData = (elements) ->
 
 SpacePenCallRemoveHooks = SpacePen.callRemoveHooks
 SpacePen.callRemoveHooks = (element) ->
-  view.unsubscribe() for view in SpacePen.viewsForElement(element)
+  view.unsubscribe?() for view in SpacePen.viewsForElement(element)
   SpacePenCallRemoveHooks(element)
 
 NativeEventNames = new Set

src/workspace.coffee

@@ -682,8 +682,6 @@ class Workspace extends Model
   #
   # Returns a {Panel}
   addModalPanel: (options={}) ->
-    # TODO: remove these default classes. They are to supoprt existing themes.
-    options.className ?= 'overlay from-top'
     @addPanel('modal', options)
 
   addPanel: (location, options) ->