ilyakooo0/intellij-haskell
1
0
Fork 0
mirror of https://github.com/ilyakooo0/intellij-haskell.git synced 2024-08-17 10:40:44 +03:00
Code Issues Projects Releases Wiki Activity

Improve code completion and fix issue #470

Browse Source
This commit is contained in:
Rik van der Kleij 2019-10-03 15:41:10 +02:00
parent 565c7f9aeb
commit bcbfa2b869
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/intellij/haskell/editor/HaskellCompletionContributor.scala
View File

@ -45,7 +45,7 @@ class HaskellCompletionContributor extends CompletionContributor {
private final val HaskellWhere = LazyList("where")
private final val HaskellLet = LazyList("let")
private final val haskellDeclKeywords = LazyList("family", "data", "type", "module", "class", "instance", "newtype", "deriving", "in")
private final val haskellDeclarationKeywords = LazyList("family", "data", "type", "module", "class", "instance", "newtype", "deriving", "in")
private final val HaskellDefault = LazyList("default")
private final val HaskellImportKeywords = LazyList("import", "qualified", "as", "hiding")
private final val HaskellForeignKeywords = LazyList("foreign", "export", "ccall", "safe", "unsafe", "interruptible", "capi", "prim")
@ -60,7 +60,7 @@ class HaskellCompletionContributor extends CompletionContributor {
private final val HaskellRecursiveDo = LazyList("mdo", "rec")
private final val HaskellArrowSyntax = LazyList("proc")
private final val Keywords = HaskellWhere ++ HaskellLet ++ haskellDeclKeywords ++ HaskellDefault ++ HaskellImportKeywords ++
private final val Keywords = HaskellWhere ++ HaskellLet ++ haskellDeclarationKeywords ++ HaskellDefault ++ HaskellImportKeywords ++
HaskellForeignKeywords ++ HaskellKeyword ++ HaskellStatic ++ HaskellConditional ++ HaskellInfix ++ HaskellBottom ++
HaskellTodo ++ HaskellTypeRoles ++ HaskellForall ++ HaskellRecursiveDo ++ HaskellArrowSyntax
@ -127,7 +127,7 @@ class HaskellCompletionContributor extends CompletionContributor {
val prefixText = (
for {
e <- positionElement
mie <- HaskellPsiUtil.findModIdElement(e)
mie <- HaskellPsiUtil.findModIdElement(e).orElse(HaskellPsiUtil.findQualifierElement(e))
start = mie.getTextRange.getStartOffset
end = parameters.getOffset
} yield psiFile.getText.substring(start, end)
@ -231,8 +231,7 @@ class HaskellCompletionContributor extends CompletionContributor {
def addCompletions(parameters: CompletionParameters, context: ProcessingContext, originalResultSet: CompletionResultSet): Unit = {
ProgressManager.checkCanceled()
val project = parameters.getOriginalPosition.getProject
val project = parameters.getOriginalFile.getProject
if (StackProjectManager.isInitializing(project)) {
HaskellEditorUtil.showHaskellSupportIsNotAvailableWhileInitializing(project)
} else {

7
src/main/scala/intellij/haskell/psi/HaskellPsiUtil.scala
View File

@ -58,6 +58,13 @@ object HaskellPsiUtil {
}
}
def findQualifierElement(psiElement: PsiElement): Option[HaskellQualifier] = {
psiElement match {
case e: HaskellQualifier => Some(e)
case e => Option(TreeUtil.findParent(e.getNode, HaskellTypes.HS_QUALIFIER)).map(_.getPsi.asInstanceOf[HaskellQualifier])
}
}
def findDataConstr(psiElement: PsiElement): Option[HaskellConstr] = {
psiElement match {
case e: HaskellConstr => Some(e)