pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-09-20 15:37:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

calcMinIndent -> minIndentLevelForRowRange

Browse Source
This commit is contained in:
Ben Ogle 2013-07-17 17:35:05 -07:00
parent 90e53ad3e2
commit 365e5e8413
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spec/app/language-mode-spec.coffee
View File

@ -2,7 +2,7 @@ Project = require 'project'
Buffer = require 'text-buffer'
EditSession = require 'edit-session'
describe "LanguageMode", ->
fdescribe "LanguageMode", ->
[editSession, buffer, languageMode] = []
afterEach ->
@ -14,11 +14,11 @@ describe "LanguageMode", ->
editSession = project.open('sample.js', autoIndent: false)
{buffer, languageMode} = editSession
describe ".calcMinIndent(startRow, endRow)", ->
describe ".minIndentLevelForRowRange(startRow, endRow)", ->
it "returns indent levels for ranges", ->
expect(languageMode.calcMinIndent(4, 7)).toBe 2
expect(languageMode.calcMinIndent(5, 7)).toBe 2
expect(languageMode.calcMinIndent(5, 6)).toBe 3
expect(languageMode.minIndentLevelForRowRange(4, 7)).toBe 2
expect(languageMode.minIndentLevelForRowRange(5, 7)).toBe 2
expect(languageMode.minIndentLevelForRowRange(5, 6)).toBe 3
describe ".toggleLineCommentsForBufferRows(start, end)", ->
it "comments/uncomments lines in the given range", ->
@ -62,10 +62,10 @@ describe "LanguageMode", ->
editSession = project.open('coffee.coffee', autoIndent: false)
{buffer, languageMode} = editSession
describe ".calcMinIndent(startRow, endRow)", ->
describe ".minIndentLevelForRowRange(startRow, endRow)", ->
it "returns indent levels for ranges", ->
expect(languageMode.calcMinIndent(4, 6)).toBe 2
expect(languageMode.calcMinIndent(4, 7)).toBe 2
expect(languageMode.minIndentLevelForRowRange(4, 6)).toBe 2
expect(languageMode.minIndentLevelForRowRange(4, 7)).toBe 2
describe ".toggleLineCommentsForBufferRows(start, end)", ->
it "comments/uncomments lines in the given range", ->

4
src/app/language-mode.coffee
View File

@ -81,7 +81,7 @@ class LanguageMode
columnEnd = columnStart + match[2].length
buffer.change([[row, columnStart], [row, columnEnd]], "")
else
indent = @calcMinIndent(start, end)
indent = @minIndentLevelForRowRange(start, end)
indentString = @editSession.buildIndentString(indent)
for row in [start..end]
buffer.change(new Range([row, 0], [row, indentString.length]), indentString+commentStartString)
@ -188,7 +188,7 @@ class LanguageMode
# endRow - The row {Number} to end at
#
# Returns a {Number} of the indent level of the block of lines.
calcMinIndent: (startRow, endRow) ->
minIndentLevelForRowRange: (startRow, endRow) ->
buffer = @editSession.buffer
indents = (@editSession.indentationForBufferRow(row) for row in [startRow..endRow] when buffer.lineForRow(row).trim())
Math.min(indents...)