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

navigate to the end of parameter with Tab/Shift+Tab

Browse Source 
this seems to work better with completion hints - when returning to just entered previous parameter one expects to find caret where it was before, most of the time it will be the end of parameter text
This commit is contained in:
Dmitry Batrak
2018-01-12 19:08:03 +03:00
parent f1ffe63063
commit f4bc4a9e42
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/CompletionHintsTest.java
+1 -1
View File
@@ -346,7 +346,7 @@ public class CompletionHintsTest extends LightFixtureCompletionTestCase {
next();
prev();
waitForAllAsyncStuff();
checkResultWithInlays("class C { void m() { System.getProperty(<Hint text=\"key:\"/>\"a\", <HINT text=\"def:\"/><caret>\"b\") } }");
checkResultWithInlays("class C { void m() { System.getProperty(<Hint text=\"key:\"/>\"a\", <HINT text=\"def:\"/>\"b\"<caret>) } }");
}
public void testVararg() throws Exception {
platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
+17 -8
View File
@@ -1,4 +1,6 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
/*
* Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
package com.intellij.codeInsight.hint;
@@ -63,6 +65,7 @@ import java.util.concurrent.locks.LockSupport;
public class ParameterInfoController implements Disposable {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.hint.ParameterInfoController");
private static final String WHITESPACE = " \t";
private final Project myProject;
@NotNull private final Editor myEditor;
@@ -299,7 +302,7 @@ public class ParameterInfoController implements Disposable {
((ParameterInfoHandlerWithTabActionSupport)myHandler).getActualParameterDelimiterType() == TokenType.WHITE_SPACE;
int caretOffset = myEditor.getCaretModel().getOffset();
final int offset = noDelimiter ? caretOffset :
CharArrayUtil.shiftBackward(chars, caretOffset - 1, " \t") + 1;
CharArrayUtil.shiftBackward(chars, caretOffset - 1, WHITESPACE) + 1;
final UpdateParameterInfoContext context = new MyUpdateParameterInfoContext(offset, file);
final Object elementForUpdating = myHandler.findElementForUpdatingParameterInfo(context);
@@ -382,9 +385,8 @@ public class ParameterInfoController implements Disposable {
private int adjustOffsetToInlay(int offset) {
CharSequence text = myEditor.getDocument().getImmutableCharSequence();
String whitespaceChars = " \t";
int whitespaceStart = CharArrayUtil.shiftBackward(text, offset, whitespaceChars) + 1;
int whitespaceEnd = CharArrayUtil.shiftForward(text, offset, whitespaceChars);
int whitespaceStart = CharArrayUtil.shiftBackward(text, offset, WHITESPACE) + 1;
int whitespaceEnd = CharArrayUtil.shiftForward(text, offset, WHITESPACE);
List<Inlay> inlays = myEditor.getInlayModel().getInlineElementsInRange(whitespaceStart, whitespaceEnd);
for (Inlay inlay : inlays) {
if (ParameterHintsPresentationManager.getInstance().isParameterHint(inlay)) return inlay.getOffset();
@@ -398,7 +400,8 @@ public class ParameterInfoController implements Disposable {
boolean noDelimiter = handler.getActualParameterDelimiterType() == TokenType.WHITE_SPACE;
int caretOffset = myEditor.getCaretModel().getOffset();
int offset = noDelimiter ? caretOffset : CharArrayUtil.shiftBackward(myEditor.getDocument().getCharsSequence(), caretOffset - 1, " \t") + 1;
CharSequence text = myEditor.getDocument().getImmutableCharSequence();
int offset = noDelimiter ? caretOffset : CharArrayUtil.shiftBackward(text, caretOffset - 1, WHITESPACE) + 1;
int lbraceOffset = myLbraceMarker.getStartOffset();
PsiFile file = PsiDocumentManager.getInstance(myProject).getPsiFile(myEditor.getDocument());
PsiElement argList = lbraceOffset < offset ? findArgumentList(file, offset, lbraceOffset) : null;
@@ -417,8 +420,7 @@ public class ParameterInfoController implements Disposable {
return (parameterOwner != null && parameterOwner.isValid()) ? parameterOwner.getTextRange().getEndOffset() : -1;
}
else {
int startOffset = parameters[prevOrNextParameterIndex].getTextRange().getStartOffset();
return CharArrayUtil.shiftForward(myEditor.getDocument().getImmutableCharSequence(), startOffset, " \t");
return getParameterNavigationOffset(parameters[prevOrNextParameterIndex], text);
}
}
else {
@@ -428,6 +430,13 @@ public class ParameterInfoController implements Disposable {
}
}
private static int getParameterNavigationOffset(@NotNull PsiElement parameter, @NotNull CharSequence text) {
int rangeStart = parameter.getTextRange().getStartOffset();
int rangeEnd = parameter.getTextRange().getEndOffset();
int offset = CharArrayUtil.shiftBackward(text, rangeEnd - 1, WHITESPACE) + 1;
return offset > rangeStart ? offset : CharArrayUtil.shiftForward(text, rangeEnd, WHITESPACE);
}
@Nullable
public static <E extends PsiElement> E findArgumentList(PsiFile file, int offset, int lbraceOffset){
if (file == null) return null;