ilyakooo0/intellij-haskell
1
0
Fork 0
mirror of https://github.com/ilyakooo0/intellij-haskell.git synced 2024-09-11 14:56:19 +03:00
Code Issues Projects Releases Wiki Activity

Also show type info when cursor is after identifier. Fix issue #405.

Browse Source
This commit is contained in:
Rik van der Kleij 2019-04-12 14:55:44 +02:00
parent 89465ca949
commit 9295038884
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/intellij/haskell/action/ShowTypeAction.scala
View File

@ -19,9 +19,10 @@ package intellij.haskell.action
import com.intellij.openapi.actionSystem.{AnAction, AnActionEvent}
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.psi.{PsiElement, PsiFile}
import com.intellij.psi.{PsiElement, PsiFile, TokenType}
import intellij.haskell.HaskellNotificationGroup
import intellij.haskell.external.component.{FileModuleIdentifiers, HaskellComponentsManager, StackProjectManager}
import intellij.haskell.psi.HaskellTypes.HS_NEWLINE
import intellij.haskell.psi._
import intellij.haskell.util.{HaskellEditorUtil, StringUtil}
@ -43,7 +44,7 @@ class ShowTypeAction extends AnAction {
case _ => HaskellEditorUtil.showHint(editor, "Could not determine type for selection")
}
case _ => ()
Option(psiFile.findElementAt(editor.getCaretModel.getOffset)).foreach { psiElement =>
Option(psiFile.findElementAt(editor.getCaretModel.getOffset)).filterNot(e => e.getNode.getElementType == HS_NEWLINE || e.getNode.getElementType == TokenType.WHITE_SPACE).orElse(Option(psiFile.findElementAt(editor.getCaretModel.getOffset - 1))).foreach { psiElement =>
ShowTypeAction.showTypeAsHint(actionContext.project, editor, psiElement, psiFile)
}
}