Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Improve HTML (Ruby - ERB) grammar #121

Merged
merged 4 commits into from
Nov 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions grammars/html (ruby - erb).cson
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
'beginCaptures':
'0':
'name': 'punctuation.section.embedded.begin.erb'
'contentName': 'source.ruby'
'end': '(-?%)>'
'contentName': 'source.ruby.embedded.erb'
'end': '-?%>'
'endCaptures':
'0':
'name': 'punctuation.section.embedded.end.erb'
Expand All @@ -97,8 +97,8 @@
'beginCaptures':
'0':
'name': 'punctuation.section.embedded.begin.erb'
'contentName': 'source.ruby'
'end': '(-?%)>'
'contentName': 'source.ruby.embedded.erb'
'end': '-?%>'
'endCaptures':
'0':
'name': 'punctuation.section.embedded.end.erb'
Expand Down
26 changes: 26 additions & 0 deletions spec/erb-spec.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
describe "HTML (Ruby - ERB) grammar", ->
grammar = null

beforeEach ->
waitsForPromise ->
atom.packages.activatePackage("language-ruby")

runs ->
grammar = atom.grammars.grammarForScopeName("text.html.erb")

it "parses the grammar", ->
expect(grammar).toBeTruthy()
expect(grammar.scopeName).toBe "text.html.erb"

it "tokenizes embedded ruby", ->
{tokens} = grammar.tokenizeLine('<%= self %>')
expect(tokens[0]).toEqual value: '<%=', scopes: ['text.html.erb', 'meta.embedded.line.erb', 'punctuation.section.embedded.begin.erb']
expect(tokens[1]).toEqual value: ' ', scopes: ['text.html.erb', 'meta.embedded.line.erb', 'source.ruby.embedded.erb']
expect(tokens[2]).toEqual value: 'self', scopes: ['text.html.erb', 'meta.embedded.line.erb', 'source.ruby.embedded.erb', 'variable.language.self.ruby']
expect(tokens[3]).toEqual value: ' ', scopes: ['text.html.erb', 'meta.embedded.line.erb', 'source.ruby.embedded.erb']
expect(tokens[4]).toEqual value: '%>', scopes: ['text.html.erb', 'meta.embedded.line.erb', 'punctuation.section.embedded.end.erb']

lines = grammar.tokenizeLines('<%=\nself\n%>')
expect(lines[0][0]).toEqual value: '<%=', scopes: ['text.html.erb', 'meta.embedded.block.erb', 'punctuation.section.embedded.begin.erb']
expect(lines[1][0]).toEqual value: 'self', scopes: ['text.html.erb', 'meta.embedded.block.erb', 'source.ruby.embedded.erb', 'variable.language.self.ruby']
expect(lines[2][0]).toEqual value: '%>', scopes: ['text.html.erb', 'meta.embedded.block.erb', 'punctuation.section.embedded.end.erb']