From abe5af2168b1df3e6c598d6284d5c341ddfc1a23 Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Wed, 17 Jan 2018 18:26:35 -0500 Subject: [PATCH 01/14] :memo: [ci skip] --- src/scope-descriptor.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scope-descriptor.coffee b/src/scope-descriptor.coffee index 3990d12a8..f1070f277 100644 --- a/src/scope-descriptor.coffee +++ b/src/scope-descriptor.coffee @@ -2,7 +2,7 @@ # root of the syntax tree to a token including _all_ scope names for the entire # path. # -# Methods that take a `ScopeDescriptor` will also accept an {Array} of {Strings} +# Methods that take a `ScopeDescriptor` will also accept an {Array} of {String} # scope names e.g. `['.source.js']`. # # You can use `ScopeDescriptor`s to get language-specific config settings via From 9a3585fc440652a503704e00add99613f79118ec Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 17 Jan 2018 15:37:12 -0800 Subject: [PATCH 02/14] :arrow-up: electron-winstaller --- script/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/package.json b/script/package.json index 1729fe8ce..afc034df3 100644 --- a/script/package.json +++ b/script/package.json @@ -12,7 +12,7 @@ "electron-link": "0.1.2", "electron-mksnapshot": "~1.7", "electron-packager": "7.3.0", - "electron-winstaller": "2.6.3", + "electron-winstaller": "2.6.4", "fs-admin": "^0.1.5", "fs-extra": "0.30.0", "glob": "7.0.3", From 83c28b49a0f3acedadc401d200a594cc4b376d2d Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 17 Jan 2018 13:26:52 -0800 Subject: [PATCH 03/14] :arrow_up: text-buffer, find-and-replace --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 26c077ee6..ef773bee8 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "service-hub": "^0.7.4", "sinon": "1.17.4", "temp": "^0.8.3", - "text-buffer": "13.11.4", + "text-buffer": "13.11.5", "tree-sitter": "^0.8.6", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", @@ -108,7 +108,7 @@ "dev-live-reload": "0.48.1", "encoding-selector": "0.23.8", "exception-reporting": "0.42.0", - "find-and-replace": "0.215.2", + "find-and-replace": "0.215.3", "fuzzy-finder": "1.7.5", "github": "0.9.1", "git-diff": "1.3.7", From 09751855b567d2a92c83933d8187c821c11272d4 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 17 Jan 2018 17:17:06 -0800 Subject: [PATCH 04/14] :arrow_up: git-diff --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef773bee8..72153fb27 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "find-and-replace": "0.215.3", "fuzzy-finder": "1.7.5", "github": "0.9.1", - "git-diff": "1.3.7", + "git-diff": "1.3.8", "go-to-line": "0.32.1", "grammar-selector": "0.49.9", "image-view": "0.62.4", From ca71d581036ed093dd2df964fcc9bec0b5f7ff0d Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Wed, 17 Jan 2018 23:17:16 -0500 Subject: [PATCH 05/14] :memo: `[ci skip]` must be in the title for Appveyor --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dceaecddb..4d01f82df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -230,7 +230,7 @@ Atom Core and all packages can be developed locally. For instructions on how to * Use the imperative mood ("Move cursor to..." not "Moves cursor to...") * Limit the first line to 72 characters or less * Reference issues and pull requests liberally after the first line -* When only changing documentation, include `[ci skip]` in the commit description +* When only changing documentation, include `[ci skip]` in the commit title * Consider starting the commit message with an applicable emoji: * :art: `:art:` when improving the format/structure of the code * :racehorse: `:racehorse:` when improving performance From 56600efc129ad59a3f29f20881e11a36432b9014 Mon Sep 17 00:00:00 2001 From: Ricky Dam Date: Thu, 18 Jan 2018 00:27:06 -0500 Subject: [PATCH 06/14] Fix filename backtick inconsistency and fix wording in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8078c179b..0c10b1352 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Atom will automatically update when a new release is available. ### Windows -Download the latest [Atom installer](https://github.com/atom/atom/releases/latest). AtomSetup.exe is 32-bit, AtomSetup-x64.exe for 64-bit systems. +Download the latest [Atom installer](https://github.com/atom/atom/releases/latest). `AtomSetup.exe` is 32-bit. For 64-bit systems, download `AtomSetup-x64.exe`. Atom will automatically update when a new release is available. From 86b2565bfea031e63402ae33d15f38004cdf65e4 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Thu, 18 Jan 2018 09:40:07 -0700 Subject: [PATCH 07/14] :arrow_up: git-diff --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72153fb27..3ee2b344b 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "find-and-replace": "0.215.3", "fuzzy-finder": "1.7.5", "github": "0.9.1", - "git-diff": "1.3.8", + "git-diff": "1.3.9", "go-to-line": "0.32.1", "grammar-selector": "0.49.9", "image-view": "0.62.4", From a4e011d3b8550c08bd66ac2d19346d7eae650bac Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 18 Jan 2018 09:38:30 -0800 Subject: [PATCH 08/14] Fix foldBufferRow regression --- spec/text-mate-language-mode-spec.js | 14 ++++++++++++++ src/text-mate-language-mode.js | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/spec/text-mate-language-mode-spec.js b/spec/text-mate-language-mode-spec.js index 2d02348cb..c6292a63b 100644 --- a/spec/text-mate-language-mode-spec.js +++ b/spec/text-mate-language-mode-spec.js @@ -912,6 +912,20 @@ describe('TextMateLanguageMode', () => { } `) + range = languageMode.getFoldableRangeContainingPoint(Point(7, 0), 2) + expect(simulateFold([range])).toBe(dedent ` + if (a) { + b(); + if (c) {⋯ + } + h() + } + i() + if (j) { + k() + } + `) + range = languageMode.getFoldableRangeContainingPoint(Point(1, Infinity), 2) expect(simulateFold([range])).toBe(dedent ` if (a) {⋯ diff --git a/src/text-mate-language-mode.js b/src/text-mate-language-mode.js index 1a7cb6d2e..152636ab7 100644 --- a/src/text-mate-language-mode.js +++ b/src/text-mate-language-mode.js @@ -605,7 +605,7 @@ class TextMateLanguageMode { for (let row = point.row - 1; row >= 0; row--) { const endRow = this.endRowForFoldAtRow(row, tabLength) - if (endRow != null && endRow > point.row) { + if (endRow != null && endRow >= point.row) { return Range(Point(row, Infinity), Point(endRow, Infinity)) } } From 0d99be88bc064736d794d2bc419cfec959f0b394 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Thu, 18 Jan 2018 10:51:16 -0700 Subject: [PATCH 09/14] :arrow_up: autocomplete-snippets Signed-off-by: Antonio Scandurra --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ee2b344b..d0116f407 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "autocomplete-css": "0.17.5", "autocomplete-html": "0.8.4", "autocomplete-plus": "2.40.2", - "autocomplete-snippets": "1.11.2", + "autocomplete-snippets": "1.12.0", "autoflow": "0.29.3", "autosave": "0.24.6", "background-tips": "0.27.1", From f0056426ca0f18fda59e19f2756e9f9f52b5d80d Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Thu, 18 Jan 2018 11:04:14 -0700 Subject: [PATCH 10/14] :arrow_up: find-and-replace Signed-off-by: Antonio Scandurra --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d0116f407..d0d1f25f5 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "dev-live-reload": "0.48.1", "encoding-selector": "0.23.8", "exception-reporting": "0.42.0", - "find-and-replace": "0.215.3", + "find-and-replace": "0.215.4", "fuzzy-finder": "1.7.5", "github": "0.9.1", "git-diff": "1.3.9", From eedfce83281a586b2f1a15a05382f0bf730497a3 Mon Sep 17 00:00:00 2001 From: Bryant Ung Date: Thu, 18 Jan 2018 15:48:48 -0800 Subject: [PATCH 11/14] :arrow_up: bracket-matcher --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d0d1f25f5..008acdc0e 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "autosave": "0.24.6", "background-tips": "0.27.1", "bookmarks": "0.45.1", - "bracket-matcher": "0.88.3", + "bracket-matcher": "0.89.0", "command-palette": "0.43.0", "dalek": "0.2.1", "deprecation-cop": "0.56.9", From 1b2e135123070af7c4850932f7f67edec63fbf57 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 18 Jan 2018 16:05:28 -0800 Subject: [PATCH 12/14] :arrow_up: git-utils --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 008acdc0e..242dbf0e7 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "fs-plus": "^3.0.1", "fstream": "0.1.24", "fuzzaldrin": "^2.1", - "git-utils": "5.2.0", + "git-utils": "5.2.1", "glob": "^7.1.1", "grim": "1.5.0", "jasmine-json": "~0.0", From 6a4991eb4515fe6914e0ef29d4157ebe9da80340 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 18 Jan 2018 17:03:08 -0800 Subject: [PATCH 13/14] Remove obsolete .pairs file --- .pairs | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .pairs diff --git a/.pairs b/.pairs deleted file mode 100644 index 295531028..000000000 --- a/.pairs +++ /dev/null @@ -1,17 +0,0 @@ -pairs: - ns: Nathan Sobo; nathan - cj: Corey Johnson; cj - dg: David Graham; dgraham - ks: Kevin Sawicki; kevin - jc: Jerry Cheung; jerry - bl: Brian Lopez; brian - jp: Justin Palmer; justin - gt: Garen Torikian; garen - mc: Matt Colyer; mcolyer - bo: Ben Ogle; benogle - jr: Jason Rudolph; jasonrudolph - jl: Jessica Lord; jlord - dh: Daniel Hengeveld; danielh -email: - domain: github.com -#global: true From 08d5677ddc85b9635327e3d5a9f5cd5b03881386 Mon Sep 17 00:00:00 2001 From: simurai Date: Fri, 19 Jan 2018 16:10:20 +0900 Subject: [PATCH 14/14] :arrow_up: find-and-replace@v0.215.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 242dbf0e7..974a9ab95 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "dev-live-reload": "0.48.1", "encoding-selector": "0.23.8", "exception-reporting": "0.42.0", - "find-and-replace": "0.215.4", + "find-and-replace": "0.215.5", "fuzzy-finder": "1.7.5", "github": "0.9.1", "git-diff": "1.3.9",