From bc1f190c2f233c84fbaee35574ebd8c4af76e687 Mon Sep 17 00:00:00 2001 From: Jonas Gebhardt Date: Tue, 5 May 2015 11:22:14 -0700 Subject: [PATCH 01/20] remove babel compatibility option for legacy react versions --- src/babel.coffee | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/babel.coffee b/src/babel.coffee index 286ee45ef..7058c85c2 100644 --- a/src/babel.coffee +++ b/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: From 4fd114a1b4c589effbe43b37dde55ada172b8c4a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 May 2015 09:38:09 -0700 Subject: [PATCH 02/20] Prepare 0.198 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 90e15cfcd..65fd5780b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "0.197.0", + "version": "0.198.0", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From 4f5e9b114d6ecac8762c69ef58bb42fd002670fb Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Thu, 7 May 2015 10:31:21 -0700 Subject: [PATCH 03/20] :arrow_up: language-html@0.37.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65fd5780b..98bffd420 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "language-gfm": "0.71.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", From a2dcdda972ae07566930063a09f9d856982da5b6 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 May 2015 10:58:44 -0700 Subject: [PATCH 04/20] Prepare 0.199 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98bffd420..f38754551 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "0.198.0", + "version": "0.199.0", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From edf0d6f2380f9af1dc0ea267b954468e0cc8b7a0 Mon Sep 17 00:00:00 2001 From: Johnston Jiaa Date: Thu, 7 May 2015 14:18:03 -0400 Subject: [PATCH 05/20] :arrow_up: fs-plus@2.8.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f38754551..a62460413 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "emissary": "^1.3.3", "event-kit": "^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", From 4300ba6bb3155eb4340eb9bda42a5ab171bd24c4 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 7 May 2015 11:35:16 -0700 Subject: [PATCH 06/20] Make 'atom' command w/ no args reopen previous windows --- src/browser/main.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/src/browser/main.coffee b/src/browser/main.coffee index e35632104..746055ea4 100644 --- a/src/browser/main.coffee +++ b/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'] From 5b8262bd96a9889b880bc1b54b72514c6a753f66 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 7 May 2015 12:56:29 -0700 Subject: [PATCH 07/20] :racehorse: Avoid repeated array allocation in ::getDecorations --- src/display-buffer.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee index d86fd13be..db39eb432 100644 --- a/src/display-buffer.coffee +++ b/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 From b7dddeebfe71f710cf495ed7d34e16d4a238df5d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 May 2015 13:23:14 -0700 Subject: [PATCH 08/20] Guard against no hosted git info Closes #6693 --- .../package-with-invalid-url-package-json/package.json | 4 ++++ spec/package-manager-spec.coffee | 4 ++++ src/package.coffee | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 spec/fixtures/packages/package-with-invalid-url-package-json/package.json diff --git a/spec/fixtures/packages/package-with-invalid-url-package-json/package.json b/spec/fixtures/packages/package-with-invalid-url-package-json/package.json new file mode 100644 index 000000000..cc119ffaa --- /dev/null +++ b/spec/fixtures/packages/package-with-invalid-url-package-json/package.json @@ -0,0 +1,4 @@ +{ + "name": "package-with-invalid-url-package-json", + "repository": "foo" +} diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee index ebdd1f57a..92dc21a13 100644 --- a/spec/package-manager-spec.coffee +++ b/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() diff --git a/src/package.coffee b/src/package.coffee index 05be6c79f..8f5baf44a 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -34,7 +34,7 @@ class Package repoUrl = metadata.repository?.url if repoUrl info = hostedGitInfo.fromUrl(repoUrl) - if info.getDefaultRepresentation() is 'shortcut' + if info?.getDefaultRepresentation() is 'shortcut' metadata.repository.url = info.https().replace(/^git\+/, '') @loadMetadata: (packagePath, ignoreErrors=false) -> From db3cd61344e2587410988370eb88ffc3838a4321 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 May 2015 14:35:17 -0700 Subject: [PATCH 09/20] :arrow_up: settings-view@0.198 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a62460413..6a9d42176 100644 --- a/package.json +++ b/package.json @@ -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", From 55c0be05f718d57d31a8940a823940f6bf85b75b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 May 2015 14:35:55 -0700 Subject: [PATCH 10/20] :arrow_up: language-gfm@0.72 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6a9d42176..953c69800 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "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.37.0", From 858fc53a0cb52a6ed665bb09ea5017f691b83e05 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 7 May 2015 15:42:32 -0700 Subject: [PATCH 11/20] :arrow_up: event-kit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 953c69800..19e5acf9f 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "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.8.0", "fstream": "0.1.24", From 523171061b14620a4b8156be1e687799b31f390f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 7 May 2015 15:57:58 -0700 Subject: [PATCH 12/20] Stop resize if detached or if siblings are missing Closes #6630 --- spec/pane-container-element-spec.coffee | 22 ++++++++++++++++++++++ src/pane-resize-handle-element.coffee | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/spec/pane-container-element-spec.coffee b/spec/pane-container-element-spec.coffee index 0a5b11b39..400904f5c 100644 --- a/spec/pane-container-element-spec.coffee +++ b/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 diff --git a/src/pane-resize-handle-element.coffee b/src/pane-resize-handle-element.coffee index 47548bc60..078bb44ac 100644 --- a/src/pane-resize-handle-element.coffee +++ b/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 From 5f40ee37fa2d32da7e0d6d11e1d883a71a76f770 Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 8 May 2015 11:46:57 +0900 Subject: [PATCH 13/20] :arrow_up: atom-dark-syntax@0.27.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 19e5acf9f..ffb6c5259 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "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-ui": "0.41.0", From 14b112cf20e78929cc8f723a9a56d91d1fc4c4ce Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 8 May 2015 11:48:09 +0900 Subject: [PATCH 14/20] :arrow_up: atom-light-syntax@0.28.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ffb6c5259..78bdd028b 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "packageDependencies": { "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", From bff5c8496313eae3c2dd0f594f9a096364ff5b65 Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 8 May 2015 11:49:12 +0900 Subject: [PATCH 15/20] :arrow_up: base16-tomorrow-dark-theme@0.26.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 78bdd028b..d5f157c05 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "atom-dark-ui": "0.49.0", "atom-light-syntax": "0.28.0", "atom-light-ui": "0.41.0", - "base16-tomorrow-dark-theme": "0.25.0", + "base16-tomorrow-dark-theme": "0.26.0", "base16-tomorrow-light-theme": "0.8.0", "one-dark-ui": "0.8.1", "one-dark-syntax": "0.4.0", From 2dde7501572454e7d8ad2bf96868237680b97efc Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 8 May 2015 11:50:14 +0900 Subject: [PATCH 16/20] :arrow_up: base16-tomorrow-light-theme@0.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d5f157c05..588a0163d 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "atom-light-syntax": "0.28.0", "atom-light-ui": "0.41.0", "base16-tomorrow-dark-theme": "0.26.0", - "base16-tomorrow-light-theme": "0.8.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", From 1f5dda1ecd7884c6926d3bcafa37627d524fb23d Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 8 May 2015 11:51:15 +0900 Subject: [PATCH 17/20] :arrow_up: one-dark-syntax@0.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 588a0163d..802c30191 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "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-dark-syntax": "0.5.0", "one-light-syntax": "0.5.0", "one-light-ui": "0.8.1", "solarized-dark-syntax": "0.32.0", From 99a30dedf8c9ecde62af49fe44261e0866617bf5 Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 8 May 2015 11:52:29 +0900 Subject: [PATCH 18/20] :arrow_up: one-light-syntax@0.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 802c30191..381fe7038 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "base16-tomorrow-light-theme": "0.9.0", "one-dark-ui": "0.8.1", "one-dark-syntax": "0.5.0", - "one-light-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", From bd33d8d5281f7a99c4613576a29029019ed87aaa Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 8 May 2015 11:58:26 +0900 Subject: [PATCH 19/20] :arrow_up: solarized-dark-syntax@0.35.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 381fe7038..60a86cfcf 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "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-dark-syntax": "0.35.0", "solarized-light-syntax": "0.19.0", "archive-view": "0.56.0", "autocomplete": "0.46.0", From fabfd2a68fbd2a0c3bf8a62b44d1d4317d19d92a Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 8 May 2015 12:01:24 +0900 Subject: [PATCH 20/20] :arrow_up: solarized-light-syntax@0.21.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 60a86cfcf..144981d45 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "one-light-syntax": "0.6.0", "one-light-ui": "0.8.1", "solarized-dark-syntax": "0.35.0", - "solarized-light-syntax": "0.19.0", + "solarized-light-syntax": "0.21.0", "archive-view": "0.56.0", "autocomplete": "0.46.0", "autoflow": "0.22.0",