From b8a08affc68facc4f4c14a46d4c94fa6ff2d0dd6 Mon Sep 17 00:00:00 2001 From: Wliu Date: Wed, 15 Feb 2017 11:36:57 -0500 Subject: [PATCH 01/13] Relativize spec paths more when reporting * `[object Object].anonymous` changed a while back to just `.anonymous` * Windows uses `file:///path` notation, so take that into account * Also relativize paths in parentheses --- spec/atom-reporter.coffee | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spec/atom-reporter.coffee b/spec/atom-reporter.coffee index 1600da9d7..a91059efe 100644 --- a/spec/atom-reporter.coffee +++ b/spec/atom-reporter.coffee @@ -1,4 +1,5 @@ path = require 'path' +process = require 'process' _ = require 'underscore-plus' grim = require 'grim' marked = require 'marked' @@ -20,12 +21,15 @@ formatStackTrace = (spec, message='', stackTrace) -> lines.shift() if message.trim() is errorMatch?[1]?.trim() for line, index in lines - # Remove prefix of lines matching: at [object Object]. (path:1:2) - prefixMatch = line.match(/at \[object Object\]\. \(([^)]+)\)/) + # Remove prefix of lines matching: at . (path:1:2) + prefixMatch = line.match(/at \. \(([^)]+)\)/) line = "at #{prefixMatch[1]}" if prefixMatch # Relativize locations to spec directory - lines[index] = line.replace("at #{spec.specDirectory}#{path.sep}", 'at ') + if process.platform is 'win32' + line = line.replace('file:///', '').replace(///#{path.posix.sep}///g, path.win32.sep) + line = line.replace("at #{spec.specDirectory}#{path.sep}", 'at ') + lines[index] = line.replace("(#{spec.specDirectory}#{path.sep}", '(') # at step (path:1:2) lines = lines.map (line) -> line.trim() lines.join('\n').trim() From 7f1f7e239ba8f353b0ac18b9544367242acc6744 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Thu, 23 Feb 2017 17:26:57 +0100 Subject: [PATCH 02/13] :arrow_up: timecop --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8739d05f9..6ffd8ed95 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "styleguide": "0.49.2", "symbols-view": "0.114.0", "tabs": "0.104.1", - "timecop": "0.35.0", + "timecop": "0.36.0", "tree-view": "0.214.1", "update-package-dependencies": "0.10.0", "welcome": "0.36.1", From b68bd6683896f4768ffab707a3bb5c3dd002d95b Mon Sep 17 00:00:00 2001 From: Lee Dohm Date: Fri, 30 Dec 2016 18:53:02 -0800 Subject: [PATCH 03/13] :arrow_up: dalek@0.2.0 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 6ffd8ed95..1c72dd6a8 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,7 @@ "bookmarks": "0.44.1", "bracket-matcher": "0.85.2", "command-palette": "0.40.2", + "dalek": "0.2.0", "deprecation-cop": "0.56.2", "dev-live-reload": "0.47.0", "encoding-selector": "0.23.1", From 89fe821930f6cb1e7b99ed7bf771219ae78a3be0 Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Thu, 23 Feb 2017 10:12:11 -0800 Subject: [PATCH 04/13] :arrow_up: language-csharp --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c72dd6a8..9971a1a7e 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "language-c": "0.56.0", "language-clojure": "0.22.2", "language-coffee-script": "0.48.4", - "language-csharp": "0.14.1", + "language-csharp": "0.14.2", "language-css": "0.42.0", "language-gfm": "0.88.0", "language-git": "0.19.0", From 0be25d818aa4a71338614a24815e6942cbf55514 Mon Sep 17 00:00:00 2001 From: "Jared M. Smith" Date: Thu, 23 Feb 2017 15:09:35 -0600 Subject: [PATCH 05/13] :bug: Fix apm shell script reference in Windows fixes #13874 --- resources/win/apm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/win/apm.sh b/resources/win/apm.sh index 99ccfec69..3a479f53d 100644 --- a/resources/win/apm.sh +++ b/resources/win/apm.sh @@ -1,3 +1,3 @@ #!/bin/sh -"$(dirname "$0")/../app/apm/apm.sh" "$@" +"$(dirname "$0")/../app/apm/bin/apm" "$@" From ecc4420cfd0c161ad3879197d1e2b91ec440a8f8 Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Thu, 23 Feb 2017 23:55:22 -0500 Subject: [PATCH 06/13] :arrow_up: bracket-matcher@0.85.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9971a1a7e..0fa95d491 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "autosave": "0.24.0", "background-tips": "0.26.1", "bookmarks": "0.44.1", - "bracket-matcher": "0.85.2", + "bracket-matcher": "0.85.3", "command-palette": "0.40.2", "dalek": "0.2.0", "deprecation-cop": "0.56.2", From 2e72f39a21e043fedbcaf2e3a567234f138a5b59 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 24 Feb 2017 09:04:58 -0700 Subject: [PATCH 07/13] :arrow_up: text-buffer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0fa95d491..0a799e71e 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "sinon": "1.17.4", "source-map-support": "^0.3.2", "temp": "0.8.1", - "text-buffer": "10.3.11", + "text-buffer": "10.3.12", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", "winreg": "^1.2.1", From acbe228901c73cd54bb83fcc4816020807f38707 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 27 Feb 2017 11:15:20 +0100 Subject: [PATCH 08/13] Ignore `ref` and `key` properties in `TextEditor.prototype.update` --- src/text-editor.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/text-editor.coffee b/src/text-editor.coffee index 13b8a0bfa..3cdd363a7 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -353,7 +353,8 @@ class TextEditor extends Model cursor.setShowCursorOnSelection(value) for cursor in @getCursors() else - throw new TypeError("Invalid TextEditor parameter: '#{param}'") + if param isnt 'ref' and param isnt 'key' + throw new TypeError("Invalid TextEditor parameter: '#{param}'") @displayLayer.reset(displayLayerParams) From dd07768f2266304f9ca472bd8026d2de44898daa Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Mon, 27 Feb 2017 11:12:50 -0500 Subject: [PATCH 09/13] :arrow_up: language-javascript@0.126.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a799e71e..fbed97460 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "language-html": "0.47.2", "language-hyperlink": "0.16.1", "language-java": "0.26.0", - "language-javascript": "0.126.0", + "language-javascript": "0.126.1", "language-json": "0.18.3", "language-less": "0.30.1", "language-make": "0.22.3", From cd873c7f8abc9a83840073573da1e452529558b0 Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Mon, 27 Feb 2017 13:29:54 -0500 Subject: [PATCH 10/13] :arrow_up: settings-view@0.247.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fbed97460..387bba8b8 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "notifications": "0.66.2", "open-on-github": "1.2.1", "package-generator": "1.1.0", - "settings-view": "0.247.0", + "settings-view": "0.247.1", "snippets": "1.0.5", "spell-check": "0.71.0", "status-bar": "1.8.1", From 1dcf2f3ba47c71fb136466dd12a9893d6a43de2b Mon Sep 17 00:00:00 2001 From: bene Date: Mon, 27 Feb 2017 22:42:22 +0100 Subject: [PATCH 11/13] :arrow_up: atom-keymap --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 387bba8b8..f76b2f94c 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "electronVersion": "1.3.13", "dependencies": { "async": "0.2.6", - "atom-keymap": "7.1.20", + "atom-keymap": "7.1.21", "atom-select-list": "0.0.12", "atom-ui": "0.4.1", "babel-core": "6.22.1", From f8de954d3599922b3af0b29480553e61d17ee5e7 Mon Sep 17 00:00:00 2001 From: simurai Date: Tue, 28 Feb 2017 17:30:41 +0900 Subject: [PATCH 12/13] :arrow_up: settings-view@v0.247.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f76b2f94c..41ac9e189 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "notifications": "0.66.2", "open-on-github": "1.2.1", "package-generator": "1.1.0", - "settings-view": "0.247.1", + "settings-view": "0.247.2", "snippets": "1.0.5", "spell-check": "0.71.0", "status-bar": "1.8.1", From 8a1956ceca2f2ea4ea2daebf4030808e517a7628 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 28 Feb 2017 10:46:45 +0100 Subject: [PATCH 13/13] :arrow_up: etch and atom-select-list --- package.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 41ac9e189..01eedc2eb 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dependencies": { "async": "0.2.6", "atom-keymap": "7.1.21", - "atom-select-list": "0.0.12", + "atom-select-list": "0.0.15", "atom-ui": "0.4.1", "babel-core": "6.22.1", "babel-plugin-add-module-exports": "0.2.1", @@ -95,7 +95,7 @@ "one-light-syntax": "1.7.1", "solarized-dark-syntax": "1.1.2", "solarized-light-syntax": "1.1.2", - "about": "1.7.2", + "about": "1.7.4", "archive-view": "0.62.2", "autocomplete-atom-api": "0.10.0", "autocomplete-css": "0.15.0", @@ -105,23 +105,23 @@ "autoflow": "0.29.0", "autosave": "0.24.0", "background-tips": "0.26.1", - "bookmarks": "0.44.1", + "bookmarks": "0.44.2", "bracket-matcher": "0.85.3", - "command-palette": "0.40.2", + "command-palette": "0.40.3", "dalek": "0.2.0", "deprecation-cop": "0.56.2", "dev-live-reload": "0.47.0", - "encoding-selector": "0.23.1", + "encoding-selector": "0.23.2", "exception-reporting": "0.41.1", "find-and-replace": "0.206.3", "fuzzy-finder": "1.4.1", - "git-diff": "1.3.1", + "git-diff": "1.3.2", "go-to-line": "0.32.0", - "grammar-selector": "0.49.2", - "image-view": "0.61.0", - "incompatible-packages": "0.27.0", - "keybinding-resolver": "0.36.1", - "line-ending-selector": "0.6.1", + "grammar-selector": "0.49.3", + "image-view": "0.61.1", + "incompatible-packages": "0.27.1", + "keybinding-resolver": "0.36.3", + "line-ending-selector": "0.6.2", "link": "0.31.2", "markdown-preview": "0.159.7", "metrics": "1.2.1", @@ -130,15 +130,15 @@ "package-generator": "1.1.0", "settings-view": "0.247.2", "snippets": "1.0.5", - "spell-check": "0.71.0", + "spell-check": "0.71.1", "status-bar": "1.8.1", - "styleguide": "0.49.2", + "styleguide": "0.49.3", "symbols-view": "0.114.0", "tabs": "0.104.1", "timecop": "0.36.0", "tree-view": "0.214.1", "update-package-dependencies": "0.10.0", - "welcome": "0.36.1", + "welcome": "0.36.2", "whitespace": "0.36.2", "wrap-guide": "0.39.1", "language-c": "0.56.0",