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

Adapt to first-mate returning purely numeric tag arrays

Browse Source
This commit is contained in:
Nathan Sobo
2015-05-08 20:57:46 +02:00
parent 9583ff04e6
commit 06b5d27357
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/tokenized-buffer.coffee
View File

@@ -284,7 +284,7 @@ class TokenizedBuffer extends Model
if (ruleStack or row is 0) and row < stopTokenizingAt
tokenizedLine = @buildTokenizedLineForRow(row, ruleStack, parentScopes)
ruleStack = tokenizedLine.ruleStack
parentScopes = @scopesFromContent(parentScopes, tokenizedLine.content)
parentScopes = @scopesFromTags(parentScopes, tokenizedLine.tags)
else
tokenizedLine = @buildPlaceholderTokenizedLineForRow(row, parentScopes)
tokenizedLine
@@ -299,23 +299,23 @@ class TokenizedBuffer extends Model
@buildPlaceholderTokenizedLineForRow(row) for row in [startRow..endRow]
buildPlaceholderTokenizedLineForRow: (row) ->
line = @buffer.lineForRow(row)
parentScopes = [@grammar.idForScope(@grammar.scopeName)]
content = [line]
text = @buffer.lineForRow(row)
tags = [text.length]
tabLength = @getTabLength()
indentLevel = @indentLevelForRow(row)
lineEnding = @buffer.lineEndingForRow(row)
new TokenizedLine({parentScopes, content, tabLength, indentLevel, @invisibles, lineEnding})
new TokenizedLine({parentScopes, text, tags, tabLength, indentLevel, @invisibles, lineEnding})
buildTokenizedLineForRow: (row, ruleStack, parentScopes) ->
@buildTokenizedLineForRowWithText(row, @buffer.lineForRow(row), ruleStack, parentScopes)
buildTokenizedLineForRowWithText: (row, line, ruleStack = @stackForRow(row - 1), parentScopes = @parentScopesForRow(row)) ->
buildTokenizedLineForRowWithText: (row, text, ruleStack = @stackForRow(row - 1), parentScopes = @parentScopesForRow(row)) ->
lineEnding = @buffer.lineEndingForRow(row)
tabLength = @getTabLength()
indentLevel = @indentLevelForRow(row)
{content, ruleStack} = @grammar.tokenizeLine(line, ruleStack, row is 0)
new TokenizedLine({parentScopes, content, ruleStack, tabLength, lineEnding, indentLevel, @invisibles})
{tags, ruleStack} = @grammar.tokenizeLine(text, ruleStack, row is 0)
new TokenizedLine({parentScopes, text, tags, ruleStack, tabLength, lineEnding, indentLevel, @invisibles})
tokenizedLineForRow: (bufferRow) ->
@tokenizedLines[bufferRow]
@@ -326,19 +326,20 @@ class TokenizedBuffer extends Model
parentScopesForRow: (bufferRow) ->
if bufferRow > 0
precedingLine = @tokenizedLines[bufferRow - 1]
@scopesFromContent(precedingLine.parentScopes, precedingLine.content)
@scopesFromTags(precedingLine.parentScopes, precedingLine.tags)
else
[]
scopesFromContent: (startingScopes, content) ->
scopesFromTags: (startingScopes, tags) ->
scopes = startingScopes.slice()
for symbol in content when typeof symbol is 'number'
if symbol > 0
scopes.push(symbol)
for tag in tags when tag < 0
if (tag % 2) is -1
scopes.push(tag)
else
popped = scopes.pop()
unless -popped is symbol
throw new Error("Encountered an invalid scope end id. Popped #{popped}, expected to pop #{-symbol}.")
expectedScope = tag + 1
poppedScope = scopes.pop()
unless poppedScope is expectedScope
throw new Error("Encountered an invalid scope end id. Popped #{poppedScope}, expected to pop #{expectedScope}.")
scopes
indentLevelForRow: (bufferRow) ->

9
src/tokenized-line.coffee
View File

@@ -15,10 +15,9 @@ class TokenizedLine
firstNonWhitespaceIndex: 0
foldable: false
constructor: ({@parentScopes, @content, @lineEnding, @ruleStack, @startBufferColumn, @fold, @tabLength, @indentLevel, @invisibles}) ->
constructor: ({@parentScopes, @text, @tags, @lineEnding, @ruleStack, @startBufferColumn, @fold, @tabLength, @indentLevel, @invisibles}) ->
@startBufferColumn ?= 0
# @tokens = @breakOutAtomicTokens(tokens)
@text = @buildText()
@bufferDelta = @buildBufferDelta()
@softWrapIndentationTokens = @getSoftWrapIndentationTokens()
@softWrapIndentationDelta = @buildSoftWrapIndentationDelta()
@@ -30,8 +29,10 @@ class TokenizedLine
@buildEndOfLineInvisibles() if @lineEnding?
Object.defineProperty @prototype, 'tokens', get: ->
tokens = atom.grammars.decodeContent(@parentScopes.concat(@content))
tokens.map (properties) -> new Token(properties)
tokens = atom.grammars.decodeContent(@text, @tags, @parentScopes.slice())
tokens.map (properties, index) =>
properties.isAtomic = true if @specialTokens[index] is SoftTab
new Token(properties)
buildText: ->
text = ""