ilyakooo0/intellij-haskell
1
0
Fork 0
mirror of https://github.com/ilyakooo0/intellij-haskell.git synced 2024-10-26 15:13:25 +03:00
Code Issues Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Rik van der Kleij 2019-09-30 20:55:16 +02:00
parent 4e9ce82f5a
commit feff70a381
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/intellij/haskell/external/component/DefinitionLocationComponent.scala vendored
View File

@ -76,18 +76,17 @@ private[component] object DefinitionLocationComponent {
} }
def invalidate(psiFile: PsiFile): Unit = { def invalidate(psiFile: PsiFile): Unit = {
val synchronousCache = Cache val keys = Cache.asMap().flatMap { case (k, v) =>
val keys = synchronousCache.asMap().flatMap { case (k, v) =>
if (checkValidKey(k)) { if (checkValidKey(k)) {
v.toOption match { v.toOption match {
case Some(definitionLocation) if checkValidLocation(definitionLocation) & checkValidName(k, definitionLocation) => None case Some(definitionLocation) if checkValidLocation(definitionLocation) && checkValidName(k, definitionLocation) => None
case _ => Some(k) case _ => Some(k)
} }
} else { } else {
Some(k) Some(k)
} }
} }
synchronousCache.invalidateAll(keys) Cache.invalidateAll(keys)
} }
private def checkValidKey(key: Key): Boolean = { private def checkValidKey(key: Key): Boolean = {
@ -126,7 +125,7 @@ private[component] object DefinitionLocationComponent {
ProgressManager.checkCanceled() ProgressManager.checkCanceled()
// GHCi :loc-at does not always give right answer for qualified identifiers. It depends on the order of import declarations... // GHCi :loc-at does not always give right answer for qualified identifiers. It depends on the order of import declarations...
// So in case of qualified identifiers :info is used to find definition location. // So in case of qualified identifiers :info is used to find definition location as second solution.
if (libraryFile || key.importQualifier.isDefined || key.qualifiedNameElement.getQualifierName.isDefined) { if (libraryFile || key.importQualifier.isDefined || key.qualifiedNameElement.getQualifierName.isDefined) {
findLocationByImportedIdentifiers(project, key, name) match { findLocationByImportedIdentifiers(project, key, name) match {