Land #923: EEx and EEx template parsing

KronicDeth · Dec 1, 2017 · 3702587 · 3702587
2 parents 314807f + 7786016
commit 3702587
Show file tree

Hide file tree

Showing 263 changed files with 9,107 additions and 2,186 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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}"

diff --git a/build.gradle b/build.gradle
@@ -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)

diff --git a/gen/org/elixir_lang/eex/Parser.java b/gen/org/elixir_lang/eex/Parser.java