eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-14 02:45:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better caret positioning in CC

Browse Source
This commit is contained in:
Manindra Moharana
2014-08-09 11:17:53 +05:30
parent 51a671ae4f
commit 8ef7507bbd
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pdex/src/processing/mode/experimental/CompletionPanel.java
View File

@@ -313,6 +313,17 @@ public class CompletionPanel {
currentSubword = "";
}
String completionString = ((CompletionCandidate) completionList
.getSelectedValue()).getCompletionString();
if (selectedSuggestion.equals(" )")) { // the case of single param methods
selectedSuggestion = ")";
if (completionString.endsWith(" )")) {
completionString = completionString.substring(0, completionString
.length() - 2)
+ ")";
}
}
logE(subWord + " <= subword, Inserting suggestion=> "
+ selectedSuggestion + " Current sub: " + currentSubword);
if (currentSubword.length() > 0) {
@@ -322,16 +333,12 @@ public class CompletionPanel {
textarea.getDocument()
.insertString(insertionPosition - currentSubwordLen,
((CompletionCandidate) completionList
.getSelectedValue()).getCompletionString(), null);
if (selectedSuggestion.endsWith(")")) {
if (!selectedSuggestion.endsWith("()")) {
int x = selectedSuggestion.indexOf('(');
if (x != -1) {
//log("X................... " + x);
textarea.setCaretPosition(insertionPosition + (x + 1));
}
}
completionString, null);
if (selectedSuggestion.endsWith(")") && !selectedSuggestion.endsWith("()")) {
// place the caret between '( and first ','
int x = selectedSuggestion.indexOf(',');
if(x == -1) x = 0; // the case of single param methods, no ','
textarea.setCaretPosition(insertionPosition + x);
} else {
textarea.setCaretPosition(insertionPosition
+ selectedSuggestion.length());