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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
51e2a56
Template, EEx, Elixir separation in .*.eex files
KronicDeth Nov 13, 2017
fe37146
Separate marker for =,/,| to match native
KronicDeth Nov 14, 2017
8024cd4
All ParserDefinitions in EEx test output
KronicDeth Nov 16, 2017
4dace01
app.html.eex test from Phoenix
KronicDeth Nov 17, 2017
d01ca9a
EEx in Elixir grammar
KronicDeth Nov 25, 2017
97b271f
Stop merging when not DATA OR NOT null
KronicDeth Nov 25, 2017
6e8a8eb
Allow FileTypeManager for each test
KronicDeth Nov 25, 2017
f30c1a7
EEx do end block
KronicDeth Nov 26, 2017
e3d3c5f
Failing EEx.TokenizerTest test "strings with embedded code"
KronicDeth Nov 26, 2017
6f701b6
Non-equals EEx tag as accessExpression
KronicDeth Nov 26, 2017
a5421c7
EEx.Tokenizer test "string with more than one line"
KronicDeth Nov 26, 2017
828e49a
EEx.TokenizerTest strings with more than one line and expression with…
KronicDeth Nov 26, 2017
5fe6d74
EEx.TokenizerTest quotation
KronicDeth Nov 26, 2017
4940157
EEx quotation in Elixir
KronicDeth Nov 26, 2017
b57392c
EEx.TokenizerTest "quotation with interpolation" failing
KronicDeth Nov 26, 2017
02635b3
Treat <%% as escaped opening instead of tag start
KronicDeth Nov 27, 2017
f86fa3f
EEx.TokenizerTest comments
KronicDeth Nov 27, 2017
32aaf27
EEx.TokenizerTest "comments with do/end"
KronicDeth Nov 27, 2017
f83e055
EEx.TokenizerTest strings with embedded do end
KronicDeth Nov 27, 2017
123fd4f
Failing EEx.TokenizerTest "strings with embedded -> end"
KronicDeth Nov 27, 2017
cae81a9
Move eex to root rule
KronicDeth Nov 27, 2017
c8849cf
EEx.TokenizerTest "strings with embedded -> end"
KronicDeth Nov 28, 2017
2b6137d
Failing EEx.TokenizerTest "strings with embedded keywords blocks"
KronicDeth Nov 28, 2017
fe82139
EEx.TokenizerTest "strings with embedded keywords blocks"
KronicDeth Nov 28, 2017
05e77ca
EEx.TokenizerTest "trim mode"
KronicDeth Nov 28, 2017
2919542
EEx.TokenizerTest "trim mode with comment"
KronicDeth Nov 28, 2017
d144fea
EEx.TokenerTest "trim mode with CRLF"
KronicDeth Nov 28, 2017
136d776
EEx.TokenizerTest "trim mode set to false"
KronicDeth Nov 28, 2017
7d67610
EEx.TokenizerTest "raise syntax error when there is start mark and no…
KronicDeth Nov 28, 2017
c832737
Fix look-ahead on non-eex tests
KronicDeth Nov 29, 2017
a8a89eb
Turn off HTML tests on travis-ci
KronicDeth Nov 29, 2017
59dfadb
Drop IDEA 2016.2.X because > 1 year old
KronicDeth Nov 29, 2017
6c28353
phoenix templates/page/index.html.eex
KronicDeth Nov 29, 2017
bcddf23
mix phx.gen.html Accounts User users name:string age:integer
KronicDeth Nov 29, 2017
f917539
Interleave EEx and Elixir stabBodyExpressions
KronicDeth Nov 30, 2017
d53d072
endOfExpression? -> endOfExpressionMaybe
KronicDeth Nov 30, 2017
a46a321
EOL* -> eolStar
KronicDeth Nov 30, 2017
5ced685
!KEYWORD_PAIR_COLON -> noKeywordPairColon
KronicDeth Nov 30, 2017
6777209
doBlock? -> doBlockMaybe
KronicDeth Nov 30, 2017
1f4da3d
expressionRecoverUntil
KronicDeth Nov 30, 2017
8f6350a
SIGNIFICANT_WHITE_SPACE? -> significantWhiteSpaceMaybe
KronicDeth Nov 30, 2017
7f47914
!numeric -> nonNumeric
KronicDeth Nov 30, 2017
b88be58
infixComma? -> infixCommaMaybe
KronicDeth Nov 30, 2017
a414207
octalDigits+ -> octalDigitsSome
KronicDeth Nov 30, 2017
dcc0e5a
Use anonymousFunction EEx handling in doBlock
KronicDeth Nov 30, 2017
1888cd5
Whitespace between %> and <% is WHITE_SPACE
KronicDeth Nov 30, 2017
f6eef5e
Go back to stab in anonymousFunction
KronicDeth Nov 30, 2017
7786016
Update errors in testData
KronicDeth Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,6 @@ matrix:
env: IDEA_VERSION="2016.3.7"
jdk: oraclejdk8
otp_release: 19.3


- elixir: 1.5.2
env: IDEA_VERSION="2016.2.5"
jdk: oraclejdk8
otp_release: 20.1
- elixir: 1.4.5
env: IDEA_VERSION="2016.2.5"
jdk: oraclejdk8
otp_release: 19.3
before_install:
- mix local.hex --force
- "export ELIXIR_VERSION=${TRAVIS_ELIXIR_VERSION}"
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ allprojects {

plugins = ["org.jetbrains.erlang:${intellij_erlang_version}",
// always have IdeaVIM installed in sandbox
"IdeaVIM:0.48"]
"IdeaVIM:0.48",
"PsiViewer:3.28.93"]
pluginName 'intellij-elixir'
version ideaVersion
downloadSources Boolean.valueOf(sources)
Expand Down
151 changes: 151 additions & 0 deletions gen/org/elixir_lang/eex/Parser.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.