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-104721 - assert: InlayModelWindow.logUnsupported

Browse Source
This commit is contained in:
Dmitry Batrak
2018-08-20 14:32:57 +03:00
parent c96233b030
commit 6dcda70629
3 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
+18 -9
View File
@@ -383,11 +383,7 @@ public class ParameterInfoController extends UserDataHolderBase implements Visib
if (!myHint.isVisible()) AutoPopupController.getInstance(myProject).autoPopupParameterInfo(myEditor, null);
offset = adjustOffsetToInlay(offset);
VisualPosition visualPosition = myEditor.offsetToVisualPosition(offset);
if (myEditor.getInlayModel().hasInlineElementAt(visualPosition)) {
visualPosition = new VisualPosition(visualPosition.line, visualPosition.column + 1);
}
myEditor.getCaretModel().moveToVisualPosition(visualPosition);
myEditor.getCaretModel().moveToOffset(offset);
myEditor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
myEditor.getSelectionModel().removeSelection();
if (argsList != null) {
@@ -397,11 +393,24 @@ public class ParameterInfoController extends UserDataHolderBase implements Visib
private int adjustOffsetToInlay(int offset) {
CharSequence text = myEditor.getDocument().getImmutableCharSequence();
int whitespaceStart = CharArrayUtil.shiftBackward(text, offset, WHITESPACE) + 1;
int whitespaceEnd = CharArrayUtil.shiftForward(text, offset, WHITESPACE);
List<Inlay> inlays = myEditor.getInlayModel().getInlineElementsInRange(whitespaceStart, whitespaceEnd);
int hostWhitespaceStart = CharArrayUtil.shiftBackward(text, offset, WHITESPACE) + 1;
int hostWhitespaceEnd = CharArrayUtil.shiftForward(text, offset, WHITESPACE);
Editor hostEditor = myEditor;
if (myEditor instanceof EditorWindow) {
hostEditor = ((EditorWindow)myEditor).getDelegate();
hostWhitespaceStart = ((EditorWindow)myEditor).getDocument().injectedToHost(hostWhitespaceStart);
hostWhitespaceEnd = ((EditorWindow)myEditor).getDocument().injectedToHost(hostWhitespaceEnd);
}
List<Inlay> inlays = hostEditor.getInlayModel().getInlineElementsInRange(hostWhitespaceStart, hostWhitespaceEnd);
for (Inlay inlay : inlays) {
if (ParameterHintsPresentationManager.getInstance().isParameterHint(inlay)) return inlay.getOffset();
if (ParameterHintsPresentationManager.getInstance().isParameterHint(inlay)) {
int inlayOffset = inlay.getOffset();
if (myEditor instanceof EditorWindow) {
if (((EditorWindow)myEditor).getDocument().getHostRange(inlayOffset) == null) continue;
inlayOffset = ((EditorWindow)myEditor).getDocument().hostToInjected(inlayOffset);
}
return inlayOffset;
}
}
return offset;
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
+15 -9
View File
@@ -27,7 +27,6 @@ import com.intellij.openapi.util.UserDataHolderBase;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.DocumentUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.diff.FilesTooBigForDiffException;
import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NonNls;
@@ -122,14 +121,12 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
return;
}
myEditor.getCaretModel().doWithCaretMerging(() -> {
List<Inlay> inlaysAtOffset = myEditor.getInlayModel().getInlineElementsInRange(offset, offset);
boolean leanForward = ContainerUtil.find(inlaysAtOffset, inlay -> !inlay.isRelatedToPrecedingText()) != null;
LogicalPosition logicalPosition = myEditor.offsetToLogicalPosition(offset).leanForward(leanForward);
CaretEvent event = moveToLogicalPosition(logicalPosition, locateBeforeSoftWrap, null, false);
LogicalPosition logicalPosition = myEditor.offsetToLogicalPosition(offset);
CaretEvent event = moveToLogicalPosition(logicalPosition, locateBeforeSoftWrap, null, true, false);
final LogicalPosition positionByOffsetAfterMove = myEditor.offsetToLogicalPosition(getOffset());
if (!positionByOffsetAfterMove.equals(logicalPosition)) {
StringBuilder debugBuffer = new StringBuilder();
moveToLogicalPosition(logicalPosition, locateBeforeSoftWrap, debugBuffer, true);
moveToLogicalPosition(logicalPosition, locateBeforeSoftWrap, debugBuffer, true, true);
int actualOffset = getOffset();
int textStart = Math.max(0, Math.min(offset, actualOffset) - 1);
final DocumentEx document = myEditor.getDocument();
@@ -348,13 +345,14 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
@Override
public void moveToLogicalPosition(@NotNull final LogicalPosition pos) {
myEditor.getCaretModel().doWithCaretMerging(() -> moveToLogicalPosition(pos, false, null, true));
myEditor.getCaretModel().doWithCaretMerging(() -> moveToLogicalPosition(pos, false, null, false, true));
}
private CaretEvent doMoveToLogicalPosition(@NotNull LogicalPosition pos,
boolean locateBeforeSoftWrap,
@NonNls @Nullable StringBuilder debugBuffer,
boolean adjustForInlays,
boolean fireListeners) {
assertIsDispatchThread();
updateCachedStateIfNeeded();
@@ -449,6 +447,13 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
debugBuffer.append("Storing offset ").append(newOffset).append(" (mapped from logical position ").append(myLogicalCaret).append(")\n");
}
if (adjustForInlays) {
VisualPosition correctPosition = EditorUtil.inlayAwareOffsetToVisualPosition(myEditor, newOffset);
assert correctPosition.line == myVisibleCaret.line;
myVisualColumnAdjustment = correctPosition.column - myVisibleCaret.column;
myVisibleCaret = correctPosition;
}
updateVisualLineInfo();
myEditor.updateCaretCursor();
@@ -604,6 +609,7 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
CaretEvent moveToLogicalPosition(@NotNull LogicalPosition pos,
boolean locateBeforeSoftWrap,
@Nullable StringBuilder debugBuffer,
boolean adjustForInlays,
boolean fireListeners) {
if (mySkipChangeRequests) {
return null;
@@ -617,7 +623,7 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
myReportCaretMoves = true;
try {
return doMoveToLogicalPosition(pos, locateBeforeSoftWrap, debugBuffer, fireListeners);
return doMoveToLogicalPosition(pos, locateBeforeSoftWrap, debugBuffer, adjustForInlays, fireListeners);
}
finally {
myReportCaretMoves = false;
@@ -859,7 +865,7 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
newSelectionStartColumn = -1;
newSelectionEndColumn = -1;
}
clone.moveToLogicalPosition(new LogicalPosition(newLine, myLastColumnNumber), false, null, false);
clone.moveToLogicalPosition(new LogicalPosition(newLine, myLastColumnNumber), false, null, false, false);
clone.myLastColumnNumber = myLastColumnNumber;
clone.myDesiredX = myDesiredX >= 0 ? myDesiredX : getCurrentX();
clone.myDesiredSelectionStartColumn = newSelectionStartColumn;
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
+1 -1
View File
@@ -474,7 +474,7 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener,
else {
caret = new CaretImpl(myEditor);
if (caretState != null && caretState.getCaretPosition() != null) {
caret.moveToLogicalPosition(caretState.getCaretPosition(), false, null, false);
caret.moveToLogicalPosition(caretState.getCaretPosition(), false, null, false, false);
}
synchronized (myCarets) {
myCarets.add(caret);