Merge branch 'master' into ns-licenses

Conflicts:
	package.json

CONTRIBUTING.md

@@ -66,8 +66,9 @@ in the proper package's repository.
 
 * Use [TomDoc](http://tomdoc.org).
 * Use [Markdown](https://daringfireball.net/projects/markdown).
-* Reference classes with `{ClassName}` style notation.
-* Reference methods with `{ClassName.methodName}` style notation.
+* Reference classes with `{ClassName}`.
+* Reference instance methods with `{ClassName::methodName}`.
+* Reference class methods with `{ClassName.methodName}`.
 * Delegate to comments elsewhere with `{Delegates to: ClassName.methodName}`
   style notation.
 

build/package.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "async": "~0.2.9",
-    "biscotto": "0.6.0",
+    "biscotto": "1.x",
     "formidable": "~1.0.14",
     "fs-plus": "2.x",
     "github-releases": "~0.2.0",

docs/contributing.md

@@ -116,8 +116,10 @@ dependencies up to date by running `apm update` after pulling upstream changes.
 
 * Use [TomDoc](http://tomdoc.org).
 * Use [Markdown](https://daringfireball.net/projects/markdown).
-* Reference classes with the custom `{ClassName}` notation.
-* Reference methods with the custom `{ClassName.methodName}` notation.
+* Reference methods and classes in markdown with the custom `{}` notation:
+  * Reference classes with `{ClassName}`
+  * Reference instance methods with `{ClassName::methodName}`
+  * Reference class methods with `{ClassName.methodName}`
 
 ### Example
 

docs/index.md

@@ -4,6 +4,7 @@
 * [Customizing Atom](customizing-atom.md)
 * [Creating a Package](creating-a-package.md)
 * [Creating a Theme](creating-a-theme.md)
+* [Publishing a Package](publishing-a-package.md)
 
 ### Advanced Topics
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.51.0",
+  "version": "0.52.0",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -74,7 +74,7 @@
     "command-palette": "0.17.0",
     "dev-live-reload": "0.26.0",
     "exception-reporting": "0.13.0",
-    "feedback": "0.23.0",
+    "feedback": "0.24.0",
     "find-and-replace": "0.83.0",
     "fuzzy-finder": "0.35.0",
     "gists": "0.17.0",
@@ -85,12 +85,12 @@
     "image-view": "0.24.0",
     "keybinding-resolver": "0.10.0",
     "link": "0.17.0",
-    "markdown-preview": "0.32.0",
+    "markdown-preview": "0.33.0",
     "metrics": "0.26.0",
     "open-on-github": "0.20.0",
     "package-generator": "0.26.0",
     "release-notes": "0.21.0",
-    "settings-view": "0.76.0",
+    "settings-view": "0.77.0",
     "snippets": "0.30.0",
     "spell-check": "0.25.0",
     "status-bar": "0.32.0",
@@ -105,7 +105,7 @@
     "wrap-guide": "0.14.0",
     "language-c": "0.10.0",
     "language-clojure": "0.2.0",
-    "language-coffee-script": "0.9.0",
+    "language-coffee-script": "0.10.0",
     "language-css": "0.8.0",
     "language-gfm": "0.17.0",
     "language-git": "0.8.0",

spec/keymap-spec.coffee

@@ -399,3 +399,32 @@ describe "Keymap", ->
       runs ->
         keyBinding = keymap.keyBindingsForKeystroke('ctrl-l')[0]
         expect(keyBinding).toBeUndefined()
+
+    it "logs a warning when it can't be parsed", ->
+      keymapFilePath = path.join(configDirPath, "keymap.json")
+      fs.writeFileSync(keymapFilePath, '')
+      keymap.loadUserKeymap()
+
+      spyOn(keymap, 'loadUserKeymap').andCallThrough()
+      fs.writeFileSync(keymapFilePath, '}{')
+      spyOn(console, 'warn')
+
+      waitsFor ->
+        keymap.loadUserKeymap.callCount > 0
+
+      runs ->
+        expect(console.warn.callCount).toBe 1
+        expect(console.warn.argsForCall[0][0].length).toBeGreaterThan 0
+
+  describe "when adding a binding with an invalid selector", ->
+    it "logs a warning and does not add it", ->
+      spyOn(console, 'warn')
+      keybinding =
+        '##selector':
+          'cmd-a': 'invalid-command'
+      keymap.add('test', keybinding)
+
+      expect(console.warn.callCount).toBe 1
+      expect(console.warn.argsForCall[0][0].length).toBeGreaterThan 0
+      expect(-> keymap.keyBindingsMatchingElement(document.body)).not.toThrow()
+      expect(keymap.keyBindingsForCommand('invalid:command')).toEqual []

spec/pane-container-view-spec.coffee

@@ -45,10 +45,10 @@ describe "PaneContainerView", ->
       expect(container.getFocusedPane()).toBe pane3
       expect(container.getActivePane()).toBe pane3
 
-  describe ".eachPane(callback)", ->
+  describe ".eachPaneView(callback)", ->
     it "runs the callback with all current and future panes until the subscription is cancelled", ->
       panes = []
-      subscription = container.eachPane (pane) -> panes.push(pane)
+      subscription = container.eachPaneView (pane) -> panes.push(pane)
       expect(panes).toEqual [pane1, pane2, pane3]
 
       panes = []
@@ -66,7 +66,7 @@ describe "PaneContainerView", ->
 
       container.saveAll()
 
-      for pane in container.getPanes()
+      for pane in container.getPaneViews()
         for item in pane.getItems()
           expect(item.saved).toBeTruthy()
 
@@ -240,30 +240,30 @@ describe "PaneContainerView", ->
         pane2.remove()
         expect(activeItemChangedHandler).not.toHaveBeenCalled()
 
-  describe ".focusNextPane()", ->
+  describe ".focusNextPaneView()", ->
     it "focuses the pane following the focused pane or the first pane if no pane has focus", ->
       container.attachToDom()
-      container.focusNextPane()
+      container.focusNextPaneView()
       expect(pane1.activeItem).toMatchSelector ':focus'
-      container.focusNextPane()
+      container.focusNextPaneView()
       expect(pane2.activeItem).toMatchSelector ':focus'
-      container.focusNextPane()
+      container.focusNextPaneView()
       expect(pane3.activeItem).toMatchSelector ':focus'
-      container.focusNextPane()
+      container.focusNextPaneView()
       expect(pane1.activeItem).toMatchSelector ':focus'
 
-  describe ".focusPreviousPane()", ->
+  describe ".focusPreviousPaneView()", ->
     it "focuses the pane preceding the focused pane or the last pane if no pane has focus", ->
       container.attachToDom()
-      container.getPanes()[0].focus() # activate first pane
+      container.getPaneViews()[0].focus() # activate first pane
 
-      container.focusPreviousPane()
+      container.focusPreviousPaneView()
       expect(pane3.activeItem).toMatchSelector ':focus'
-      container.focusPreviousPane()
+      container.focusPreviousPaneView()
       expect(pane2.activeItem).toMatchSelector ':focus'
-      container.focusPreviousPane()
+      container.focusPreviousPaneView()
       expect(pane1.activeItem).toMatchSelector ':focus'
-      container.focusPreviousPane()
+      container.focusPreviousPaneView()
       expect(pane3.activeItem).toMatchSelector ':focus'
 
   describe "changing focus directionally between panes", ->
@@ -300,54 +300,54 @@ describe "PaneContainerView", ->
       container.width(400)
       container.attachToDom()
 
-    describe ".focusPaneAbove()", ->
+    describe ".focusPaneViewAbove()", ->
       describe "when there are multiple rows above the focused pane", ->
         it "focuses up to the adjacent row", ->
           pane8.focus()
-          container.focusPaneAbove()
+          container.focusPaneViewAbove()
           expect(pane5.activeItem).toMatchSelector ':focus'
 
       describe "when there are no rows above the focused pane", ->
         it "keeps the current pane focused", ->
           pane2.focus()
-          container.focusPaneAbove()
+          container.focusPaneViewAbove()
           expect(pane2.activeItem).toMatchSelector ':focus'
 
-    describe ".focusPaneBelow()", ->
+    describe ".focusPaneViewBelow()", ->
       describe "when there are multiple rows below the focused pane", ->
         it "focuses down to the adjacent row", ->
           pane2.focus()
-          container.focusPaneBelow()
+          container.focusPaneViewBelow()
           expect(pane5.activeItem).toMatchSelector ':focus'
 
       describe "when there are no rows below the focused pane", ->
         it "keeps the current pane focused", ->
           pane8.focus()
-          container.focusPaneBelow()
+          container.focusPaneViewBelow()
           expect(pane8.activeItem).toMatchSelector ':focus'
 
-    describe ".focusPaneOnLeft()", ->
+    describe ".focusPaneViewOnLeft()", ->
       describe "when there are multiple columns to the left of the focused pane", ->
         it "focuses left to the adjacent column", ->
           pane6.focus()
-          container.focusPaneOnLeft()
+          container.focusPaneViewOnLeft()
           expect(pane5.activeItem).toMatchSelector ':focus'
 
       describe "when there are no columns to the left of the focused pane", ->
         it "keeps the current pane focused", ->
           pane4.focus()
-          container.focusPaneOnLeft()
+          container.focusPaneViewOnLeft()
           expect(pane4.activeItem).toMatchSelector ':focus'
 
-    describe ".focusPaneOnRight()", ->
+    describe ".focusPaneViewOnRight()", ->
       describe "when there are multiple columns to the right of the focused pane", ->
         it "focuses right to the adjacent column", ->
           pane4.focus()
-          container.focusPaneOnRight()
+          container.focusPaneViewOnRight()
           expect(pane5.activeItem).toMatchSelector ':focus'
 
       describe "when there are no columns to the right of the focused pane", ->
         it "keeps the current pane focused", ->
           pane6.focus()
-          container.focusPaneOnRight()
+          container.focusPaneViewOnRight()
           expect(pane6.activeItem).toMatchSelector ':focus'

spec/theme-manager-spec.coffee

@@ -224,3 +224,14 @@ describe "ThemeManager", ->
 
       runs ->
         expect($(document.body).css('border-style')).toBe 'none'
+
+  describe "when a non-existent theme is present in the config", ->
+    it "logs a warning but does not throw an exception (regression)", ->
+      waitsForPromise ->
+        themeManager.activateThemes()
+
+      runs ->
+        spyOn(console, 'warn')
+        expect(-> atom.config.set('core.themes', ['atom-light-ui', 'theme-really-does-not-exist'])).not.toThrow()
+        expect(console.warn.callCount).toBe 1
+        expect(console.warn.argsForCall[0][0].length).toBeGreaterThan 0

spec/workspace-view-spec.coffee

@@ -36,12 +36,12 @@ describe "WorkspaceView", ->
         editorView1 = atom.workspaceView.getActiveView()
         buffer = editorView1.getEditor().getBuffer()
         editorView1.splitRight()
-        expect(atom.workspaceView.getActivePane()).toBe atom.workspaceView.getPanes()[1]
+        expect(atom.workspaceView.getActivePane()).toBe atom.workspaceView.getPaneViews()[1]
 
         simulateReload()
 
         expect(atom.workspaceView.getEditorViews().length).toBe 2
-        expect(atom.workspaceView.getActivePane()).toBe atom.workspaceView.getPanes()[1]
+        expect(atom.workspaceView.getActivePane()).toBe atom.workspaceView.getPaneViews()[1]
         expect(atom.workspaceView.title).toBe "untitled - #{atom.project.getPath()}"
 
     describe "when there are open editors", ->

src/clipboard.coffee

@@ -20,7 +20,7 @@ class Clipboard
   # Public: Write the given text to the clipboard.
   #
   # The metadata associated with the text is available by calling
-  # {.readWithMetadata}.
+  # {::readWithMetadata}.
   #
   # text - The {String} to store.
   # metadata - The additional info to associate with the text.
@@ -40,7 +40,7 @@ class Clipboard
   #
   # Returns an {Object} with the following keys:
   #   :text - The {String} clipboard text.
-  #   :metadata - The metadata stored by an earlier call to {.write}.
+  #   :metadata - The metadata stored by an earlier call to {::write}.
   readWithMetadata: ->
     text = @read()
     if @signatureForMetadata is @md5(text)

src/cursor.coffee

@@ -311,7 +311,7 @@ class Cursor
   #
   # options - An {Object} with the following keys:
   #   :wordRegex - A {RegExp} indicating what constitutes a "word"
-  #                (default: {.wordRegExp}).
+  #                (default: {::wordRegExp}).
   #   :includeNonWordCharacters - A {Boolean} indicating whether to include
   #                               non-word characters in the default word regex.
   #                               Has no effect if wordRegex is set.
@@ -379,7 +379,7 @@ class Cursor
   #
   # options - An {Object} with the following keys:
   #   :wordRegex - A {RegExp} indicating what constitutes a "word"
-  #                (default: {.wordRegExp})
+  #                (default: {::wordRegExp})
   #   :includeNonWordCharacters - A Boolean indicating whether to include
   #                               non-word characters in the default word regex.
   #                               Has no effect if wordRegex is set.
@@ -403,7 +403,7 @@ class Cursor
   #
   # options -
   #   :wordRegex - A {RegExp} indicating what constitutes a "word"
-  #                (default: {.wordRegExp}).
+  #                (default: {::wordRegExp}).
   #
   # Returns a {Range}.
   getBeginningOfNextWordBufferPosition: (options = {}) ->
@@ -422,7 +422,7 @@ class Cursor
   #
   # options -
   #   :wordRegex - A {RegExp} indicating what constitutes a "word"
-  #                (default: {.wordRegExp}).
+  #                (default: {::wordRegExp}).
   getCurrentWordBufferRange: (options={}) ->
     startOptions = _.extend(_.clone(options), allowPrevious: false)
     endOptions = _.extend(_.clone(options), allowNext: false)

src/display-buffer-marker.coffee

@@ -37,7 +37,7 @@ class DisplayBufferMarker
   # Modifies the screen range of the display marker.
   #
   # screenRange - The new {Range} to use
-  # options - A hash of options matching those found in {Marker.setRange}
+  # options - A hash of options matching those found in {Marker::setRange}
   setScreenRange: (screenRange, options) ->
     @setBufferRange(@displayBuffer.bufferRangeForScreenRange(screenRange), options)
 
@@ -50,7 +50,7 @@ class DisplayBufferMarker
   # Modifies the buffer range of the display marker.
   #
   # screenRange - The new {Range} to use
-  # options - A hash of options matching those found in {Marker.setRange}
+  # options - A hash of options matching those found in {Marker::setRange}
   setBufferRange: (bufferRange, options) ->
     @bufferMarker.setRange(bufferRange, options)
 
@@ -63,7 +63,7 @@ class DisplayBufferMarker
   # Sets the screen position of the marker's head.
   #
   # screenRange - The new {Point} to use
-  # options - A hash of options matching those found in {DisplayBuffer.bufferPositionForScreenPosition}
+  # options - A hash of options matching those found in {DisplayBuffer::bufferPositionForScreenPosition}
   setHeadScreenPosition: (screenPosition, options) ->
     screenPosition = @displayBuffer.clipScreenPosition(screenPosition, options)
     @setHeadBufferPosition(@displayBuffer.bufferPositionForScreenPosition(screenPosition, options))
@@ -77,7 +77,7 @@ class DisplayBufferMarker
   # Sets the buffer position of the marker's head.
   #
   # screenRange - The new {Point} to use
-  # options - A hash of options matching those found in {DisplayBuffer.bufferPositionForScreenPosition}
+  # options - A hash of options matching those found in {DisplayBuffer::bufferPositionForScreenPosition}
   setHeadBufferPosition: (bufferPosition) ->
     @bufferMarker.setHeadPosition(bufferPosition)
 
@@ -90,7 +90,7 @@ class DisplayBufferMarker
   # Sets the screen position of the marker's tail.
   #
   # screenRange - The new {Point} to use
-  # options - A hash of options matching those found in {DisplayBuffer.bufferPositionForScreenPosition}
+  # options - A hash of options matching those found in {DisplayBuffer::bufferPositionForScreenPosition}
   setTailScreenPosition: (screenPosition, options) ->
     screenPosition = @displayBuffer.clipScreenPosition(screenPosition, options)
     @setTailBufferPosition(@displayBuffer.bufferPositionForScreenPosition(screenPosition, options))
@@ -104,7 +104,7 @@ class DisplayBufferMarker
   # Sets the buffer position of the marker's tail.
   #
   # screenRange - The new {Point} to use
-  # options - A hash of options matching those found in {DisplayBuffer.bufferPositionForScreenPosition}
+  # options - A hash of options matching those found in {DisplayBuffer::bufferPositionForScreenPosition}
   setTailBufferPosition: (bufferPosition) ->
     @bufferMarker.setTailPosition(bufferPosition)
 
@@ -135,7 +135,7 @@ class DisplayBufferMarker
   # Returns a {Boolean} indicating whether the marker has been destroyed. A marker
   # can be invalid without being destroyed, in which case undoing the invalidating
   # operation would restore the marker. Once a marker is destroyed by calling
-  # {Marker.destroy}, no undo/redo operation can ever bring it back.
+  # {Marker::destroy}, no undo/redo operation can ever bring it back.
   isDestroyed: ->
     @bufferMarker.isDestroyed()