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

1-to-1 mapping between Caret instances for injected and main editors (IDEA-80056)

Browse Source 
allows to compare Caret instances using == in generic code
This commit is contained in:
Dmitry Batrak
2014-02-25 12:12:45 +04:00
parent ff01b5b40c
commit c074bd25dc
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+1 -1
View File
@@ -628,7 +628,7 @@ public class CodeCompletionHandlerBase {
@Override
public void perform(Caret caret) {
CompletionAssertions.WatchingInsertionContext currentContext = insertItem(indicator, item, completionChar, items, update, editor, caret.getOffset(), caret.getOffset() + idEndOffsetDelta);
if (caret.getVisualPosition().equals(editor.getCaretModel().getPrimaryCaret().getVisualPosition())) {
if (caret == editor.getCaretModel().getPrimaryCaret()) {
contextRef.set(currentContext);
}
}
platform/lang-impl/src/com/intellij/injected/editor/CaretModelWindow.java
+13 -4
View File
@@ -26,9 +26,7 @@ import com.intellij.openapi.util.TextRange;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.*;
/**
* @author Alexey
@@ -37,6 +35,7 @@ public class CaretModelWindow implements CaretModel {
private final CaretModel myDelegate;
private final EditorEx myHostEditor;
private final EditorWindow myEditorWindow;
private final Map<Caret, InjectedCaret> myInjectedCaretMap = new WeakHashMap<Caret, InjectedCaret>();
public CaretModelWindow(CaretModel delegate, EditorWindow editorWindow) {
myDelegate = delegate;
@@ -219,7 +218,17 @@ public class CaretModelWindow implements CaretModel {
}
private InjectedCaret createInjectedCaret(Caret caret) {
return caret == null ? null : new InjectedCaret(myEditorWindow, caret);
if (caret == null) {
return null;
}
synchronized (myInjectedCaretMap) {
InjectedCaret injectedCaret = myInjectedCaretMap.get(caret);
if (injectedCaret == null) {
injectedCaret = new InjectedCaret(myEditorWindow, caret);
myInjectedCaretMap.put(caret, injectedCaret);
}
return injectedCaret;
}
}
@Override