Merge branch 'master' of github.com:atom/atom into fb-pw-decaffeinate-config

.pairs

@@ -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

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

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.
 

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",
@@ -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",
@@ -96,22 +96,22 @@
     "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",
     "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",
     "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.5",
     "fuzzy-finder": "1.7.5",
     "github": "0.9.1",
-    "git-diff": "1.3.7",
+    "git-diff": "1.3.9",
     "go-to-line": "0.32.1",
     "grammar-selector": "0.49.9",
     "image-view": "0.62.4",

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",

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) {⋯

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

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))
       }
     }