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

Update Elixir versions in build matrix #1126

Merged
merged 25 commits into from
Jun 2, 2018
Merged

Update Elixir versions in build matrix #1126

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5ded26f
Add Elixir 1.6.X to build matrix
KronicDeth May 27, 2018
c934499
Don't include counter in metadata for >= 1.6
KronicDeth May 28, 2018
f3c71e5
Convert QuotableArgumentsImpl to Kotlin
KronicDeth May 28, 2018
8193fbf
Don't use nil for empty do block in >= 1.6
KronicDeth May 28, 2018
8cd741d
Minimum test case for 1.6 Kernel parse bug
KronicDeth May 28, 2018
8b89332
Disable quoter checks for 1.6-only differences
KronicDeth May 28, 2018
6d66d33
Use 1.0.0 quoter with Elixir 1.6
KronicDeth May 28, 2018
1572744
Quote empty parentheses as empty __block__ instead of nil in >= 1.6
KronicDeth May 28, 2018
9b12e38
(;) has line number metadata for >= 1.6
KronicDeth May 28, 2018
f3c21d9
Convert ElixirParserDefinition to Kotlin
KronicDeth May 28, 2018
94892f5
Convert lexers to Kotlin
KronicDeth May 28, 2018
da149f8
Don't allow -> after . in >= 1.6
KronicDeth May 28, 2018
ae25321
Empty file is empty __block__ instead of nil in >= 1.6
KronicDeth May 28, 2018
49c34f6
Ignore implementation difference for comments only file
KronicDeth May 28, 2018
a8091b7
Convert ParentImpl to Kotlin
KronicDeth May 29, 2018
86ae33b
Don't use \ strip before # in >= 1.6
KronicDeth May 29, 2018
a166686
All & precedence to vary between 1.5 and 1.6
KronicDeth May 29, 2018
0a279a3
Use parentheticalStab's line for >= 1.6 metadata
KronicDeth Jun 1, 2018
bf5561e
Use 1.6 compatible empty block for blockItems
KronicDeth Jun 1, 2018
89e3fb7
Remove %[1]{} test that doesn't work in 1.6
KronicDeth Jun 1, 2018
edc53c0
Disable BarDual test for < 1.6
KronicDeth Jun 1, 2018
9c16060
Use Elixir and intellij_elixir version in build path
KronicDeth Jun 1, 2018
4fd5dd5
Don't download JDK tarball
KronicDeth Jun 1, 2018
156de58
Unify toBlock and buildBlock for single children in >= 1.6
KronicDeth Jun 2, 2018
d4a3415
Remove test that only differs by ambiguous_op metadata
KronicDeth Jun 2, 2018
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
Prev Previous commit
Next Next commit
Unify toBlock and buildBlock for single children in >= 1.6
  • Loading branch information
@KronicDeth
KronicDeth committed Jun 2, 2018
commit 156de58bd7ab857e916a3b758d542f1aefb78304
6 changes: 5 additions & 1 deletion src/org/elixir_lang/psi/impl/QuotableImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,11 @@ object QuotableImpl {
private fun toBlock(quotedChildren: List<OtpErlangObject>, level: Level): OtpErlangObject =
when (quotedChildren.size) {
0 -> emptyBlock(level)
1 -> quotedChildren.first()
1 -> if (level < V_1_6) {
quotedChildren.first()
} else {
buildBlock(quotedChildren, OtpErlangList())
}
else -> blockFunctionCall(quotedChildren, OtpErlangList())
}

Expand Down