diff --git a/spec/language-mode-spec.coffee b/spec/language-mode-spec.coffee index 8ec9da20c..2de3b4842 100644 --- a/spec/language-mode-spec.coffee +++ b/spec/language-mode-spec.coffee @@ -45,12 +45,12 @@ describe "LanguageMode", -> expect(buffer.lineForRow(0)).toBe " // var i;" describe "fold suggestion", -> - describe ".doesBufferRowStartFold(bufferRow)", -> + describe ".isBufferRowStartOfFold(bufferRow)", -> it "returns true only when the buffer row starts a foldable region", -> - expect(languageMode.doesBufferRowStartFold(0)).toBeTruthy() - expect(languageMode.doesBufferRowStartFold(1)).toBeTruthy() - expect(languageMode.doesBufferRowStartFold(2)).toBeFalsy() - expect(languageMode.doesBufferRowStartFold(3)).toBeFalsy() + expect(languageMode.isBufferRowStartOfFold(0)).toBeTruthy() + expect(languageMode.isBufferRowStartOfFold(1)).toBeTruthy() + expect(languageMode.isBufferRowStartOfFold(2)).toBeFalsy() + expect(languageMode.isBufferRowStartOfFold(3)).toBeFalsy() describe ".rowRangeForCodeFoldAtBufferRow(bufferRow)", -> it "returns the start/end rows of the foldable region starting at the given row", -> @@ -139,13 +139,13 @@ describe "LanguageMode", -> expect(buffer.lineForRow(7)).toBe " # " describe "fold suggestion", -> - describe ".doesBufferRowStartFold(bufferRow)", -> + describe ".isBufferRowStartOfFold(bufferRow)", -> it "returns true only when the buffer row starts a foldable region", -> - expect(languageMode.doesBufferRowStartFold(0)).toBeTruthy() - expect(languageMode.doesBufferRowStartFold(1)).toBeTruthy() - expect(languageMode.doesBufferRowStartFold(2)).toBeFalsy() - expect(languageMode.doesBufferRowStartFold(3)).toBeFalsy() - expect(languageMode.doesBufferRowStartFold(19)).toBeTruthy() + expect(languageMode.isBufferRowStartOfFold(0)).toBeTruthy() + expect(languageMode.isBufferRowStartOfFold(1)).toBeTruthy() + expect(languageMode.isBufferRowStartOfFold(2)).toBeFalsy() + expect(languageMode.isBufferRowStartOfFold(3)).toBeFalsy() + expect(languageMode.isBufferRowStartOfFold(19)).toBeTruthy() describe ".rowRangeForCodeFoldAtBufferRow(bufferRow)", -> it "returns the start/end rows of the foldable region starting at the given row", -> diff --git a/src/language-mode.coffee b/src/language-mode.coffee index 426526185..6e3e4a35f 100644 --- a/src/language-mode.coffee +++ b/src/language-mode.coffee @@ -162,7 +162,7 @@ class LanguageMode return [startRow, endRow] if startRow isnt endRow rowRangeForCodeFoldAtBufferRow: (bufferRow) -> - return null unless @doesBufferRowStartFold(bufferRow) + return null unless @isBufferRowFoldable(bufferRow) startIndentLevel = @editor.indentationForBufferRow(bufferRow) scopes = @editor.scopesForBufferPosition([bufferRow, 0]) @@ -178,7 +178,7 @@ class LanguageMode [bufferRow, foldEndRow] - doesBufferRowStartFold: (bufferRow) -> + isBufferRowFoldable: (bufferRow) -> return false if @editor.isBufferRowBlank(bufferRow) nextNonEmptyRow = @editor.nextNonBlankBufferRow(bufferRow) return false unless nextNonEmptyRow?