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

Relaxing yaml proposals for '- '.

Browse Source
This commit is contained in:
Kris De Volder
2017-04-25 18:08:05 -07:00
parent 347ad2a653
commit b866649a3d
16 changed files with 422 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/AbstractPropertyProposal.java
View File

@@ -77,8 +77,7 @@ public abstract class AbstractPropertyProposal extends ScoreableProposal {
}
public void deprecate() {
if (!isDeprecated()) {
deemphasize();
deemphasize();
deemphasize(DEEMP_DEPRECATION);
isDeprecated = true;
}
}

9
headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java
View File

@@ -13,6 +13,7 @@ package org.springframework.ide.vscode.boot.properties.quickfix;
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.Renderable;
public class ReplaceDeprecatedPropertyQuickfix implements ICompletionProposal {
@@ -29,10 +30,6 @@ public class ReplaceDeprecatedPropertyQuickfix implements ICompletionProposal {
// }
// };
@Override
public ICompletionProposal deemphasize() {
throw new UnsupportedOperationException("Not yet implemented");
}
@Override
public String getLabel() {
throw new UnsupportedOperationException("Not yet implemented");
@@ -53,6 +50,10 @@ public class ReplaceDeprecatedPropertyQuickfix implements ICompletionProposal {
public Renderable getDocumentation() {
throw new UnsupportedOperationException("Not yet implemented");
}
@Override
public ScoreableProposal deemphasize(double howmuch) {
throw new UnsupportedOperationException("Not yet implemented");
}
// private final QuickfixContext context;
// private final SpringPropertyProblem problem;

15
headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java
View File

@@ -66,6 +66,8 @@ import org.springframework.ide.vscode.commons.yaml.util.YamlUtil;
import com.google.common.collect.ImmutableList;
import static org.springframework.ide.vscode.commons.languageserver.completion.ScoreableProposal.*;
/**
* Represents a context insied a "application.yml" file relative to which we can provide
* content assistance.
@@ -198,7 +200,7 @@ public abstract class ApplicationYamlAssistContext extends AbstractYamlAssistCon
completionFactory.beanProperty(doc.getDocument(),
contextPath.toPropString(), getType(),
query, p, score, edits, typeUtil)
.deemphasize() //deemphasize because it already exists
.deemphasize(DEEMP_EXISTS) //deemphasize because it already exists
);
}
}
@@ -399,7 +401,7 @@ public abstract class ApplicationYamlAssistContext extends AbstractYamlAssistCon
doc.getDocument(), edits, match, typeUtil
);
if (getContextRoot(doc).exists(YamlPath.fromProperty(match.data.getId()))) {
completion.deemphasize();
completion.deemphasize(DEEMP_EXISTS);
}
completions.add(completion);
}
@@ -492,7 +494,7 @@ public abstract class ApplicationYamlAssistContext extends AbstractYamlAssistCon
}
return null;
}
@Override
public Renderable getHoverInfo(YamlPathSegment lastSegment) {
// TODO Auto-generated method stub
@@ -506,6 +508,7 @@ public abstract class ApplicationYamlAssistContext extends AbstractYamlAssistCon
}
}
@Override
public Renderable getHoverInfo(YamlPathSegment s) {
//ApplicationYamlAssistContext implements getHoverInfo directly. so this is not needed.
return null;
@@ -524,7 +527,7 @@ public abstract class ApplicationYamlAssistContext extends AbstractYamlAssistCon
}
};
}
private static Deprecation getDeprecation(TypeUtil typeUtil, Type parentType, String propName) {
Map<String, TypedProperty> props = typeUtil.getPropertiesMap(parentType, EnumCaseMode.ALIASED, BeanPropertyNameMode.ALIASED);
if (props!=null) {
@@ -535,7 +538,7 @@ public abstract class ApplicationYamlAssistContext extends AbstractYamlAssistCon
}
return null;
}
private static Renderable getDescription(TypeUtil typeUtil, Type parentType, String propName) {
try {
List<IJavaElement> jes = getAllJavaElements(typeUtil, parentType, propName);
@@ -554,7 +557,7 @@ public abstract class ApplicationYamlAssistContext extends AbstractYamlAssistCon
}
return Renderables.NO_DESCRIPTION;
}
private static List<IJavaElement> getAllJavaElements(TypeUtil typeUtil, Type parentType, String propName) {
if (propName!=null) {
Type beanType = parentType;

9
headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
View File

@@ -13,6 +13,7 @@ package org.springframework.ide.vscode.boot.yaml.quickfix;
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.Renderable;
public class ReplaceDeprecatedYamlQuickfix implements ICompletionProposal {
@@ -29,10 +30,6 @@ public class ReplaceDeprecatedYamlQuickfix implements ICompletionProposal {
// }
// };
@Override
public ICompletionProposal deemphasize() {
throw new UnsupportedOperationException("Not yet implemented");
}
@Override
public String getLabel() {
throw new UnsupportedOperationException("Not yet implemented");
@@ -53,6 +50,10 @@ public class ReplaceDeprecatedYamlQuickfix implements ICompletionProposal {
public Renderable getDocumentation() {
throw new UnsupportedOperationException("Not yet implemented");
}
@Override
public ScoreableProposal deemphasize(double howmuch) {
throw new UnsupportedOperationException("Not yet implemented");
}
// private final QuickfixContext context;
// private final SpringPropertyProblem problem;