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

EA-26030 reading from offset map may change it

Browse Source
This commit is contained in:
peter
2011-03-09 20:14:21 +01:00
parent 0926a405ae
commit 21c02a1e1b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+3 -2
View File
@@ -64,6 +64,7 @@ import com.intellij.util.concurrency.Semaphore;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
@@ -497,7 +498,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
final OffsetMap hostMap = new OffsetMap(hostEditor.getDocument());
final OffsetMap original = initContext.getOffsetMap();
for (final OffsetKey key : original.keySet()) {
for (final OffsetKey key : new ArrayList<OffsetKey>(original.keySet())) {
hostMap.addOffset(key, injectedLanguageManager.injectedToHost(fileCopy, original.getOffset(key)));
}
@@ -519,7 +520,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
EditorWindow injectedEditor = (EditorWindow)InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(hostEditor, hostFile, hostStartOffset);
assert injected == injectedEditor.getInjectedFile();
final OffsetMap map = new OffsetMap(injectedEditor.getDocument());
for (final OffsetKey key : hostMap.keySet()) {
for (final OffsetKey key : new ArrayList<OffsetKey>(hostMap.keySet())) {
map.addOffset(key, injectedEditor.logicalPositionToOffset(injectedEditor.hostToInjected(hostEditor.offsetToLogicalPosition(hostMap.getOffset(key)))));
}
context = new CompletionContext(initContext.getProject(), injectedEditor, injected, map);