github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 14:28:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into as-tiled-gutter

Browse Source
This commit is contained in:
Antonio Scandurra
2015-06-30 14:40:44 +02:00
parent 4af7f1e29d b580012173
commit 8cd9128bec
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spec/text-editor-spec.coffee
View File

@@ -2943,6 +2943,20 @@ describe "TextEditor", ->
expect(editor.lineTextForBufferRow(7)).toBe " c(x);"
expect(editor.lineTextForBufferRow(8)).toBe " current = items.shift();"
it "auto-indents lines with a mix of hard tabs and spaces without removing spaces", ->
editor.setSoftTabs(false)
expect(editor.indentationForBufferRow(5)).toBe(3)
atom.clipboard.write("/**\n\t * testing\n\t * indent\n\t **/\n", indentBasis: 1)
editor.setCursorBufferPosition([5, 0])
editor.pasteText()
# Do not lose the alignment spaces
expect(editor.lineTextForBufferRow(5)).toBe("\t\t\t/**")
expect(editor.lineTextForBufferRow(6)).toBe("\t\t\t * testing")
expect(editor.lineTextForBufferRow(7)).toBe("\t\t\t * indent")
expect(editor.lineTextForBufferRow(8)).toBe("\t\t\t **/")
describe "when pasting a single line of text", ->
it "does not auto-indent the text", ->
atom.clipboard.write("a(x);", indentBasis: 0)
@@ -3692,11 +3706,12 @@ describe "TextEditor", ->
it "returns the indent level when the line has only leading tabs", ->
expect(editor.indentLevelForLine("\t\thello")).toBe(2)
it "returns the indent level when the line has mixed leading whitespace and tabs", ->
expect(editor.indentLevelForLine("\t hello")).toBe(2)
expect(editor.indentLevelForLine(" \thello")).toBe(2)
expect(editor.indentLevelForLine(" \t hello")).toBe(2.5)
expect(editor.indentLevelForLine(" \t \thello")).toBe(3.5)
it "returns the indent level based on the character starting the line when the leading whitespace contains both spaces and tabs", ->
expect(editor.indentLevelForLine("\t hello")).toBe(1)
expect(editor.indentLevelForLine(" \thello")).toBe(1)
expect(editor.indentLevelForLine(" \t hello")).toBe(1)
expect(editor.indentLevelForLine(" \t \thello")).toBe(2)
expect(editor.indentLevelForLine(" \t \thello")).toBe(2.5)
describe "when the buffer is reloaded", ->
it "preserves the current cursor position", ->

2
src/selection.coffee
View File

@@ -622,7 +622,7 @@ class Selection extends Model
else
currentIndentLevel = @editor.indentLevelForLine(lines[i])
indentLevel = Math.max(0, currentIndentLevel + indentAdjustment)
lines[i] = line.replace(/^[\t ]+/, @editor.buildIndentString(indentLevel))
lines[i] = line.replace(/^(\t+| +)/, @editor.buildIndentString(indentLevel))
return
# Indent the current line(s).

9
src/tokenized-buffer.coffee
View File

@@ -411,11 +411,10 @@ class TokenizedBuffer extends Model
@indentLevelForLine(line)
indentLevelForLine: (line) ->
if match = line.match(/^[\t ]+/)
leadingWhitespace = match[0]
tabCount = leadingWhitespace.match(/\t/g)?.length ? 0
spaceCount = leadingWhitespace.match(/[ ]/g)?.length ? 0
tabCount + (spaceCount / @getTabLength())
if match = line.match(/^\t+/)
match[0].length
else if match = line.match(/^ +/)
match[0].length / @getTabLength()
else
0