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 too strict hints offset condition

Browse Source 
Required for RUBY-20196, see `ParamHintsTest.testRestAndBlock`
This commit is contained in:
Valentin Fondaratov
2017-10-03 15:13:14 +03:00
parent 6f06345c4a
commit b80a89e36d
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/hints/ParameterHintsPass.java
+17 -2
View File
@@ -94,8 +94,8 @@ public class ParameterHintsPass extends EditorBoundHighlightingPass {
inlays.forEach((hint) -> {
int offset = hint.getOffset();
TextRange rootRange = myRootElement.getTextRange();
if (offset <= rootRange.getStartOffset() || offset >= rootRange.getEndOffset()) return;
if (!canShowHintsAtOffset(offset)) return;
String presentation = provider.getInlayPresentation(hint.getText());
if (hint.isShowOnlyIfExistedBefore()) {
myShowOnlyIfExistedBeforeHints.put(offset, presentation);
@@ -138,6 +138,21 @@ public class ParameterHintsPass extends EditorBoundHighlightingPass {
return ContainerUtil.filter(inlays, (hint) -> manager.isParameterHint(hint));
}
/**
* Adding hints on the borders of root element (at startOffset or endOffset)
* is allowed only in the case when root element is a document
*
* @return true iff a given offset can be used for hint rendering
*/
private boolean canShowHintsAtOffset(int offset) {
TextRange rootRange = myRootElement.getTextRange();
if (!rootRange.containsOffset(offset)) return false;
if (offset > rootRange.getStartOffset() && offset < rootRange.getEndOffset()) return true;
return myDocument != null && myDocument.getTextLength() == rootRange.getLength();
}
public static class HintData {
public final String presentationText;