merge

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.197.0",
+  "version": "0.199.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -31,9 +31,9 @@
     "color": "^0.7.3",
     "delegato": "^1",
     "emissary": "^1.3.3",
-    "event-kit": "^1.1",
+    "event-kit": "^1.1.1",
     "first-mate": "^3.1",
-    "fs-plus": "^2.7.1",
+    "fs-plus": "^2.8.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
     "git-utils": "^3.0.0",
@@ -71,18 +71,18 @@
     "underscore-plus": "^1.6.6"
   },
   "packageDependencies": {
-    "atom-dark-syntax": "0.26.0",
+    "atom-dark-syntax": "0.27.0",
     "atom-dark-ui": "0.49.0",
-    "atom-light-syntax": "0.26.0",
+    "atom-light-syntax": "0.28.0",
     "atom-light-ui": "0.41.0",
-    "base16-tomorrow-dark-theme": "0.25.0",
-    "base16-tomorrow-light-theme": "0.8.0",
+    "base16-tomorrow-dark-theme": "0.26.0",
+    "base16-tomorrow-light-theme": "0.9.0",
     "one-dark-ui": "0.8.1",
-    "one-dark-syntax": "0.4.0",
-    "one-light-syntax": "0.5.0",
+    "one-dark-syntax": "0.5.0",
+    "one-light-syntax": "0.6.0",
     "one-light-ui": "0.8.1",
-    "solarized-dark-syntax": "0.32.0",
-    "solarized-light-syntax": "0.19.0",
+    "solarized-dark-syntax": "0.35.0",
+    "solarized-light-syntax": "0.21.0",
     "archive-view": "0.56.0",
     "autocomplete": "0.46.0",
     "autoflow": "0.22.0",
@@ -111,7 +111,7 @@
     "open-on-github": "0.36.0",
     "package-generator": "0.38.0",
     "release-notes": "0.52.0",
-    "settings-view": "0.197.0",
+    "settings-view": "0.198.0",
     "snippets": "0.89.0",
     "spell-check": "0.56.0",
     "status-bar": "0.69.0",
@@ -129,10 +129,10 @@
     "language-coffee-script": "0.40.0",
     "language-csharp": "0.5.0",
     "language-css": "0.29.0",
-    "language-gfm": "0.71.0",
+    "language-gfm": "0.72.0",
     "language-git": "0.10.0",
     "language-go": "0.25.0",
-    "language-html": "0.36.0",
+    "language-html": "0.37.0",
     "language-hyperlink": "0.13.0",
     "language-java": "0.15.0",
     "language-javascript": "0.77.0",

spec/fixtures/packages/package-with-invalid-url-package-json/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "package-with-invalid-url-package-json",
+  "repository": "foo"
+}

spec/package-manager-spec.coffee

@@ -46,6 +46,10 @@ describe "PackageManager", ->
       expect(metadata.repository.type).toBe "git"
       expect(metadata.repository.url).toBe "https://github.com/example/repo.git"
 
+      {metadata} = atom.packages.loadPackage("package-with-invalid-url-package-json")
+      expect(metadata.repository.type).toBe "git"
+      expect(metadata.repository.url).toBe "foo"
+
     it "returns null if the package is not found in any package directory", ->
       spyOn(console, 'warn')
       expect(atom.packages.loadPackage("this-package-cannot-be-found")).toBeNull()

spec/pane-container-element-spec.coffee

@@ -132,3 +132,25 @@ describe "PaneContainerElement", ->
       # dynamically close pane, the pane's flexscale will recorver to origin value
       lowerPane.close()
       expectPaneScale [leftPane, 0.5], [rightPane, 1.5]
+
+    it "unsubscribes from mouse events when the pane is detached", ->
+      container.getActivePane().splitRight()
+      element = getResizeElement(0)
+      spyOn(document, 'addEventListener').andCallThrough()
+      spyOn(document, 'removeEventListener').andCallThrough()
+      spyOn(element, 'resizeStopped').andCallThrough()
+
+      element.dispatchEvent(new MouseEvent('mousedown',
+        view: window
+        bubbles: true
+        button: 0
+      ))
+
+      waitsFor ->
+        document.addEventListener.callCount is 2
+
+      runs ->
+        expect(element.resizeStopped.callCount).toBe 0
+        container.destroy()
+        expect(element.resizeStopped.callCount).toBe 1
+        expect(document.removeEventListener.callCount).toBe 2

src/babel.coffee

@@ -32,11 +32,6 @@ defaultOptions =
     # Target a version of the regenerator runtime that
     # supports yield so the transpiled code is cleaner/smaller.
     'asyncToGenerator'
-
-    # Because Atom is currently packaged with a fork of React v0.11,
-    # it makes sense to use the reactCompat transform so the React
-    # JSX transformer produces pre-v0.12 code.
-    'reactCompat'
   ]
 
   # Includes support for es7 features listed at:

src/browser/main.coffee

@@ -133,7 +133,6 @@ parseCommandLine = ->
   safeMode = args['safe']
   apiPreviewMode = args['one']
   pathsToOpen = args._
-  pathsToOpen = [executedFrom] if executedFrom and pathsToOpen.length is 0
   test = args['test']
   specDirectory = args['spec-directory']
   newWindow = args['new-window']

src/display-buffer.coffee

@@ -886,7 +886,7 @@ class DisplayBuffer extends Model
   getDecorations: (propertyFilter) ->
     allDecorations = []
     for markerId, decorations of @decorationsByMarkerId
-      allDecorations = allDecorations.concat(decorations) if decorations?
+      allDecorations.push(decorations...) if decorations?
     if propertyFilter?
       allDecorations = allDecorations.filter (decoration) ->
         for key, value of propertyFilter

src/pane-resize-handle-element.coffee

@@ -12,6 +12,9 @@ class PaneResizeHandleElement extends HTMLElement
     @isHorizontal = @parentElement.classList.contains("horizontal")
     @classList.add if @isHorizontal then 'horizontal' else 'vertical'
 
+  detachedCallback: ->
+    @resizeStopped()
+
   resizeToFitContent: ->
     # clear flex-grow css style of both pane
     @previousSibling.model.setFlexScale(1)
@@ -43,6 +46,7 @@ class PaneResizeHandleElement extends HTMLElement
 
   resizePane: ({clientX, clientY, which}) ->
     return @resizeStopped() unless which is 1
+    return @resizeStopped() unless @previousSibling? and @nextSibling?
 
     if @isHorizontal
       totalWidth = @previousSibling.clientWidth + @nextSibling.clientWidth