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

Merge branch 'master' into atom-shell

Browse Source
This commit is contained in:
Cheng Zhao
2013-06-03 19:53:10 +08:00
parent f9be1f3493 9431a8c3ac
commit 681969439d
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/text-mate-grammar.coffee
View File

@@ -159,7 +159,7 @@ class TextMateGrammar
ruleStack.pop()
[penultimateRule, lastRule] = ruleStack[-2..]
if lastRule? and penultimateRule.scopeName == lastRule.scopeName
if lastRule?.scopeName? and penultimateRule.scopeName == lastRule.scopeName
ruleStack.pop()
tokens.push(new Token(
value: line[position...line.length]
@@ -203,7 +203,7 @@ class Injections
return injection.scanner if injection.scanner?
regexes = _.map injection.patterns, (pattern) ->
pattern.getRegex(firstLine, position, @anchorPosition)
pattern.getRegex(firstLine, position, anchorPosition)
scanner = new OnigScanner(regexes)
scanner.patterns = injection.patterns
scanner.anchored = injection.anchored