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

This commit is contained in:
Philip Weiss
2018-01-19 11:26:53 -08:00
8 changed files with 25 additions and 28 deletions

View File

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

View File

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