Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further changes to error completion proposal

Browse Source
This commit is contained in:
nsingh
2017-01-19 14:15:27 -08:00
parent 6ce2947663
commit d479de3da7
3 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/CompletionFactory.java
View File

@@ -33,8 +33,7 @@ public interface CompletionFactory {
* @param query
* @param type
* @param edits
* @param typeUtil
* @return
* @return non-null proposal
*/
ICompletionProposal errorMessage(String message, String query, YType type, DocumentEdits edits, YTypeUtil typeUtil);
ICompletionProposal errorMessage(String message, String query, YType type, DocumentEdits edits);
}

46
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/DefaultCompletionFactory.java
View File

@@ -15,7 +15,6 @@ import org.eclipse.lsp4j.CompletionItemKind;
import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits;
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
import org.springframework.ide.vscode.commons.languageserver.completion.ScoreableProposal;
import org.springframework.ide.vscode.commons.util.FuzzyMatcher;
import org.springframework.ide.vscode.commons.util.Renderable;
import org.springframework.ide.vscode.commons.util.text.IDocument;
import org.springframework.ide.vscode.commons.yaml.hover.YPropertyInfoTemplates;
@@ -25,6 +24,9 @@ import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty;
public class DefaultCompletionFactory implements CompletionFactory {
private static final String EMPTY_VALUE = "";
private static final int ERROR_COMPLETION_SCORE = -10000000;
public static class BeanPropertyProposal extends ScoreableProposal {
private IDocument doc;
@@ -146,10 +148,42 @@ public class DefaultCompletionFactory implements CompletionFactory {
}
@Override
public ICompletionProposal errorMessage(String message, String query, YType type, DocumentEdits edits,
YTypeUtil typeUtil) {
String value = ""; // Empty value for the proposal. Purpose is to show a message with no value to fill in.
double score = FuzzyMatcher.matchScore(query, value);
return new ValueProposal(value, query, message, type, score, edits, typeUtil);
public ICompletionProposal errorMessage(String message, String query, YType type, DocumentEdits edits) {
final String value = EMPTY_VALUE; // Empty value for the proposal. Purpose is to show a message with no value to fill in.
final double score = ERROR_COMPLETION_SCORE;
final Renderable documentation = null;
final String niceDescription = message;
return new ScoreableProposal() {
@Override
public DocumentEdits getTextEdit() {
return edits;
}
@Override
public String getLabel() {
return value;
}
@Override
public CompletionItemKind getKind() {
return CompletionItemKind.Value;
}
@Override
public Renderable getDocumentation() {
return documentation;
}
@Override
public String getDetail() {
return niceDescription;
}
@Override
public double getBaseScore() {
return score;
}
};
}
}

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
View File

@@ -155,7 +155,7 @@ public class YTypeAssistContext extends AbstractYamlAssistContext {
values = typeUtil.getHintValues(type, getSchemaContext());
} catch (Exception e) {
DocumentEdits edits = new DocumentEdits(doc.getDocument());
return ImmutableList.of(completionFactory().errorMessage(ExceptionUtil.getMessage(e), query, type, edits, typeUtil));
return ImmutableList.of(completionFactory().errorMessage(ExceptionUtil.getMessage(e), query, type, edits));
}
if (values!=null) {
ArrayList<ICompletionProposal> completions = new ArrayList<>();