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

more cleaning; switching to elementName instead of html parse (needs test)

Browse Source
This commit is contained in:
Ben Fry
2018-03-26 16:59:45 -04:00
parent 47a44983aa
commit 196a367449
2 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
java/src/processing/mode/java/pdex/CompletionCandidate.java
View File

@@ -53,8 +53,15 @@ public class CompletionCandidate implements Comparable<CompletionCandidate> {
method.getDeclaringClass().getName();
elementName = method.getName();
StringBuilder labelBuilder = new StringBuilder("<html>"+method.getName() + "(");
StringBuilder compBuilder = new StringBuilder(method.getName() + "(");
StringBuilder labelBuilder = new StringBuilder();
labelBuilder.append("<html>");
labelBuilder.append(elementName);
labelBuilder.append('(');
StringBuilder compBuilder = new StringBuilder();
compBuilder.append(elementName);
compBuilder.append('(');
Class<?>[] types = method.getParameterTypes();
for (int i = 0; i < types.length; i++) {
labelBuilder.append(types[i].getSimpleName());
@@ -66,14 +73,16 @@ public class CompletionCandidate implements Comparable<CompletionCandidate> {
if (types.length == 1) {
compBuilder.append(' ');
}
labelBuilder.append(")");
compBuilder.append(")");
labelBuilder.append(")");
if (method.getReturnType() != null) {
labelBuilder.append(" : " + method.getReturnType().getSimpleName());
}
labelBuilder.append(" - <font color=#777777>" + method.getDeclaringClass().getSimpleName() + "</font></html>");
labelBuilder.append(" - <font color=#777777>");
labelBuilder.append(method.getDeclaringClass().getSimpleName());
labelBuilder.append("</font></html>");
compBuilder.append(")");
label = labelBuilder.toString();
completion = compBuilder.toString();
@@ -145,21 +154,20 @@ public class CompletionCandidate implements Comparable<CompletionCandidate> {
f.getDeclaringClass().getName();
elementName = f.getName();
type = PREDEF_FIELD;
label = "<html>" + f.getName() + " : " + f.getType().getSimpleName() +
" - <font color=#777777>" + f.getDeclaringClass().getSimpleName() +
"</font></html>";
label = "<html>" +
f.getName() + " : " +
f.getType().getSimpleName() + " - " +
"<font color=#777777>" +
f.getDeclaringClass().getSimpleName() +
"</font></html>";
completion = elementName;
wrappedObject = f;
}
public CompletionCandidate(String name, String label, String completion, int type) {
this(name, label, completion, type, null);
}
public CompletionCandidate(String name, int type) {
this(name, name, name, type, null);
CompletionCandidate(String elementName, String label,
String completion, int type) {
this(elementName, label, completion, type, null);
}
@@ -189,11 +197,6 @@ public class CompletionCandidate implements Comparable<CompletionCandidate> {
}
public String toString() {
return label;
}
public int getType() {
return type;
}
@@ -204,12 +207,13 @@ public class CompletionCandidate implements Comparable<CompletionCandidate> {
}
public String getNoHtmlLabel(){
// TODO this is gross [fry 180326]
/*
private String getNoHtmlLabel(){
if (!label.contains("<html>")) {
return label;
} else {
// TODO this is gross [fry 180326]
StringBuilder ans = new StringBuilder(label);
while (ans.indexOf("<") > -1) {
int a = ans.indexOf("<"), b = ans.indexOf(">");
@@ -219,25 +223,26 @@ public class CompletionCandidate implements Comparable<CompletionCandidate> {
return ans.toString();
}
}
*/
public CompletionCandidate withLabelAndCompString(String label,
String completion) {
return new CompletionCandidate(this.elementName, label, completion,
this.type, this.wrappedObject);
boolean startsWith(String newWord) {
// System.out.println("checking " + newWord);
// return getNoHtmlLabel().toLowerCase().startsWith(newWord);
// this seems to be elementName in all cases [fry 180326]
return elementName.startsWith(newWord);
}
@Override
public int compareTo(CompletionCandidate cc) {
if (type != cc.getType()) {
return cc.getType() - type;
}
return elementName.compareTo(cc.getElementName());
CompletionCandidate withLabelAndCompString(String withLabel,
String withCompletion) {
return new CompletionCandidate(elementName,
withLabel, withCompletion,
type, wrappedObject);
}
public CompletionCandidate withRegeneratedCompString() {
CompletionCandidate withRegeneratedCompString() {
if (wrappedObject instanceof MethodDeclaration) {
MethodDeclaration method = (MethodDeclaration)wrappedObject;
@@ -295,4 +300,18 @@ public class CompletionCandidate implements Comparable<CompletionCandidate> {
// fall-through silently does nothing? [fry 180326]
return this;
}
@Override
public int compareTo(CompletionCandidate cc) {
if (type != cc.getType()) {
return cc.getType() - type;
}
return elementName.compareTo(cc.getElementName());
}
public String toString() {
return label;
}
}

3
java/src/processing/mode/java/pdex/CompletionGenerator.java
View File

@@ -1713,7 +1713,8 @@ public class CompletionGenerator {
ArrayList<CompletionCandidate> newCandidate = new ArrayList<>();
newWord = newWord.toLowerCase();
for (CompletionCandidate comp : candidates) {
if(comp.getNoHtmlLabel().toLowerCase().startsWith(newWord)){
//if (comp.getNoHtmlLabel().toLowerCase().startsWith(newWord)) {
if (comp.startsWith(newWord)) {
newCandidate.add(comp);
}
}