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.

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

Don't error on runtume in mix deps #1589

Merged
merged 2 commits into from
Sep 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
121 changes: 64 additions & 57 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,198 +2,205 @@

## Table of Contents

* [v11.1.1](#v1111)
* [Bug Fixes](#bug-fixes)
* [v11.1.0](#v1110)
* [Enhancements](#enhancements)
* [Bug Fixes](#bug-fixes)
* [v11.0.1](#v1101)
* [Bug Fixes](#bug-fixes-1)
* [v11.0.1](#v1101)
* [Bug Fixes](#bug-fixes-2)
* [v11.0.0](#v1100)
* [Enhancements](#enhancements-1)
* [Bug Fixes](#bug-fixes-2)
* [Bug Fixes](#bug-fixes-3)
* [Incompatible Changes](#incompatible-changes)
* [v10.6.0](#v1060)
* [Enhancements](#enhancements-2)
* [Bug Fixes](#bug-fixes-3)
* [v10.5.1](#v1051)
* [Bug Fixes](#bug-fixes-4)
* [v10.5.1](#v1051)
* [Bug Fixes](#bug-fixes-5)
* [v10.5.0](#v1050)
* [Enhancements](#enhancements-3)
* [Bug Fixes](#bug-fixes-5)
* [Bug Fixes](#bug-fixes-6)
* [v10.4.0](#v1040)
* [Enhancements](#enhancements-4)
* [Bug Fixes](#bug-fixes-6)
* [Bug Fixes](#bug-fixes-7)
* [v10.3.0](#v1030)
* [Enhancements](#enhancements-5)
* [Bug Fixes](#bug-fixes-7)
* [Bug Fixes](#bug-fixes-8)
* [v10.2.0](#v1020)
* [Enhancements](#enhancements-6)
* [Bug Fixes](#bug-fixes-8)
* [Bug Fixes](#bug-fixes-9)
* [v10.1.0](#v1010)
* [Enhancements](#enhancements-7)
* [Bug Fixes](#bug-fixes-9)
* [v10.0.1](#v1001)
* [Bug Fixes](#bug-fixes-10)
* [v10.0.1](#v1001)
* [Bug Fixes](#bug-fixes-11)
* [v10.0.0](#v1000)
* [Enhancements](#enhancements-8)
* [Bug Fixes](#bug-fixes-11)
* [Bug Fixes](#bug-fixes-12)
* [Incompatible Changes](#incompatible-changes-1)
* [v9.0.0](#v900)
* [Enhancements](#enhancements-9)
* [Bug Fixes](#bug-fixes-12)
* [Bug Fixes](#bug-fixes-13)
* [Incompatible Changs](#incompatible-changs)
* [v8.1.0](#v810)
* [Enhancements](#enhancements-10)
* [Bug Fixes](#bug-fixes-13)
* [Bug Fixes](#bug-fixes-14)
* [v8.0.0](#v800)
* [Enhancements](#enhancements-11)
* [Bug Fixes](#bug-fixes-14)
* [Bug Fixes](#bug-fixes-15)
* [Incompatible Changes](#incompatible-changes-2)
* [v7.5.0](#v750)
* [Enhancements](#enhancements-12)
* [Bug Fixes](#bug-fixes-15)
* [Bug Fixes](#bug-fixes-16)
* [v7.4.0](#v740)
* [Enhancements](#enhancements-13)
* [Bug Fixes](#bug-fixes-16)
* [Bug Fixes](#bug-fixes-17)
* [v7.3.0](#v730)
* [Enhancements](#enhancements-14)
* [Bug Fixes](#bug-fixes-17)
* [v7.2.1](#v721)
* [Bug Fixes](#bug-fixes-18)
* [v7.2.1](#v721)
* [Bug Fixes](#bug-fixes-19)
* [v7.2.0](#v720)
* [Enhancements](#enhancements-15)
* [Bug Fixes](#bug-fixes-19)
* [Bug Fixes](#bug-fixes-20)
* [v7.1.0](#v710)
* [Enhancements](#enhancements-16)
* [Bug Fixes](#bug-fixes-20)
* [Bug Fixes](#bug-fixes-21)
* [v7.0.0](#v700)
* [Enhancements](#enhancements-17)
* [Bug Fixes](#bug-fixes-21)
* [Bug Fixes](#bug-fixes-22)
* [Incompatible Changes](#incompatible-changes-3)
* [v6.7.0](#v670)
* [Enhancements](#enhancements-18)
* [Bug Fixes](#bug-fixes-22)
* [Bug Fixes](#bug-fixes-23)
* [v6.6.0](#v660)
* [Enhancements](#enhancements-19)
* [Bug Fixes](#bug-fixes-23)
* [v6.5.1](#v651)
* [Bug Fixes](#bug-fixes-24)
* [v6.5.1](#v651)
* [Bug Fixes](#bug-fixes-25)
* [v6.5.0](#v650)
* [Enhancements](#enhancements-20)
* [Bug Fixes](#bug-fixes-25)
* [Bug Fixes](#bug-fixes-26)
* [v6.4.0](#v640)
* [Enhancements](#enhancements-21)
* [Bug Fixes](#bug-fixes-26)
* [Bug Fixes](#bug-fixes-27)
* [v6.3.0](#v630)
* [Enhancements](#enhancements-22)
* [Bug Fixes](#bug-fixes-27)
* [Bug Fixes](#bug-fixes-28)
* [v6.2.0](#v620)
* [Enhancements](#enhancements-23)
* [Bug Fixes](#bug-fixes-28)
* [v6.1.1](#v611)
* [Bug Fixes](#bug-fixes-29)
* [v6.1.1](#v611)
* [Bug Fixes](#bug-fixes-30)
* [v6.1.0](#v610)
* [Enhancements](#enhancements-24)
* [Bug Fixes](#bug-fixes-30)
* [Bug Fixes](#bug-fixes-31)
* [v6.0.0](#v600)
* [Enhancements](#enhancements-25)
* [Bug Fixes](#bug-fixes-31)
* [Bug Fixes](#bug-fixes-32)
* [Incompatible Changes](#incompatible-changes-4)
* [v5.1.0](#v510)
* [Enhancements](#enhancements-26)
* [Bug Fixes](#bug-fixes-32)
* [Bug Fixes](#bug-fixes-33)
* [v5.0.0](#v500)
* [Enhancements](#enhancements-27)
* [Bug Fixes](#bug-fixes-33)
* [Bug Fixes](#bug-fixes-34)
* [Incompatible Changes](#incompatible-changes-5)
* [v4.7.0](#v470)
* [Enhancements](#enhancements-28)
* [Bug Fixes](#bug-fixes-34)
* [Bug Fixes](#bug-fixes-35)
* [v4.6.0](#v460)
* [Enhancements](#enhancements-29)
* [Bug Fixes](#bug-fixes-35)
* [Bug Fixes](#bug-fixes-36)
* [v4.5.0](#v450)
* [Enhancements](#enhancements-30)
* [v4.4.0](#v440)
* [Enhancements](#enhancements-31)
* [Bug Fixes](#bug-fixes-36)
* [Bug Fixes](#bug-fixes-37)
* [v4.3.0](#v430)
* [Enhancements](#enhancements-32)
* [Bug Fixes](#bug-fixes-37)
* [Bug Fixes](#bug-fixes-38)
* [v4.2.0](#v420)
* [Enhancements](#enhancements-33)
* [Bug Fixes](#bug-fixes-38)
* [Bug Fixes](#bug-fixes-39)
* [v4.1.0](#v410)
* [Enhancements](#enhancements-34)
* [Bug Fixes](#bug-fixes-39)
* [Bug Fixes](#bug-fixes-40)
* [v4.0.0](#v400)
* [Enhancements](#enhancements-35)
* [Bug Fixes](#bug-fixes-40)
* [Bug Fixes](#bug-fixes-41)
* [Incompatible Changes](#incompatible-changes-6)
* [v3.0.1](#v301)
* [Bug Fixes](#bug-fixes-41)
* [Bug Fixes](#bug-fixes-42)
* [v3.0.0](#v300)
* [Enhancements](#enhancements-36)
* [Bug Fixes](#bug-fixes-42)
* [Bug Fixes](#bug-fixes-43)
* [Incompatible Changes](#incompatible-changes-7)
* [v2.2.0](#v220)
* [Enhancement](#enhancement)
* [Bug Fixes](#bug-fixes-43)
* [Bug Fixes](#bug-fixes-44)
* [v2.1.0](#v210)
* [Enhancement](#enhancement-1)
* [Bug Fixes](#bug-fixes-44)
* [Bug Fixes](#bug-fixes-45)
* [v2.0.0](#v200)
* [Enhancements](#enhancements-37)
* [Bug Fixes](#bug-fixes-45)
* [Bug Fixes](#bug-fixes-46)
* [Incompatible Changes](#incompatible-changes-8)
* [v1.2.1](#v121)
* [Enhancements](#enhancements-38)
* [Bug Fixes](#bug-fixes-46)
* [Bug Fixes](#bug-fixes-47)
* [v1.2.0](#v120)
* [Enhancements](#enhancements-39)
* [Bug Fixes](#bug-fixes-47)
* [Bug Fixes](#bug-fixes-48)
* [v1.1.0](#v110)
* [Enhancements](#enhancements-40)
* [v1.0.0](#v100)
* [Enhancements](#enhancements-41)
* [Bug Fixes](#bug-fixes-48)
* [Bug Fixes](#bug-fixes-49)
* [Incompatible Fixes](#incompatible-fixes)
* [v0.3.5](#v035)
* [Enhancements](#enhancements-42)
* [Bug Fixes](#bug-fixes-49)
* [Bug Fixes](#bug-fixes-50)
* [v0.3.4](#v034)
* [Enhancements](#enhancements-43)
* [v0.3.3](#v033)
* [Enhancements](#enhancements-44)
* [v0.3.2](#v032)
* [Bug Fixes](#bug-fixes-50)
* [Bug Fixes](#bug-fixes-51)
* [v0.3.1](#v031)
* [Enhancements](#enhancements-45)
* [v0.3.0](#v030)
* [Enhancements](#enhancements-46)
* [Incompatible Changes](#incompatible-changes-9)
* [v0.2.1](#v021)
* [Enhancements](#enhancements-47)
* [Bug Fixes](#bug-fixes-51)
* [Bug Fixes](#bug-fixes-52)
* [v0.2.0](#v020)
* [Enhancements](#enhancements-48)
* [Incompatible Changes](#incompatible-changes-10)
* [v0.1.4](#v014)
* [Enhancements](#enhancements-49)
* [Bug Fixes](#bug-fixes-52)
* [v0.1.3](#v013)
* [Bug Fixes](#bug-fixes-53)
* [v0.1.3](#v013)
* [Bug Fixes](#bug-fixes-54)
* [v0.1.2](#v012)
* [Enhancements](#enhancements-50)
* [v0.1.1](#v011)
* [Bug Fixes](#bug-fixes-54)
* [Bug Fixes](#bug-fixes-55)
* [v0.1.0](#v010)
* [Enhancements](#enhancements-51)
* [Bug Fixes](#bug-fixes-55)
* [Bug Fixes](#bug-fixes-56)
* [v0.0.3](#v003)
* [Enhancements](#enhancements-52)
* [v0.0.2](#v002)
* [Enhancements](#enhancements-53)
* [Bug Fixes](#bug-fixes-56)
* [Bug Fixes](#bug-fixes-57)

## v11.1.1
### Bug Fixes
* [#1589](https://github.com/KronicDeth/intellij-elixir/pull/1589) - [@KronicDeth](https://github.com/KronicDeth)
* Don't error on `runtume` in mix deps. `guardian` is too common of a dependency and too many users have the version with the typo installed.

## v11.1.0
### Enhancements
Expand Down
12 changes: 12 additions & 0 deletions resources/META-INF/changelog.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
<html>
<body>
<h1>v11.1.1</h1>
<ul>
<li>
<p>Bug Fixes</p>
<ul>
<li>
Don't error on <code>runtume</code> in mix deps. <code>guardian</code> is too common of a dependency and too
many users have the version with the typo installed.
</li>
</ul>
</li>
</ul>
<h1>v11.1.0</h1>
<ul>
<li>
Expand Down
6 changes: 5 additions & 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", "organization", "override", "ref", "runtime", "tag", "targets" -> acc
"app", "branch", "commit", "compile", "git", "github", "hex", "only", "optional", "organization", "override", "ref", "runtime", GUARDIAN_RUNTIME_TYPO, "tag", "targets" -> acc
"in_umbrella" -> acc.copy(path = "apps/$name", type = Type.MODULE)
"path" -> putPath(acc, keywordPair.keywordValue)
else -> {
Expand Down Expand Up @@ -104,3 +104,7 @@ data class Dep(val application: String, val path: String, val type: Type = Type.
private fun putPath(dep: Dep, stringLine: ElixirStringLine): Dep = dep.copy(path = stringLine.body.text)
}
}

// https://github.com/ueberauth/guardian/issues/594
@Suppress("SpellCheckingInspection")
const val GUARDIAN_RUNTIME_TYPO: String = "runtume"