Merge branch 'master' into windows-git-fixes

src/atom-environment.coffee

@@ -40,6 +40,7 @@ Project = require './project'
 TextEditor = require './text-editor'
 TextBuffer = require 'text-buffer'
 Gutter = require './gutter'
+TextEditorRegistry = require './text-editor-registry'
 
 WorkspaceElement = require './workspace-element'
 PanelContainerElement = require './panel-container-element'
@@ -111,6 +112,9 @@ class AtomEnvironment extends Model
   # Public: A {Workspace} instance
   workspace: null
 
+  # Public: A {TextEditorRegistry} instance
+  textEditors: null
+
   saveStateDebounceInterval: 1000
 
   ###
@@ -183,6 +187,8 @@ class AtomEnvironment extends Model
     })
     @themes.workspace = @workspace
 
+    @textEditors = new TextEditorRegistry
+
     @config.load()
 
     @themes.loadBaseStylesheets()

src/config.coffee

@@ -319,6 +319,23 @@ ScopeDescriptor = require './scope-descriptor'
 # * line breaks - `line breaks<br/>`
 # * ~~strikethrough~~ - `~~strikethrough~~`
 #
+# #### order
+#
+# The settings view orders your settings alphabetically. You can override this
+# ordering with the order key.
+#
+# ```coffee
+# config:
+#   zSetting:
+#     type: 'integer'
+#     default: 4
+#     order: 1
+#   aSetting:
+#     type: 'integer'
+#     default: 4
+#     order: 2
+# ```
+#
 # ## Best practices
 #
 # * Don't depend on (or write to) configuration keys outside of your keypath.

src/language-mode.coffee

@@ -147,13 +147,11 @@ class LanguageMode
 
     if bufferRow > 0
       for currentRow in [bufferRow-1..0] by -1
-        break if @buffer.isRowBlank(currentRow)
         break unless @editor.displayBuffer.tokenizedBuffer.tokenizedLineForRow(currentRow).isComment()
         startRow = currentRow
 
     if bufferRow < @buffer.getLastRow()
       for currentRow in [bufferRow+1..@buffer.getLastRow()] by 1
-        break if @buffer.isRowBlank(currentRow)
         break unless @editor.displayBuffer.tokenizedBuffer.tokenizedLineForRow(currentRow).isComment()
         endRow = currentRow
 

src/package-manager.coffee

@@ -541,11 +541,12 @@ class PackageManager
     unless typeof metadata.name is 'string' and metadata.name.length > 0
       metadata.name = packageName
 
+    if metadata.repository?.type is 'git' and typeof metadata.repository.url is 'string'
+      metadata.repository.url = metadata.repository.url.replace(/(^git\+)|(\.git$)/g, '')
+
     metadata
 
   normalizePackageMetadata: (metadata) ->
     unless metadata?._id
       normalizePackageData ?= require 'normalize-package-data'
       normalizePackageData(metadata)
-      if metadata.repository?.type is 'git' and typeof metadata.repository.url is 'string'
-        metadata.repository.url = metadata.repository.url.replace(/^git\+/, '')

src/pane.coffee

@@ -423,10 +423,6 @@ class Pane extends Model
 
     return if item in @items
 
-    pendingItem = @getPendingItem()
-    @destroyItem(pendingItem) if pendingItem?
-    @setPendingItem(item) if pending
-
     if typeof item.onDidDestroy is 'function'
       itemSubscriptions = new CompositeDisposable
       itemSubscriptions.add item.onDidDestroy => @removeItem(item, false)
@@ -437,6 +433,10 @@ class Pane extends Model
       @subscriptionsPerItem.set item, itemSubscriptions
 
     @items.splice(index, 0, item)
+    pendingItem = @getPendingItem()
+    @destroyItem(pendingItem) if pendingItem?
+    @setPendingItem(item) if pending
+
     @emitter.emit 'did-add-item', {item, index, moved}
     @setActiveItem(item) unless @getActiveItem()?
     item

src/selection.coffee

@@ -810,11 +810,11 @@ class Selection extends Model
       @wordwise = false
       @linewise = false
 
-  autoscroll: ->
+  autoscroll: (options) ->
     if @marker.hasTail()
-      @editor.scrollToScreenRange(@getScreenRange(), reversed: @isReversed())
+      @editor.scrollToScreenRange(@getScreenRange(), Object.assign({reversed: @isReversed()}, options))
     else
-      @cursor.autoscroll()
+      @cursor.autoscroll(options)
 
   clearAutoscroll: ->
 

src/text-editor-registry.coffee

@@ -0,0 +1,40 @@
+{Emitter, Disposable} = require 'event-kit'
+
+# Experimental: This global registry tracks registered `TextEditors`.
+#
+# If you want to add functionality to a wider set of text editors than just
+# those appearing within workspace panes, use `atom.textEditors.observe` to
+# invoke a callback for all current and future registered text editors.
+#
+# If you want packages to be able to add functionality to your non-pane text
+# editors (such as a search field in a custom user interface element), register
+# them for observation via `atom.textEditors.add`. **Important:** When you're
+# done using your editor, be sure to call `dispose` on the returned disposable
+# to avoid leaking editors.
+module.exports =
+class TextEditorRegistry
+  constructor: ->
+    @editors = new Set
+    @emitter = new Emitter
+
+  # Register a `TextEditor`.
+  #
+  # * `editor` The editor to register.
+  #
+  # Returns a {Disposable} on which `.dispose()` can be called to remove the
+  # added editor. To avoid any memory leaks this should be called when the
+  # editor is destroyed.
+  add: (editor) ->
+    @editors.add(editor)
+    @emitter.emit 'did-add-editor', editor
+    new Disposable => @editors.delete(editor)
+
+  # Invoke the given callback with all the current and future registered
+  # `TextEditors`.
+  #
+  # * `callback` {Function} to be called with current and future text editors.
+  #
+  # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
+  observe: (callback) ->
+    @editors.forEach(callback)
+    @emitter.on 'did-add-editor', callback

src/text-editor.coffee

@@ -82,7 +82,10 @@ class TextEditor extends Model
     state.project = atomEnvironment.project
     state.assert = atomEnvironment.assert.bind(atomEnvironment)
     state.applicationDelegate = atomEnvironment.applicationDelegate
-    new this(state)
+    editor = new this(state)
+    disposable = atomEnvironment.textEditors.add(editor)
+    editor.onDidDestroy -> disposable.dispose()
+    editor
 
   constructor: (params={}) ->
     super
@@ -2466,6 +2469,7 @@ class TextEditor extends Model
     selections = @getSelections()
     if selections.length > 1
       selection.destroy() for selection in selections[1...(selections.length)]
+      selections[0].autoscroll(center: true)
       true
     else
       false

src/tokenized-line.coffee

@@ -498,7 +498,6 @@ class TokenizedLine
     while iterator.next()
       scopes = iterator.getScopes()
       continue if scopes.length is 1
-      continue unless NonWhitespaceRegex.test(iterator.getText())
       for scope in scopes
         if CommentScopeRegex.test(scope)
           @isCommentLine = true

src/workspace.coffee

@@ -558,7 +558,10 @@ class Workspace extends Model
       @config, @notificationManager, @packageManager, @clipboard, @viewRegistry,
       @grammarRegistry, @project, @assert, @applicationDelegate
     }, params)
-    new TextEditor(params)
+    editor = new TextEditor(params)
+    disposable = atom.textEditors.add(editor)
+    editor.onDidDestroy -> disposable.dispose()
+    editor
 
   # Public: Asynchronously reopens the last-closed item's URI if it hasn't already been
   # reopened.