pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-11-13 08:44:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support includes inside of injection grammars

Browse Source
This commit is contained in:
Kevin Sawicki 2013-06-06 11:30:01 -07:00
parent efdb750334
commit 71c86381df
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spec/app/text-mate-grammar-spec.coffee
View File

@ -615,6 +615,23 @@ describe "TextMateGrammar", ->
expect(tokens[1].scopes).toEqual ["source.java", "comment.line.double-slash.java"]
expect(tokens[1].value).toEqual 'comment'
describe "HTML (Ruby - ERB)", ->
beforeEach ->
atom.activatePackage('html-tmbundle', sync: true)
atom.activatePackage('ruby-tmbundle', sync: true)
grammar = syntax.selectGrammar('page.erb')
lines = grammar.tokenizeLines '<% page_title "My Page" %>'
it "correctly parses strings inside tags", ->
tokens = lines[0]
expect(tokens[2].value).toEqual '"'
expect(tokens[2].scopes).toEqual ["text.html.erb", "meta.embedded.line.erb", "string.quoted.double.ruby", "punctuation.definition.string.begin.ruby"]
expect(tokens[3].value).toEqual 'My Page'
expect(tokens[3].scopes).toEqual ["text.html.erb", "meta.embedded.line.erb", "string.quoted.double.ruby"]
expect(tokens[4].value).toEqual '"'
expect(tokens[4].scopes).toEqual ["text.html.erb", "meta.embedded.line.erb", "string.quoted.double.ruby", "punctuation.definition.string.end.ruby"]
describe "Surrogate pair characters", ->
beforeEach ->
atom.activatePackage('javascript-tmbundle', sync: true)

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

@ -193,7 +193,7 @@ class Injections
for regex in values.patterns
pattern = new Pattern(grammar, regex)
anchored = true if pattern.anchored
patterns.push(pattern)
patterns.push(pattern.getIncludedPatterns(grammar, patterns)...)
@injections.push
anchored: anchored
selector: new TextMateScopeSelector(selector)