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

fix hint update procedure in ParameterHintsPass

Browse Source 
make sure resulting hints have correct 'relatesToPrecedingText' flag state
This commit is contained in:
Dmitry Batrak
2017-08-23 16:31:27 +03:00
parent edb1be95ad
commit aa629f8539
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/hints/ParameterHintsUpdater.java
+6 -3
View File
@@ -73,7 +73,8 @@ public class ParameterHintsUpdater {
editorHints.forEach(editorHint -> {
int offset = editorHint.getOffset();
String presentationText = presentationManager.getHintText(editorHint);
ParameterHintsPass.HintData newHint = findAndRemoveMatchingHint(offset, presentationText, myNewHints);
ParameterHintsPass.HintData newHint = findAndRemoveMatchingHint(offset, presentationText, editorHint.isRelatedToPrecedingText(),
myNewHints);
String newText = newHint == null ? null : newHint.presentationText;
if (!myForceImmediateUpdate && delayRemoval(editorHint)) {
myEditor.putUserData(HINT_REMOVAL_DELAYED, Boolean.TRUE);
@@ -98,14 +99,16 @@ public class ParameterHintsUpdater {
}
@Nullable
private static ParameterHintsPass.HintData findAndRemoveMatchingHint(int offset, String presentationText,
private static ParameterHintsPass.HintData findAndRemoveMatchingHint(int offset, String presentationText, boolean relatesToPrecedingText,
TIntObjectHashMap<List<ParameterHintsPass.HintData>> data) {
List<ParameterHintsPass.HintData> newHintList = data.get(offset);
ParameterHintsPass.HintData newHint = null;
if (newHintList != null) {
ParameterHintsPass.HintData lastHint = null;
for (Iterator<ParameterHintsPass.HintData> iterator = newHintList.iterator(); iterator.hasNext(); ) {
lastHint = iterator.next();
ParameterHintsPass.HintData hint = iterator.next();
if (hint.relatesToPrecedingText != relatesToPrecedingText) continue;
lastHint = hint;
if (Objects.equals(lastHint.presentationText, presentationText)) {
newHint = lastHint;
iterator.remove();