MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

simplify CtrlMouseHandler (IDEA-CR-15401)

Browse Source
This commit is contained in:
peter
2016-11-07 12:58:45 +01:00
parent 16539dcb95
commit fb078ba936
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
+5 -15
View File
@@ -34,7 +34,6 @@ import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.actionSystem.impl.ActionButton;
import com.intellij.openapi.actionSystem.impl.PresentationFactory;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.components.AbstractProjectComponent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
@@ -444,25 +443,16 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
@Override
@NotNull
public DocInfo getInfo() {
return ReadAction.compute(() -> {
if (!myTargetElement.isValid() || !myElementAtPointer.isValid()) return DocInfo.EMPTY;
return areElementsValid() ? generateInfo(myTargetElement, myElementAtPointer, isNavigatable()) : DocInfo.EMPTY;
}
try {
return generateInfo(myTargetElement, myElementAtPointer, isNavigatable());
}
catch (IndexNotReadyException e) {
showDumbModeNotification(myTargetElement.getProject());
return DocInfo.EMPTY;
}
});
private boolean areElementsValid() {
return myTargetElement.isValid() && myElementAtPointer.isValid();
}
@Override
public boolean isValid(@NotNull Document document) {
if (!myTargetElement.isValid()) return false;
if (!myElementAtPointer.isValid()) return false;
return rangesAreCorrect(document);
return areElementsValid() && rangesAreCorrect(document);
}
@Override