Skip to content

Commit

Permalink
Merge pull request #1448 from KronicDeth/1424
Browse files Browse the repository at this point in the history
Ignore organization when calculating Dep path
  • Loading branch information
KronicDeth committed Apr 14, 2019
2 parents d1964bf + 087a5cb commit c044323
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ Table of Contents
* Check that HomePath has `ebin` paths when validation. Prevents selecting false HomePaths for `kiex`.
* [#1446](https://github.com/KronicDeth/intellij-elixir/pull/1446) - Adding missing ESpec template. When reviewing #1410 I missed that the template wasn't in `resources`. 🤦‍♂️ - [@KronicDeth](https://github.com/KronicDeth)
* [#1447](https://github.com/KronicDeth/intellij-elixir/pull/1447) - Ignore `targets` when calculating `Dep` path. - [@KronicDeth](https://github.com/KronicDeth)
* [#1448](https://github.com/KronicDeth/intellij-elixir/pull/1448) - Ignore `organization` when calculating `Dep` path. - [@KronicDeth](https://github.com/KronicDeth)

## v10.4.0

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 @@ -76,6 +76,7 @@ <h1>v10.5.0</h1>
I missed that the template wasn't in <code>resources</code>. 🤦‍♂️
</li>
<li>Ignore <code>targets</code> when calculating <code>Dep</code> path.</li>
<li>Ignore <code>organization</code> when calculating <code>Dep</code> path.</li>
</ul>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion src/org/elixir_lang/mix/Dep.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ data class Dep(val application: String, val path: String, val type: Type = Type.
val key = keywordPair.keywordKey.text

when (key) {
"app", "branch", "commit", "compile", "git", "github", "hex", "only", "optional", "override", "ref", "runtime", "tag", "targets" -> acc
"app", "branch", "commit", "compile", "git", "github", "hex", "only", "optional", "organization", "override", "ref", "runtime", "tag", "targets" -> acc
"in_umbrella" -> acc.copy(path = "apps/$name", type = Type.MODULE)
"path" -> putPath(acc, keywordPair.keywordValue)
else -> {
Expand Down

0 comments on commit c044323

Please sign in to comment.