Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EEx and EEx template parsing #923

Merged
merged 48 commits into from
Dec 1, 2017
Merged

EEx and EEx template parsing #923

merged 48 commits into from
Dec 1, 2017

Conversation

KronicDeth
Copy link
Owner

Resolves #186

Changelog

Enhancements

  • EEx support
    • Lexer for EEx format
    • Parser for EEx format
    • EEx as a Template Language
      • Any file with .eex as the final extension will be treated as EEx. To determine the Template Data Language, the .eex extension will be stripped and any remaining extension will be looked up to get the File Type and its associated Language. For example, *.txt.eex will be EEx with Plain Text (.txt) as the Data Template Language. Likewise, *.html.eex will be EEx with HTML as the Data Template Language. There's no need to register *.txt.eex or *.html.eex or any other *.DATA_TEMPLATE_LANGUAGE_EXTENSION.eex pattern explicitly: the nested extension will be looked up using the normal extension setup.
  • Update Build Matrix
    • IDEA 2016.2 is dropped because it's over a year old. It is still supported, but not actively tested.

@KronicDeth
Template, EEx, Elixir separation in .*.eex files
51e2a56
@KronicDeth
Separate marker for =,/,| to match native
fe37146
@KronicDeth
All ParserDefinitions in EEx test output
8024cd4
@KronicDeth
app.html.eex test from Phoenix
4dace01
@KronicDeth
EEx in Elixir grammar
d01ca9a
@KronicDeth
Stop merging when not DATA OR NOT null
97b271f
@KronicDeth
Allow FileTypeManager for each test
6e8a8eb
@KronicDeth
EEx do end block
f30c1a7
@KronicDeth
Failing EEx.TokenizerTest test "strings with embedded code"
e3d3c5f
@KronicDeth
Non-equals EEx tag as accessExpression
6f701b6
@KronicDeth
EEx.Tokenizer test "string with more than one line"
a5421c7
@KronicDeth
EEx.TokenizerTest strings with more than one line and expression with…
828e49a 
… more than one line
@KronicDeth
EEx.TokenizerTest quotation
5fe6d74
@KronicDeth
EEx quotation in Elixir
4940157
@KronicDeth
EEx.TokenizerTest "quotation with interpolation" failing
b57392c
@KronicDeth
Treat <%% as escaped opening instead of tag start
02635b3 
<%% does not need to be paired with %> and all other tags work "inside"
it even if it is, so it's better to not treat it as a tag, but as an
escaped opening token instead.
@KronicDeth
EEx.TokenizerTest comments
f86fa3f
@KronicDeth
EEx.TokenizerTest "comments with do/end"
32aaf27
@KronicDeth
EEx.TokenizerTest strings with embedded do end
f83e055
@KronicDeth
Failing EEx.TokenizerTest "strings with embedded -> end"
123fd4f
@KronicDeth
Move eex to root rule
cae81a9
@KronicDeth
EEx.TokenizerTest "strings with embedded -> end"
c8849cf
@KronicDeth
Failing EEx.TokenizerTest "strings with embedded keywords blocks"
2b6137d
@KronicDeth
EEx.TokenizerTest "strings with embedded keywords blocks"
fe82139
@KronicDeth
EEx.TokenizerTest "trim mode"
05e77ca
@KronicDeth
EEx.TokenizerTest "trim mode with comment"
2919542
@KronicDeth
EEx.TokenerTest "trim mode with CRLF"
d144fea
@KronicDeth
EEx.TokenizerTest "trim mode set to false"
136d776
@KronicDeth
EEx.TokenizerTest "raise syntax error when there is start mark and no…
7d67610 
… end mark"
@KronicDeth
Fix look-ahead on non-eex tests
c832737
@KronicDeth
Turn off HTML tests on travis-ci
a8a89eb
@KronicDeth
Drop IDEA 2016.2.X because > 1 year old
59dfadb
@KronicDeth
phoenix templates/page/index.html.eex
6c28353
@KronicDeth
mix phx.gen.html Accounts User users name:string age:integer
bcddf23
@KronicDeth
Interleave EEx and Elixir stabBodyExpressions
f917539
@KronicDeth
endOfExpression? -> endOfExpressionMaybe
d53d072
@KronicDeth
EOL* -> eolStar
a46a321
@KronicDeth
!KEYWORD_PAIR_COLON -> noKeywordPairColon
5ced685
@KronicDeth
doBlock? -> doBlockMaybe
6777209
@KronicDeth
expressionRecoverUntil
1f4da3d 
Name subexpression of expressionRecoverWhile instead of using positional
name.
@KronicDeth
SIGNIFICANT_WHITE_SPACE? -> significantWhiteSpaceMaybe
8f6350a
@KronicDeth
!numeric -> nonNumeric
7f47914
@KronicDeth
infixComma? -> infixCommaMaybe
b88be58
@KronicDeth
octalDigits+ -> octalDigitsSome
a414207
@KronicDeth
Use anonymousFunction EEx handling in doBlock
dcc0e5a
@KronicDeth
Whitespace between %> and <% is WHITE_SPACE
1888cd5 
Allows to handle `do %>\n  <%` correctly.
@KronicDeth
Go back to stab in anonymousFunction
f6eef5e 
Don't roll fix for missing stab in this PR.
@KronicDeth
Update errors in testData
7786016
@KronicDeth KronicDeth added this to the v6.6.0 milestone Dec 1, 2017
@KronicDeth KronicDeth self-assigned this Dec 1, 2017
@KronicDeth KronicDeth merged commit 3702587 into master Dec 1, 2017
@KronicDeth KronicDeth deleted the 186 branch December 1, 2017 02:53
KronicDeth added a commit that referenced this pull request Dec 1, 2017
@KronicDeth
Add #923 to changelogs
8d5011e
KronicDeth added a commit that referenced this pull request Dec 2, 2017
@KronicDeth
Add #923 to README
04270dc
KronicDeth added a commit that referenced this pull request Dec 2, 2017
@KronicDeth
Add #923 to README
4748b3e
KronicDeth added a commit that referenced this pull request Dec 2, 2017
@KronicDeth
Add #923 to README
1254037
KronicDeth added a commit that referenced this pull request Dec 2, 2017
@KronicDeth
Add #923 to README
b8caa71
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@KronicDeth KronicDeth

Labels
Feature:EEx Kind:Enhancement
Projects
None yet
Milestone
v6.6.0
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@KronicDeth