Skip to content

Properly highlight query under cursor #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2017
Merged

Properly highlight query under cursor #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
23 changes: 15 additions & 8 deletions ...tbrains/plugin/graphdb/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
package com.neueda.jetbrains.plugin.graphdb.jetbrains.component.highlighter;

import org.jetbrains.annotations.NotNull;

import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.EditorFactory;
import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.highlighter.listener.QueryHighlighterCaretListener;
import org.jetbrains.annotations.NotNull;
import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.highlighter.listener.QueryHighlighterDocumentListener;

public class QueryHighlighterComponentImpl implements QueryHighlighterComponent {

private QueryHighlighterCaretListener queryHighlighterCaretListener;
//private QueryHighlighterDocumentListener queryHighlighterDocumentListener;
private QueryHighlighterDocumentListener queryHighlighterDocumentListener;
private SyncedElementHighlighter syncedElementHighlighter;

@Override
public void initComponent() {
EditorFactory editorFactory = ApplicationManager.getApplication().getComponent(EditorFactory.class);

queryHighlighterCaretListener = new QueryHighlighterCaretListener();
//queryHighlighterDocumentListener = new QueryHighlighterDocumentListener(editorFactory);
syncedElementHighlighter = new SyncedElementHighlighter();
queryHighlighterCaretListener = new QueryHighlighterCaretListener(syncedElementHighlighter);
queryHighlighterDocumentListener = new QueryHighlighterDocumentListener(syncedElementHighlighter, editorFactory);

editorFactory.getEventMulticaster().addCaretListener(queryHighlighterCaretListener);
//editorFactory.getEventMulticaster().addDocumentListener(queryHighlighterDocumentListener);
editorFactory.getEventMulticaster().addDocumentListener(queryHighlighterDocumentListener);
}

@Override
Expand All @@ -27,9 +31,12 @@ public void disposeComponent() {
if (queryHighlighterCaretListener != null) {
editorFactory.getEventMulticaster().removeCaretListener(queryHighlighterCaretListener);
}
//if (queryHighlighterDocumentListener != null) {
// editorFactory.getEventMulticaster().removeDocumentListener(queryHighlighterDocumentListener);
//}
if (queryHighlighterDocumentListener != null) {
editorFactory.getEventMulticaster().removeDocumentListener(queryHighlighterDocumentListener);
}
if (syncedElementHighlighter != null) {
syncedElementHighlighter.dispose();
}
}

@NotNull
Expand Down
70 changes: 70 additions & 0 deletions ...da/jetbrains/plugin/graphdb/jetbrains/component/highlighter/SyncedElementHighlighter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package com.neueda.jetbrains.plugin.graphdb.jetbrains.component.highlighter;

import java.awt.*;
import java.util.HashMap;
import java.util.Map;

import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.markup.*;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.ui.Colors;
import com.neueda.jetbrains.plugin.graphdb.jetbrains.psi.PsiTraversalUtilities;
import com.neueda.jetbrains.plugin.graphdb.platform.GraphLanguages;

public class SyncedElementHighlighter {

private final Map<Editor, RangeHighlighter> queryHighlights = new HashMap<>();

public void highlightStatement(Editor editor, PsiFile psiFile) {
if (psiFile == null) {
return;
}
if (psiFile.getLanguage().getID().equals(GraphLanguages.CYPHER)) {
highlightStatementInCypherFile(editor, psiFile);
}
// int offset = lastEditor.getCaretModel().getOffset();
// PsiElement parent = psiFile.findElementAt(offset);
// PsiElement inside = InjectedLanguageUtil.findInside(parent, psiFile, offset, PsiDocumentManager.getInstance(lastEditor.getProject()));
// PsiTraversalUtilities.getParentOfType(inside, CypherStatementItem.class);
// Editor e = InjectedLanguageUtil.getInjectedEditorForInjectedFile(lastEditor, lastEditor.getCaretModel().getPrimaryCaret(), null);
// PsiFile pf = PsiDocumentManager.getInstance(e.getProject()).getPsiFile(e.getDocument());
}

public void dispose() {
queryHighlights.clear();
}

private void highlightStatementInCypherFile(Editor editor, PsiFile psiFile) {
Caret caret = editor.getCaretModel().getPrimaryCaret();

PsiElement element = PsiTraversalUtilities.Cypher.getCypherStatementAtOffset(psiFile, caret.getOffset());
synchronized (this) {
if (queryHighlights.containsKey(editor)) {
editor.getMarkupModel().removeHighlighter(queryHighlights.get(editor));
queryHighlights.remove(editor);
}

if (element == null) {
return;
}

try {
RangeHighlighter rangeHighlighter = editor.getMarkupModel()
.addRangeHighlighter(
element.getTextOffset(),
element.getTextOffset() + element.getTextLength(),
HighlighterLayer.FIRST,
new TextAttributes(null, null, Colors.DARK_GREEN, EffectType.ROUNDED_BOX, Font.PLAIN),
HighlighterTargetArea.EXACT_RANGE);
queryHighlights.put(editor, rangeHighlighter);
} catch (Exception e) {
// Ignore exceptions here.
// Sometimes when we are adding range document already changed it's state
// TODO: find out how exactly we should handle such cases
}
}
}

}
55 changes: 0 additions & 55 deletions ...in/graphdb/jetbrains/component/highlighter/listener/AbstractQueryHighlighterListener.java
View file
Open in desktop

This file was deleted.

33 changes: 21 additions & 12 deletions ...lugin/graphdb/jetbrains/component/highlighter/listener/QueryHighlighterCaretListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,32 @@
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.highlighter.SyncedElementHighlighter;

public class QueryHighlighterCaretListener extends AbstractQueryHighlighterListener implements CaretListener {
public class QueryHighlighterCaretListener implements CaretListener {

public QueryHighlighterCaretListener() {
private final SyncedElementHighlighter syncedElementHighlighter;

public QueryHighlighterCaretListener(SyncedElementHighlighter syncedElementHighlighter) {
this.syncedElementHighlighter = syncedElementHighlighter;
}

@Override
public void caretPositionChanged(CaretEvent e) {
processEvent(e);
}

@Override
public void caretAdded(CaretEvent e) {
processEvent(e);
}

@Override
public void caretRemoved(CaretEvent e) {
processEvent(e);
}

private void processEvent(CaretEvent e) {
Editor editor = e.getEditor();
Project project = editor.getProject();
if (project == null) {
Expand All @@ -24,15 +42,6 @@ public void caretPositionChanged(CaretEvent e) {
Document document = editor.getDocument();
PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);

highlightStatement(editor, psiFile);
}


@Override
public void caretAdded(CaretEvent e) {
}

@Override
public void caretRemoved(CaretEvent e) {
syncedElementHighlighter.highlightStatement(editor, psiFile);
}
}
13 changes: 7 additions & 6 deletions ...in/graphdb/jetbrains/component/highlighter/listener/QueryHighlighterDocumentListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
package com.neueda.jetbrains.plugin.graphdb.jetbrains.component.highlighter.listener;

import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorFactory;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.editor.event.DocumentListener;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.highlighter.SyncedElementHighlighter;

/**
* Not works as expected. Disabled.
*/
public class QueryHighlighterDocumentListener extends AbstractQueryHighlighterListener implements DocumentListener {
public class QueryHighlighterDocumentListener implements DocumentListener {

private final SyncedElementHighlighter syncedElementHighlighter;
private final EditorFactory editorFactory;

public QueryHighlighterDocumentListener(EditorFactory editorFactory) {
public QueryHighlighterDocumentListener(SyncedElementHighlighter syncedElementHighlighter, EditorFactory editorFactory) {
this.syncedElementHighlighter = syncedElementHighlighter;
this.editorFactory = editorFactory;
}

Expand All @@ -34,7 +35,7 @@ public void documentChanged(DocumentEvent event) {
return;
}
PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
highlightStatement(editor, psiFile);
syncedElementHighlighter.highlightStatement(editor, psiFile);
}
}
}