github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-22 21:38:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change tabText to tabLength

Browse Source
This commit is contained in:
Corey Johnson
2012-10-11 10:25:04 -07:00
committed by Corey Johnson & Nathan Sobo
parent 1d46b63977
commit e2a917fcf3
16 changed files with 72 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/benchmark-suite.coffee
View File

@@ -91,7 +91,7 @@ describe "TokenizedBuffer.", ->
{ languageMode, buffer } = editSession
benchmark "construction", 20, ->
new TokenizedBuffer(buffer, { languageMode, tabText: ' '})
new TokenizedBuffer(buffer, { languageMode, tabLength: 2})
describe "OnigRegExp.", ->
[regexes, line] = []

12
spec/app/display-buffer-spec.coffee
View File

@@ -2,10 +2,10 @@ DisplayBuffer = require 'display-buffer'
Buffer = require 'buffer'
describe "DisplayBuffer", ->
[editSession, displayBuffer, buffer, changeHandler, tabText] = []
[editSession, displayBuffer, buffer, changeHandler, tabLength] = []
beforeEach ->
tabText = ' '
editSession = fixturesProject.buildEditSessionForPath('sample.js', { tabText })
tabLength = 2
editSession = fixturesProject.buildEditSessionForPath('sample.js', { tabLength })
{ buffer, displayBuffer } = editSession
changeHandler = jasmine.createSpy 'changeHandler'
displayBuffer.on 'change', changeHandler
@@ -636,14 +636,14 @@ describe "DisplayBuffer", ->
buffer.insert([0, 0], '\t')
expect(displayBuffer.clipScreenPosition([0, 0])).toEqual [0, 0]
expect(displayBuffer.clipScreenPosition([0, 1])).toEqual [0, 0]
expect(displayBuffer.clipScreenPosition([0, tabText.length])).toEqual [0, tabText.length]
expect(displayBuffer.clipScreenPosition([0, tabLength])).toEqual [0, tabLength]
describe "when skipAtomicTokens is true", ->
it "clips screen positions in the middle of atomic tab characters to the end of the character", ->
buffer.insert([0, 0], '\t')
expect(displayBuffer.clipScreenPosition([0, 0], skipAtomicTokens: true)).toEqual [0, 0]
expect(displayBuffer.clipScreenPosition([0, 1], skipAtomicTokens: true)).toEqual [0, tabText.length]
expect(displayBuffer.clipScreenPosition([0, tabText.length], skipAtomicTokens: true)).toEqual [0, tabText.length]
expect(displayBuffer.clipScreenPosition([0, 1], skipAtomicTokens: true)).toEqual [0, tabLength]
expect(displayBuffer.clipScreenPosition([0, tabLength], skipAtomicTokens: true)).toEqual [0, tabLength]
describe ".maxLineLength()", ->
it "returns the length of the longest screen line", ->

41
spec/app/edit-session-spec.coffee
View File

@@ -1141,8 +1141,8 @@ describe "EditSession", ->
describe ".indent()", ->
describe "when nothing is selected", ->
describe "if 'softTabs' is true (the default)", ->
it "inserts the value of 'tabText' into the buffer", ->
tabRegex = new RegExp("^#{editSession.tabText}")
it "inserts 'tabLength' spaces into the buffer", ->
tabRegex = new RegExp("^[ ]{#{editSession.tabLength}}")
expect(buffer.lineForRow(0)).not.toMatch(tabRegex)
editSession.indent()
expect(buffer.lineForRow(0)).toMatch(tabRegex)
@@ -1151,7 +1151,7 @@ describe "EditSession", ->
describe "when the preceding line opens a new level of indentation", ->
it "increases the level of indentation by one", ->
buffer.insert([5, 0], " \n")
editSession.tabText = " "
editSession.tabLength = 2
editSession.setCursorBufferPosition [5, 2]
editSession.setAutoIndent(true)
editSession.indent()
@@ -1162,7 +1162,7 @@ describe "EditSession", ->
describe "when there are empty lines preceding the current line", ->
it "bases indentation on the first non-blank preceding line", ->
buffer.insert([5, 0], "\n\n\n \n")
editSession.tabText = " "
editSession.tabLength = 2
editSession.setCursorBufferPosition [8, 2]
editSession.setAutoIndent(true)
editSession.indent()
@@ -1172,7 +1172,7 @@ describe "EditSession", ->
it "properly indents the line", ->
buffer.insert([7, 0], " \n")
editSession.tabText = " "
editSession.tabLength = 2
editSession.setCursorBufferPosition [7, 2]
editSession.setAutoIndent(true)
editSession.indent()
@@ -1182,7 +1182,7 @@ describe "EditSession", ->
it "allows for additional indentation if the cursor is beyond the proper indentation point", ->
buffer.insert([7, 0], " \n")
editSession.tabText = " "
editSession.tabLength = 2
editSession.setCursorBufferPosition [7, 6]
editSession.setAutoIndent(true)
editSession.indent()
@@ -1197,12 +1197,12 @@ describe "EditSession", ->
editSession.indent()
expect(buffer.lineForRow(0)).toMatch(/^\t/)
expect(editSession.getCursorBufferPosition()).toEqual [0, 1]
expect(editSession.getCursorScreenPosition()).toEqual [0, editSession.tabText.length]
expect(editSession.getCursorScreenPosition()).toEqual [0, editSession.tabLength]
editSession.indent()
expect(buffer.lineForRow(0)).toMatch(/^\t\t/)
expect(editSession.getCursorBufferPosition()).toEqual [0, 2]
expect(editSession.getCursorScreenPosition()).toEqual [0, editSession.tabText.length * 2]
expect(editSession.getCursorScreenPosition()).toEqual [0, editSession.tabLength * 2]
describe "pasteboard operations", ->
pasteboard = null
@@ -1254,24 +1254,22 @@ describe "EditSession", ->
expect(buffer.lineForRow(1)).toBe " var first = function(items) {"
describe ".indentSelectedRows()", ->
tabLength = null
beforeEach ->
tabLength = editSession.tabText.length
editSession.tabLength = 2
describe "when nothing is selected", ->
it "indents line and retains selection", ->
editSession.setSelectedBufferRange([[0,3], [0,3]])
editSession.indentSelectedRows()
expect(buffer.lineForRow(0)).toBe "#{editSession.tabText}var quicksort = function () {"
expect(editSession.getSelectedBufferRange()).toEqual [[0, 3 + tabLength], [0, 3 + tabLength]]
expect(buffer.lineForRow(0)).toBe "#{editSession.getTabText()}var quicksort = function () {"
expect(editSession.getSelectedBufferRange()).toEqual [[0, 3 + editSession.tabLength], [0, 3 + editSession.tabLength]]
describe "when one line is selected", ->
it "indents line and retains selection", ->
editSession.setSelectedBufferRange([[0,4], [0,14]])
editSession.indentSelectedRows()
expect(buffer.lineForRow(0)).toBe "#{editSession.tabText}var quicksort = function () {"
expect(editSession.getSelectedBufferRange()).toEqual [[0, 4 + tabLength], [0, 14 + tabLength]]
expect(buffer.lineForRow(0)).toBe "#{editSession.getTabText()}var quicksort = function () {"
expect(editSession.getSelectedBufferRange()).toEqual [[0, 4 + editSession.tabLength], [0, 14 + editSession.tabLength]]
describe "when multiple lines are selected", ->
it "indents selected lines (that are not empty) and retains selection", ->
@@ -1280,28 +1278,25 @@ describe "EditSession", ->
expect(buffer.lineForRow(9)).toBe " };"
expect(buffer.lineForRow(10)).toBe ""
expect(buffer.lineForRow(11)).toBe " return sort(Array.apply(this, arguments));"
expect(editSession.getSelectedBufferRange()).toEqual [[9, 1 + tabLength], [11, 15 + tabLength]]
expect(editSession.getSelectedBufferRange()).toEqual [[9, 1 + editSession.tabLength], [11, 15 + editSession.tabLength]]
describe ".outdentSelectedRows()", ->
tabLength = null
beforeEach ->
editSession.tabText = " "
tabLength = editSession.tabText.length
editSession.tabLength = 2
describe "when nothing is selected", ->
it "outdents line and retains selection", ->
editSession.setSelectedBufferRange([[1,3], [1,3]])
editSession.outdentSelectedRows()
expect(buffer.lineForRow(1)).toBe "var sort = function(items) {"
expect(editSession.getSelectedBufferRange()).toEqual [[1, 3 - tabLength], [1, 3 - tabLength]]
expect(editSession.getSelectedBufferRange()).toEqual [[1, 3 - editSession.tabLength], [1, 3 - editSession.tabLength]]
describe "when one line is selected", ->
it "outdents line and retains editSession", ->
editSession.setSelectedBufferRange([[1,4], [1,14]])
editSession.outdentSelectedRows()
expect(buffer.lineForRow(1)).toBe "var sort = function(items) {"
expect(editSession.getSelectedBufferRange()).toEqual [[1, 4 - tabLength], [1, 14 - tabLength]]
expect(editSession.getSelectedBufferRange()).toEqual [[1, 4 - editSession.tabLength], [1, 14 - editSession.tabLength]]
describe "when multiple lines are selected", ->
it "outdents selected lines and retains editSession", ->
@@ -1310,7 +1305,7 @@ describe "EditSession", ->
expect(buffer.lineForRow(0)).toBe "var quicksort = function () {"
expect(buffer.lineForRow(1)).toBe "var sort = function(items) {"
expect(buffer.lineForRow(2)).toBe " if (items.length <= 1) return items;"
expect(editSession.getSelectedBufferRange()).toEqual [[0, 1], [3, 15 - tabLength]]
expect(editSession.getSelectedBufferRange()).toEqual [[0, 1], [3, 15 - editSession.tabLength]]
describe ".toggleLineCommentsInSelection()", ->
it "toggles comments on the selected lines", ->

1
spec/app/editor-spec.coffee
View File

@@ -1595,7 +1595,6 @@ describe "Editor", ->
expect(miniEditor.getCursorBufferPosition().row).toBe 0
expect(miniEditor.find('.line.cursor-line').length).toBe 0
describe "gutter line highlighting", ->
beforeEach ->
editor.attachToDom(heightInLines: 5.5)

5
spec/app/screen-line-spec.coffee
View File

@@ -3,11 +3,10 @@ Buffer = require 'buffer'
TokenizedBuffer = require 'tokenized-buffer'
describe "ScreenLine", ->
[editSession, buffer, tabText, screenLine, tokenizedBuffer] = []
[editSession, buffer, screenLine, tokenizedBuffer] = []
beforeEach ->
tabText = '••'
editSession = fixturesProject.buildEditSessionForPath('sample.js', { tabText } )
editSession = fixturesProject.buildEditSessionForPath('sample.js', { tabLength: 2 } )
{ buffer, tokenizedBuffer } = editSession
screenLine = tokenizedBuffer.lineForScreenRow(3)

2
spec/app/selection-spec.coffee
View File

@@ -7,7 +7,7 @@ describe "Selection", ->
beforeEach ->
buffer = new Buffer(require.resolve('fixtures/sample.js'))
editSession = new EditSession(buffer: buffer, tabText: ' ')
editSession = new EditSession(buffer: buffer, tabLength: 2)
selection = editSession.getSelection()
afterEach ->

3
spec/app/token-spec.coffee
View File

@@ -6,8 +6,7 @@ describe "Token", ->
[editSession, token] = []
beforeEach ->
tabText = ' '
editSession = fixturesProject.buildEditSessionForPath('sample.js')
editSession = fixturesProject.buildEditSessionForPath('sample.js', { tabLength: 2 })
{ tokenizedBuffer } = editSession
screenLine = tokenizedBuffer.lineForScreenRow(3)
token = _.last(screenLine.tokens)

12
spec/app/tokenized-buffer-spec.coffee
View File

@@ -151,25 +151,25 @@ describe "TokenizedBuffer", ->
expect(event.newRange).toEqual new Range([2, 0], [7, buffer.lineForRow(7).length])
describe "when the buffer contains tab characters", ->
tabText = ' '
editSession2 = null
beforeEach ->
editSession2 = fixturesProject.buildEditSessionForPath('sample-with-tabs.coffee', { tabText })
tabLength = 2
editSession2 = fixturesProject.buildEditSessionForPath('sample-with-tabs.coffee', { tabLength })
{ buffer, tokenizedBuffer } = editSession2
afterEach ->
editSession2.destroy()
it "always renders each tab as its own atomic token containing tabText", ->
it "always renders each tab as its own atomic token with a value of size tabLength", ->
screenLine0 = tokenizedBuffer.lineForScreenRow(0)
expect(screenLine0.text).toBe "# Econ 101#{tabText}"
expect(screenLine0.text).toBe "# Econ 101#{editSession2.getTabText()}"
{ tokens } = screenLine0
expect(tokens.length).toBe 3
expect(tokens[0].value).toBe "#"
expect(tokens[1].value).toBe " Econ 101"
expect(tokens[2].value).toBe tabText
expect(tokens[2].value).toBe editSession2.getTabText()
expect(tokens[2].scopes).toEqual tokens[1].scopes
expect(tokens[2].isAtomic).toBeTruthy()
expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "#{tabText} buy()#{tabText}while supply > demand"
expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "#{editSession2.getTabText()} buy()#{editSession2.getTabText()}while supply > demand"

1
src/app/display-buffer.coffee
View File

@@ -20,7 +20,6 @@ class DisplayBuffer
constructor: (@buffer, options={}) ->
@id = @constructor.idCounter++
options.tabText ?= ' '
@languageMode = options.languageMode
@tokenizedBuffer = new TokenizedBuffer(@buffer, options)
@softWrapColumn = options.softWrapColumn ? Infinity

9
src/app/edit-session.coffee
View File

@@ -37,12 +37,13 @@ class EditSession
autoIndent: false # TODO: re-enabled auto-indent after fixing the rest of tokenization
softTabs: true
softWrap: false
tabLength: null
constructor: ({@project, @buffer, @tabText, @autoIndent, @softTabs, @softWrap}) ->
constructor: ({@project, @buffer, @tabLength, @autoIndent, @softTabs, @softWrap}) ->
@id = @constructor.idCounter++
@softTabs ?= true
@languageMode = new LanguageMode(this, @buffer.getExtension())
@displayBuffer = new DisplayBuffer(@buffer, { @languageMode, @tabText })
@displayBuffer = new DisplayBuffer(@buffer, { @languageMode, @tabLength })
@tokenizedBuffer = @displayBuffer.tokenizedBuffer
@anchors = []
@anchorRanges = []
@@ -106,6 +107,8 @@ class EditSession
getSoftWrap: -> @softWrap
setSoftWrap: (@softWrap) ->
getTabText: -> new Array(@tabLength + 1).join(" ")
clipBufferPosition: (bufferPosition) ->
@buffer.clipPosition(bufferPosition)
@@ -149,7 +152,7 @@ class EditSession
currentRow = @getCursorBufferPosition().row
if @getSelection().isEmpty()
if @softTabs
@insertText(@tabText)
@insertText(@getTabText())
else
@insertText('\t')
else

14
src/app/editor.coffee
View File

@@ -69,7 +69,7 @@ class Editor extends View
editSession = new EditSession
buffer: new Buffer()
softWrap: false
tabText: " "
tabLength: 2
autoIndent: false
softTabs: true
@@ -878,16 +878,8 @@ class Editor extends View
else
for token in screenLine.tokens
updateScopeStack(token.scopes)
line.push(
token.value
.replace(/&/g, '&amp;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
)
line.push("</pre>")
line.push(token.escapeValue())
line.push('</pre>')
line.join('')
insertLineElements: (row, lineElements) ->

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

@@ -104,7 +104,7 @@ class LanguageMode
currentIndentation = @buffer.indentationForRow(bufferRow)
desiredIndentation = @buffer.indentationForRow(precedingRow)
desiredIndentation += @editSession.tabText.length if increaseIndentPattern.test(precedingLine)
desiredIndentation += @editSession.tabLength if increaseIndentPattern.test(precedingLine)
if desiredIndentation > currentIndentation
@buffer.setIndentationForRow(bufferRow, desiredIndentation)
@@ -122,7 +122,7 @@ class LanguageMode
precedingLine = @buffer.lineForRow(precedingRow)
desiredIndentation = @buffer.indentationForRow(precedingRow)
desiredIndentation -= @editSession.tabText.length unless increaseIndentPattern.test(precedingLine)
desiredIndentation -= @editSession.tabLength unless increaseIndentPattern.test(precedingLine)
if desiredIndentation < currentIndentation
@buffer.setIndentationForRow(bufferRow, desiredIndentation)

12
src/app/project.coffee
View File

@@ -10,10 +10,11 @@ ChildProcess = require 'child-process'
module.exports =
class Project
tabText: ' '
tabLength: 2
autoIndent: true
softTabs: true
softWrap: false
showInvisibles: false
rootDirectory: null
editSessions: null
ignoredPathRegexes: null
@@ -101,9 +102,6 @@ class Project
relativize: (fullPath) ->
fullPath.replace(@getPath(), "").replace(/^\//, '')
getTabText: -> @tabText
setTabText: (@tabText) ->
getAutoIndent: -> @autoIndent
setAutoIndent: (@autoIndent) ->
@@ -113,6 +111,9 @@ class Project
getSoftWrap: -> @softWrap
setSoftWrap: (@softWrap) ->
getShowInvisibles: -> @showInvisibles
setShowInvisibles: (@showInvisibles) ->
buildEditSessionForPath: (filePath, editSessionOptions={}) ->
@buildEditSession(@bufferForPath(filePath), editSessionOptions)
@@ -126,10 +127,11 @@ class Project
editSession
defaultEditSessionOptions: ->
tabText: @getTabText()
tabLength: @tabLength
autoIndent: @getAutoIndent()
softTabs: @getSoftTabs()
softWrap: @getSoftWrap()
showInvisibles: @getShowInvisibles()
getEditSessions: ->
new Array(@editSessions...)

6
src/app/selection.coffee
View File

@@ -208,15 +208,15 @@ class Selection
indentSelectedRows: ->
range = @getBufferRange()
for row in [range.start.row..range.end.row]
@editSession.buffer.insert([row, 0], @editSession.tabText) unless @editSession.buffer.lineLengthForRow(row) == 0
@editSession.buffer.insert([row, 0], @editSession.getTabText()) unless @editSession.buffer.lineLengthForRow(row) == 0
outdentSelectedRows: ->
range = @getBufferRange()
buffer = @editSession.buffer
leadingTabRegex = new RegExp("^#{@editSession.tabText}")
leadingTabRegex = new RegExp("^#{@editSession.getTabText()}")
for row in [range.start.row..range.end.row]
if leadingTabRegex.test buffer.lineForRow(row)
buffer.delete [[row, 0], [row, @editSession.tabText.length]]
buffer.delete [[row, 0], [row, @editSession.tabLength]]
toggleLineComments: ->
@modifySelection =>

15
src/app/token.coffee
View File

@@ -21,14 +21,23 @@ class Token
value2 = @value.substring(splitIndex)
[new Token(value: value1, scopes: @scopes), new Token(value: value2, scopes: @scopes)]
breakOutTabCharacters: (tabText) ->
breakOutTabCharacters: (tabLength) ->
return [this] unless /\t/.test(@value)
for substring in @value.match(/([^\t]+|\t)/g)
if substring == '\t'
@buildTabToken(tabText)
@buildTabToken(tabLength)
else
new Token(value: substring, scopes: @scopes)
buildTabToken: (tabText) ->
buildTabToken: (tabLength) ->
tabText = new Array(tabLength + 1).join(" ")
new Token(value: tabText, scopes: @scopes, bufferDelta: 1, isAtomic: true)
escapeValue: ->
@value
.replace(/&/g, '&amp;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')

6
src/app/tokenized-buffer.coffee
View File

@@ -10,11 +10,13 @@ class TokenizedBuffer
@idCounter: 1
languageMode: null
tabLength: null
buffer: null
aceAdaptor: null
screenLines: null
constructor: (@buffer, { @languageMode, @tabText }) ->
constructor: (@buffer, { @languageMode, @tabLength }) ->
@tabLength ?= 2
@languageMode.tokenizedBuffer = this
@id = @constructor.idCounter++
@screenLines = @buildScreenLinesForRows(0, @buffer.getLastRow())
@@ -64,7 +66,7 @@ class TokenizedBuffer
tokenObjects = []
for tokenProperties in tokens
token = new Token(tokenProperties)
tokenObjects.push(token.breakOutTabCharacters(@tabText)...)
tokenObjects.push(token.breakOutTabCharacters(@tabLength)...)
text = _.pluck(tokenObjects, 'value').join('')
new ScreenLine(tokenObjects, text, [1, 0], [1, 0], { stack })