From 5e21d1ca5b9004360b396cffd319b8676ddcff47 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Wed, 3 Sep 2014 14:03:04 -0700 Subject: [PATCH] Deprecate Editor::lineLengthForBufferRow --- benchmark/benchmark-suite.coffee | 2 +- src/editor.coffee | 6 ++++-- src/language-mode.coffee | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/benchmark/benchmark-suite.coffee b/benchmark/benchmark-suite.coffee index 2984c007e1f..c608119858a 100644 --- a/benchmark/benchmark-suite.coffee +++ b/benchmark/benchmark-suite.coffee @@ -103,7 +103,7 @@ describe "editorView.", -> benchmark "cache-entire-visible-area", 100, -> for i in [firstRow..lastRow] line = editorView.lineElementForScreenRow(i)[0] - editorView.positionLeftForLineAndColumn(line, i, Math.max(0, editorView.lineLengthForBufferRow(i))) + editorView.positionLeftForLineAndColumn(line, i, Math.max(0, editorView.getModel().lineTextForBufferRow(i).length)) describe "text-rendering.", -> beforeEach -> diff --git a/src/editor.coffee b/src/editor.coffee index 7f78610cbff..8ce5c6de4bc 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -434,11 +434,13 @@ class Editor extends Model deprecate "Use Editor::tokenizedLinesForScreenRows instead" @tokenizedLinesForScreenRows(start, end) - # Public: Returns a {Number} representing the line length for the given + # Returns a {Number} representing the line length for the given # buffer row, exclusive of its line-ending character(s). # # * `row` A {Number} indicating the buffer row. - lineLengthForBufferRow: (row) -> @buffer.lineLengthForRow(row) + lineLengthForBufferRow: (row) -> + deprecate "Use editor.lineTextForBufferRow(row).length instead" + @lineTextForBufferRow(row).length bufferRowForScreenRow: (row) -> @displayBuffer.bufferRowForScreenRow(row) diff --git a/src/language-mode.coffee b/src/language-mode.coffee index b224fd631e4..de1a5b92874 100644 --- a/src/language-mode.coffee +++ b/src/language-mode.coffee @@ -230,7 +230,7 @@ class LanguageMode break unless /\w/.test(@editor.lineTextForBufferRow(endRow + 1)) endRow++ - new Range([startRow, 0], [endRow, @editor.lineLengthForBufferRow(endRow)]) + new Range([startRow, 0], [endRow, @editor.lineTextForBufferRow(endRow).length]) # Given a buffer row, this returns a suggested indentation level. #