mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-20 23:48:05 +03:00
calcMinIndent -> minIndentLevelForRowRange
This commit is contained in:
parent
90e53ad3e2
commit
365e5e8413
@ -2,7 +2,7 @@ Project = require 'project'
|
|||||||
Buffer = require 'text-buffer'
|
Buffer = require 'text-buffer'
|
||||||
EditSession = require 'edit-session'
|
EditSession = require 'edit-session'
|
||||||
|
|
||||||
describe "LanguageMode", ->
|
fdescribe "LanguageMode", ->
|
||||||
[editSession, buffer, languageMode] = []
|
[editSession, buffer, languageMode] = []
|
||||||
|
|
||||||
afterEach ->
|
afterEach ->
|
||||||
@ -14,11 +14,11 @@ describe "LanguageMode", ->
|
|||||||
editSession = project.open('sample.js', autoIndent: false)
|
editSession = project.open('sample.js', autoIndent: false)
|
||||||
{buffer, languageMode} = editSession
|
{buffer, languageMode} = editSession
|
||||||
|
|
||||||
describe ".calcMinIndent(startRow, endRow)", ->
|
describe ".minIndentLevelForRowRange(startRow, endRow)", ->
|
||||||
it "returns indent levels for ranges", ->
|
it "returns indent levels for ranges", ->
|
||||||
expect(languageMode.calcMinIndent(4, 7)).toBe 2
|
expect(languageMode.minIndentLevelForRowRange(4, 7)).toBe 2
|
||||||
expect(languageMode.calcMinIndent(5, 7)).toBe 2
|
expect(languageMode.minIndentLevelForRowRange(5, 7)).toBe 2
|
||||||
expect(languageMode.calcMinIndent(5, 6)).toBe 3
|
expect(languageMode.minIndentLevelForRowRange(5, 6)).toBe 3
|
||||||
|
|
||||||
describe ".toggleLineCommentsForBufferRows(start, end)", ->
|
describe ".toggleLineCommentsForBufferRows(start, end)", ->
|
||||||
it "comments/uncomments lines in the given range", ->
|
it "comments/uncomments lines in the given range", ->
|
||||||
@ -62,10 +62,10 @@ describe "LanguageMode", ->
|
|||||||
editSession = project.open('coffee.coffee', autoIndent: false)
|
editSession = project.open('coffee.coffee', autoIndent: false)
|
||||||
{buffer, languageMode} = editSession
|
{buffer, languageMode} = editSession
|
||||||
|
|
||||||
describe ".calcMinIndent(startRow, endRow)", ->
|
describe ".minIndentLevelForRowRange(startRow, endRow)", ->
|
||||||
it "returns indent levels for ranges", ->
|
it "returns indent levels for ranges", ->
|
||||||
expect(languageMode.calcMinIndent(4, 6)).toBe 2
|
expect(languageMode.minIndentLevelForRowRange(4, 6)).toBe 2
|
||||||
expect(languageMode.calcMinIndent(4, 7)).toBe 2
|
expect(languageMode.minIndentLevelForRowRange(4, 7)).toBe 2
|
||||||
|
|
||||||
describe ".toggleLineCommentsForBufferRows(start, end)", ->
|
describe ".toggleLineCommentsForBufferRows(start, end)", ->
|
||||||
it "comments/uncomments lines in the given range", ->
|
it "comments/uncomments lines in the given range", ->
|
||||||
|
@ -81,7 +81,7 @@ class LanguageMode
|
|||||||
columnEnd = columnStart + match[2].length
|
columnEnd = columnStart + match[2].length
|
||||||
buffer.change([[row, columnStart], [row, columnEnd]], "")
|
buffer.change([[row, columnStart], [row, columnEnd]], "")
|
||||||
else
|
else
|
||||||
indent = @calcMinIndent(start, end)
|
indent = @minIndentLevelForRowRange(start, end)
|
||||||
indentString = @editSession.buildIndentString(indent)
|
indentString = @editSession.buildIndentString(indent)
|
||||||
for row in [start..end]
|
for row in [start..end]
|
||||||
buffer.change(new Range([row, 0], [row, indentString.length]), indentString+commentStartString)
|
buffer.change(new Range([row, 0], [row, indentString.length]), indentString+commentStartString)
|
||||||
@ -188,7 +188,7 @@ class LanguageMode
|
|||||||
# endRow - The row {Number} to end at
|
# endRow - The row {Number} to end at
|
||||||
#
|
#
|
||||||
# Returns a {Number} of the indent level of the block of lines.
|
# Returns a {Number} of the indent level of the block of lines.
|
||||||
calcMinIndent: (startRow, endRow) ->
|
minIndentLevelForRowRange: (startRow, endRow) ->
|
||||||
buffer = @editSession.buffer
|
buffer = @editSession.buffer
|
||||||
indents = (@editSession.indentationForBufferRow(row) for row in [startRow..endRow] when buffer.lineForRow(row).trim())
|
indents = (@editSession.indentationForBufferRow(row) for row in [startRow..endRow] when buffer.lineForRow(row).trim())
|
||||||
Math.min(indents...)
|
Math.min(indents...)
|
||||||
|
Loading…
Reference in New Issue
Block a user