mirror of
https://github.com/hexedtech/codemp-intellij.git
synced 2024-11-22 07:04:49 +01:00
feat: implemented JoinAction, sending/receiving cursor position
This commit is contained in:
parent
a2d346d11c
commit
5622cf64f3
4 changed files with 157 additions and 5 deletions
|
@ -4,20 +4,32 @@ import com.codemp.intellij.jni.CodeMPHandler;
|
||||||
import com.intellij.openapi.actionSystem.AnAction;
|
import com.intellij.openapi.actionSystem.AnAction;
|
||||||
import com.intellij.openapi.actionSystem.AnActionEvent;
|
import com.intellij.openapi.actionSystem.AnActionEvent;
|
||||||
import com.intellij.openapi.ui.Messages;
|
import com.intellij.openapi.ui.Messages;
|
||||||
|
import cz.adamh.utils.NativeUtils;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
public class ConnectAction extends AnAction {
|
public class ConnectAction extends AnAction {
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
/*try {
|
||||||
|
NativeUtils.loadLibraryFromJar("/resources/libHelloJNI.so");
|
||||||
|
} catch(IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}*/
|
||||||
System.load("O:/dev/IRL/Rust/codemp/client/intellij/target/debug/codemp_intellij.dll");
|
System.load("O:/dev/IRL/Rust/codemp/client/intellij/target/debug/codemp_intellij.dll");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(@NotNull AnActionEvent e) {
|
public void actionPerformed(@NotNull AnActionEvent e) {
|
||||||
String url = Messages.showInputDialog("URL to CodeMP instance:", "CodeMP", Messages.getQuestionIcon());
|
String url = Messages.showInputDialog("URL to CodeMP instance:", "CodeMP Connect", Messages.getQuestionIcon());
|
||||||
|
if(url == null || url.isBlank())
|
||||||
|
url = "http://alemi.dev:50051";
|
||||||
|
|
||||||
try {
|
try {
|
||||||
CodeMPHandler.connect(url);
|
CodeMPHandler.connect(url);
|
||||||
Messages.showInfoMessage(String.format("Connected to %s!", url), "CodeMP");
|
//Messages.showInfoMessage(String.format("Connected to %s!", url), "CodeMP");
|
||||||
|
System.out.printf("Connected to %s!%n", url);
|
||||||
} catch(Exception ex) {
|
} catch(Exception ex) {
|
||||||
Messages.showErrorDialog(String.format("Failed to connect to %s: %s!", url, ex.getMessage()), "CodeMP");
|
Messages.showErrorDialog(String.format("Failed to connect to %s: %s!", url, ex.getMessage()), "CodeMP");
|
||||||
}
|
}
|
||||||
|
|
106
src/main/java/com/codemp/intellij/actions/JoinAction.java
Normal file
106
src/main/java/com/codemp/intellij/actions/JoinAction.java
Normal file
|
@ -0,0 +1,106 @@
|
||||||
|
package com.codemp.intellij.actions;
|
||||||
|
|
||||||
|
import com.codemp.intellij.jni.CodeMPHandler;
|
||||||
|
import com.codemp.intellij.jni.CursorEventWrapper;
|
||||||
|
import com.codemp.intellij.jni.CursorHandler;
|
||||||
|
import com.codemp.intellij.listeners.CursorEventListener;
|
||||||
|
import com.intellij.openapi.actionSystem.AnAction;
|
||||||
|
import com.intellij.openapi.actionSystem.AnActionEvent;
|
||||||
|
import com.intellij.openapi.application.ApplicationManager;
|
||||||
|
import com.intellij.openapi.editor.Document;
|
||||||
|
import com.intellij.openapi.editor.Editor;
|
||||||
|
import com.intellij.openapi.editor.EditorFactory;
|
||||||
|
import com.intellij.openapi.editor.colors.TextAttributesKey;
|
||||||
|
import com.intellij.openapi.editor.markup.HighlighterLayer;
|
||||||
|
import com.intellij.openapi.editor.markup.HighlighterTargetArea;
|
||||||
|
import com.intellij.openapi.editor.markup.RangeHighlighter;
|
||||||
|
import com.intellij.openapi.editor.markup.TextAttributes;
|
||||||
|
import com.intellij.openapi.fileEditor.FileEditorManager;
|
||||||
|
import com.intellij.openapi.progress.ProgressIndicator;
|
||||||
|
import com.intellij.openapi.progress.ProgressManager;
|
||||||
|
import com.intellij.openapi.progress.Task;
|
||||||
|
import com.intellij.openapi.ui.Messages;
|
||||||
|
import com.intellij.ui.JBColor;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class JoinAction extends AnAction {
|
||||||
|
|
||||||
|
private final Map<String, RangeHighlighter> highlighterMap = new HashMap<>();
|
||||||
|
|
||||||
|
private static final TextAttributes HIGHLIGHTED = new TextAttributes(
|
||||||
|
null, JBColor.BLUE, null, null, Font.PLAIN
|
||||||
|
);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void actionPerformed(@NotNull AnActionEvent e) {
|
||||||
|
String session = Messages.showInputDialog(
|
||||||
|
"Session to connect to:",
|
||||||
|
"CodeMP Join",
|
||||||
|
Messages.getQuestionIcon());
|
||||||
|
if(session == null || session.isBlank())
|
||||||
|
session = "default";
|
||||||
|
|
||||||
|
try {
|
||||||
|
CursorHandler cursorHandler = CodeMPHandler.join(session);
|
||||||
|
EditorFactory.getInstance()
|
||||||
|
.getEventMulticaster()
|
||||||
|
.addCaretListener(new CursorEventListener());
|
||||||
|
//Messages.showInfoMessage(String.format("Joined %s!", session), "CodeMP");
|
||||||
|
System.out.printf(String.format("Joined %s!", session));
|
||||||
|
Editor editor = FileEditorManager.getInstance(Objects.requireNonNull(e.getProject()))
|
||||||
|
.getSelectedTextEditor();
|
||||||
|
assert editor != null;
|
||||||
|
Document document = editor.getDocument();
|
||||||
|
ProgressManager.getInstance().run(new Task.Backgroundable(e.getProject(), "Awaiting CodeMP cursor events") {
|
||||||
|
@Override
|
||||||
|
public void run(@NotNull ProgressIndicator indicator) {
|
||||||
|
while(true) {
|
||||||
|
try {
|
||||||
|
CursorEventWrapper event = cursorHandler.recv();
|
||||||
|
ApplicationManager.getApplication().invokeLater(() -> {
|
||||||
|
try {
|
||||||
|
RangeHighlighter h = highlighterMap.get(event.getUser());
|
||||||
|
if(h != null)
|
||||||
|
h.dispose();
|
||||||
|
|
||||||
|
System.out.printf(
|
||||||
|
"Cursor moved by user %s! Start pos: x%d y%d; end pos: x%d y%d with buffer %s%n\n",
|
||||||
|
event.getUser(),
|
||||||
|
event.getStartCol(), event.getStartCol(),
|
||||||
|
event.getEndRow(), event.getEndCol(),
|
||||||
|
event.getBuffer());
|
||||||
|
|
||||||
|
highlighterMap.put(event.getUser(), editor
|
||||||
|
.getMarkupModel()
|
||||||
|
.addRangeHighlighter(TextAttributesKey.createTextAttributesKey("codemp", HIGHLIGHTED),
|
||||||
|
document.getLineStartOffset(event.getStartRow()) + event.getStartCol(),
|
||||||
|
document.getLineStartOffset(event.getEndRow()) + event.getEndCol(),
|
||||||
|
HighlighterLayer.SELECTION,
|
||||||
|
HighlighterTargetArea.EXACT_RANGE
|
||||||
|
));
|
||||||
|
} catch(Exception ex) {
|
||||||
|
throw new RuntimeException();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch(Exception ex) {
|
||||||
|
throw new RuntimeException(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch(Exception ex) {
|
||||||
|
Messages.showErrorDialog(String.format(
|
||||||
|
"Failed to join session %s: %s!",
|
||||||
|
session,
|
||||||
|
ex.getMessage()),
|
||||||
|
"CodeMP Join");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,31 @@
|
||||||
|
package com.codemp.intellij.listeners;
|
||||||
|
|
||||||
|
import com.codemp.intellij.jni.CodeMPHandler;
|
||||||
|
import com.intellij.openapi.editor.Caret;
|
||||||
|
import com.intellij.openapi.editor.EditorFactory;
|
||||||
|
import com.intellij.openapi.editor.VisualPosition;
|
||||||
|
import com.intellij.openapi.editor.event.CaretEvent;
|
||||||
|
import com.intellij.openapi.editor.event.CaretListener;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
public class CursorEventListener implements CaretListener {
|
||||||
|
@Override
|
||||||
|
public void caretPositionChanged(@NotNull CaretEvent event) {
|
||||||
|
System.out.println("called!");
|
||||||
|
Caret caret = event.getCaret();
|
||||||
|
if(caret == null)
|
||||||
|
return;
|
||||||
|
System.out.println("valid caret!");
|
||||||
|
|
||||||
|
try {
|
||||||
|
VisualPosition startPos = caret.getSelectionStartPosition();
|
||||||
|
VisualPosition endPos = caret.getSelectionEndPosition();
|
||||||
|
System.out.printf("start %dx %dy end %dx %dy", startPos.line, startPos.column, endPos.line, endPos.column);
|
||||||
|
CodeMPHandler.getCursor().send(
|
||||||
|
"", startPos.line, startPos.column, endPos.line, endPos.column
|
||||||
|
);
|
||||||
|
} catch(Exception ex) {
|
||||||
|
throw new RuntimeException(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -23,10 +23,13 @@
|
||||||
<depends>com.intellij.modules.platform</depends>
|
<depends>com.intellij.modules.platform</depends>
|
||||||
|
|
||||||
<actions>
|
<actions>
|
||||||
<action id="connect" class="com.codemp.intellij.actions.ConnectAction" text="Connect">
|
<action id="codemp-connect" class="com.codemp.intellij.actions.ConnectAction" text="CodeMP Connect">
|
||||||
<add-to-group group-id="ToolsMenu" anchor="first"></add-to-group>
|
<add-to-group group-id="ToolsMenu" anchor="first"></add-to-group>
|
||||||
</action>
|
</action>
|
||||||
</actions>
|
<action id="codemp-join" class="com.codemp.intellij.actions.JoinAction" text="CodeMP Join">
|
||||||
|
<add-to-group group-id="ToolsMenu" anchor="first"></add-to-group>
|
||||||
|
</action>
|
||||||
|
</actions>
|
||||||
|
|
||||||
<!-- Extension points defined by the plugin.
|
<!-- Extension points defined by the plugin.
|
||||||
Read more: https://plugins.jetbrains.com/docs/intellij/plugin-extension-points.html -->
|
Read more: https://plugins.jetbrains.com/docs/intellij/plugin-extension-points.html -->
|
||||||
|
|
Loading…
Reference in a new issue