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

Fix no hover case

Browse Source
This commit is contained in:
BoykoAlex
2016-11-23 11:29:20 -05:00
parent 5a520e5f93
commit d63bb4949e
3 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
View File

@@ -1,6 +1,7 @@
package org.springframework.ide.vscode.languageserver.testharness;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.springframework.ide.vscode.languageserver.testharness.TestAsserts.*;
@@ -320,8 +321,10 @@ public class Editor {
Hover hover = harness.getHover(document, document.toPosition(hoverPosition));
assertContains(snippet, hover.getContents().toString()); }
public void assertNoHover(String string) {
throw new UnsupportedOperationException("Not implemented yet!");
public void assertNoHover(String hoverOver) throws Exception {
int hoverPosition = getRawText().indexOf(hoverOver) + hoverOver.length() / 2;
Hover hover = harness.getHover(document, document.toPosition(hoverPosition));
assertTrue(hover.getContents().isEmpty());
}
/**

47
vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/hover/PropertiesHoverCalculator.java
View File

@@ -8,6 +8,7 @@ import java.util.Collection;
import java.util.Optional;
import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo;
import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndex;
import org.springframework.ide.vscode.application.properties.metadata.hints.StsValueHint;
import org.springframework.ide.vscode.application.properties.metadata.types.Type;
import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil;
@@ -20,7 +21,6 @@ import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
import org.springframework.ide.vscode.commons.languageserver.util.IRegion;
import org.springframework.ide.vscode.commons.util.Renderable;
import org.springframework.ide.vscode.commons.util.Renderables;
import org.springframework.ide.vscode.commons.util.StringUtil;
import org.springframework.ide.vscode.java.properties.antlr.parser.AntlrParser;
import org.springframework.ide.vscode.java.properties.parser.ParseResults;
import org.springframework.ide.vscode.java.properties.parser.PropertiesAst.Key;
@@ -138,27 +138,32 @@ class PropertiesHoverCalculator {
* Search known properties for the best 'match' to show as hover data.
*/
private PropertyInfo findBestHoverMatch(String propName) {
//TODO: optimize, should be able to use index's treemap to find this without iterating all entries.
PropertyInfo best = null;
int bestCommonPrefixLen = 0; //We try to pick property with longest common prefix
int bestExtraLen = Integer.MAX_VALUE;
for (PropertyInfo candidate : index) {
int commonPrefixLen = StringUtil.commonPrefixLength(propName, candidate.getId());
int extraLen = candidate.getId().length()-commonPrefixLen;
if (commonPrefixLen==propName.length() && extraLen==0) {
//exact match found, can stop searching for better matches
return candidate;
}
//candidate is better if...
if (commonPrefixLen>bestCommonPrefixLen // it has a longer common prefix
|| commonPrefixLen==bestCommonPrefixLen && extraLen<bestExtraLen //or same common prefix but fewer extra chars
) {
bestCommonPrefixLen = commonPrefixLen;
bestExtraLen = extraLen;
best = candidate;
}
PropertyInfo propertyInfo = index.get(propName);
if (propertyInfo == null) {
propertyInfo = SpringPropertyIndex.findLongestValidProperty(index, propName);
}
return best;
return propertyInfo;
// //TODO: optimize, should be able to use index's treemap to find this without iterating all entries.
// PropertyInfo best = null;
// int bestCommonPrefixLen = 0; //We try to pick property with longest common prefix
// int bestExtraLen = Integer.MAX_VALUE;
// for (PropertyInfo candidate : index) {
// int commonPrefixLen = StringUtil.commonPrefixLength(propName, candidate.getId());
// int extraLen = candidate.getId().length()-commonPrefixLen;
// if (commonPrefixLen==propName.length() && extraLen==0) {
// //exact match found, can stop searching for better matches
// return candidate;
// }
// //candidate is better if...
// if (commonPrefixLen>bestCommonPrefixLen // it has a longer common prefix
// || commonPrefixLen==bestCommonPrefixLen && extraLen<bestExtraLen //or same common prefix but fewer extra chars
// ) {
// bestCommonPrefixLen = commonPrefixLen;
// bestExtraLen = extraLen;
// best = candidate;
// }
// }
// return best;
}
}

11
vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesEditorTest.java
View File

@@ -1556,6 +1556,17 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest {
editor.assertLinkTargets("red", "demo.Color.RED");
}
@Test public void testNoHoverForUnrecognizedProperty() throws Exception {
useProject(createPredefinedMavenProject("enums-boot-1.3.2-app"));
Editor editor;
editor = newEditor(
"my.ggggg: 6754"
);
editor.assertNoHover("my.ggggg");
}
@Override
protected SimpleLanguageServer newLanguageServer() {
ApplicationPropertiesLanguageServer server = new ApplicationPropertiesLanguageServer(md.getIndexProvider(), typeUtilProvider, javaProjectFinder);