Skip to content

Commit

Permalink
Merge pull request #1774 from odk211/fix-iex-mix-run-configration
Browse files Browse the repository at this point in the history
Fix IEx Mix Run Configration do not work
  • Loading branch information
KronicDeth committed May 23, 2020
2 parents 1addf2e + 7c5bf5f commit 4c9acb0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@
Previously, it was checked if module attributes resolved to exactly one declaration, but this is no longer true with the looser reference resolution that allows invalid results for PisPolyVariantReference. `resolve()` will return `null` when there is more than one result from `multiResolve` even if some are invalid, so we need to explicitly check if the `PsiReference` is a `PsiPolyVariantReference` and if so check if any are valid.
* Fix deprecation warnings for `annotator.ModuleAttribute`.
* Quick fixes for inlinables in `annotator.ModuleAttribute`.
* [#1774](https://github.com/KronicDeth/intellij-elixir/pull/1774) - [@odk211](https://github.com/odk211)
* Fix `iex` and `erl` arguments not being saved for IEx Mix Run Configurations.

## v11.6.1
### Bug Fixes
Expand Down
1 change: 1 addition & 0 deletions resources/META-INF/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ <h1>v11.7.0</h1>
<li>
<p>Quick fixes for inlinables in <code>annotator.ModuleAttribute</code>.</p>
</li>
<li>Fix <code>iex</code> and <code>erl</code> arguments not being saved for IEx Mix Run Configurations.</li>
</ul>
</li>
</ul>
Expand Down
4 changes: 3 additions & 1 deletion src/org/elixir_lang/iex/mix/Configuration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,10 @@ class Configuration(name: String, project: Project, configurationFactory: Config
get() = erlArgumentList.toArguments()
set(arguments) = erlArgumentList.fromArguments(arguments)

private var iexArguments: String?
var iexArguments: String?
@JvmName("getIExArguments")
get() = iexArgumentList.toArguments()
@JvmName("setIExArguments")
set(arguments) = iexArgumentList.fromArguments(arguments)

var iexArgumentList: MutableList<String> = mutableListOf()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.intellij.openapi.ui.LabeledComponent;
import com.intellij.ui.RawCommandLineEditor;
import com.intellij.util.ui.UIUtil;
import org.elixir_lang.iex.Configuration;
import org.elixir_lang.iex.mix.Configuration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down

0 comments on commit 4c9acb0

Please sign in to comment.