From f92df8d57257cb126b4e75915b3b9a234ae642e4 Mon Sep 17 00:00:00 2001 From: Rik van der Kleij Date: Tue, 11 Feb 2020 20:49:39 +0100 Subject: [PATCH] Fix issue #497 --- .../scala/intellij/haskell/navigation/HaskellReference.scala | 2 +- src/main/scala/intellij/haskell/util/StringUtil.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/intellij/haskell/navigation/HaskellReference.scala b/src/main/scala/intellij/haskell/navigation/HaskellReference.scala index 636cfdb0..cb127906 100644 --- a/src/main/scala/intellij/haskell/navigation/HaskellReference.scala +++ b/src/main/scala/intellij/haskell/navigation/HaskellReference.scala @@ -76,7 +76,7 @@ class HaskellReference(element: HaskellNamedElement, textRange: TextRange) exten } private def isPartOfQualifier(namedElement: HaskellNamedElement): Boolean = { - Option(namedElement.getParent).map(_.getNode.getElementType).contains(HaskellTypes.HS_QUALIFIER) + Option(namedElement.getParent).map(_.getNode.getElementType).exists(elementType => elementType == HaskellTypes.HS_QUALIFIER || elementType == HaskellTypes.HS_Q_CON_QUALIFIER_1) } private def isPartOfQualifiedAs(namedElement: HaskellNamedElement): Boolean = { diff --git a/src/main/scala/intellij/haskell/util/StringUtil.scala b/src/main/scala/intellij/haskell/util/StringUtil.scala index ed89bb41..842e9d9b 100644 --- a/src/main/scala/intellij/haskell/util/StringUtil.scala +++ b/src/main/scala/intellij/haskell/util/StringUtil.scala @@ -24,7 +24,7 @@ import scala.collection.mutable.ListBuffer object StringUtil { - private final val PackageModuleQualifierPattern = """([a-zA-Z\-]+\-[\.0-9]+\:)?([A-Z][\w\\\-]*\.)+""" + private final val PackageModuleQualifierPattern = """([a-zA-Z\-]+\-[\.0-9]+\:)?([A-Z][\w\\\-\']*\.)+""" private final val PackageQualifierPattern = """^([a-zA-Z\-]+\-[\.0-9]+\:)?""" def escapeString(s: String): String = {