diff --git a/vscode-extensions/vscode-boot-java/pom.xml b/vscode-extensions/vscode-boot-java/pom.xml index e3aa1fb4a..dab097386 100644 --- a/vscode-extensions/vscode-boot-java/pom.xml +++ b/vscode-extensions/vscode-boot-java/pom.xml @@ -53,6 +53,11 @@ java-properties ${project.version} + + org.springframework.ide.vscode + commons-yaml + ${project.version} + diff --git a/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/completions/ValuePropertyKeyProposal.java b/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/completions/ValuePropertyKeyProposal.java index 3ecf24c09..7ef2721ab 100644 --- a/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/completions/ValuePropertyKeyProposal.java +++ b/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/completions/ValuePropertyKeyProposal.java @@ -14,7 +14,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.util.Renderable; -import org.springframework.ide.vscode.commons.util.text.IDocument; /** * @author Martin Lippert diff --git a/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/references/BootJavaReferencesHandler.java b/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/references/BootJavaReferencesHandler.java index 5b1ecb4cf..a0e9b6751 100644 --- a/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/references/BootJavaReferencesHandler.java +++ b/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/references/BootJavaReferencesHandler.java @@ -24,10 +24,8 @@ import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.NodeFinder; -import org.eclipse.lsp4j.Hover; import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.ReferenceParams; -import org.springframework.ide.vscode.boot.java.hover.ValueHoverProvider; import org.springframework.ide.vscode.commons.java.IClasspath; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; diff --git a/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/references/ValuePropertyReferencesProvider.java b/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/references/ValuePropertyReferencesProvider.java index 1457e685d..db3ef172f 100644 --- a/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/references/ValuePropertyReferencesProvider.java +++ b/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/java/references/ValuePropertyReferencesProvider.java @@ -130,11 +130,16 @@ public class ValuePropertyReferencesProvider { return findReferencesInPropertiesFile(filePath, propertyKey); } else if (filePath.endsWith(".yml")) { - // do the real work + return findReferencesInYMLFile(filePath, propertyKey); } return new ArrayList(); } + private List findReferencesInYMLFile(String filePath, String propertyKey) { + List foundLocations = new ArrayList<>(); + return foundLocations; + } + private List findReferencesInPropertiesFile(String filePath, String propertyKey) { List foundLocations = new ArrayList<>(); diff --git a/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java b/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java index 44a244d7e..91b209aa8 100644 --- a/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java +++ b/vscode-extensions/vscode-boot-java/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java @@ -30,97 +30,9 @@ public class SpringPropertyIndex extends FuzzyMap } } - /** - * Dumps out 'test data' based on the current contents of the index. This is not meant to be - * used in 'production' code. The idea is to call this method during development to dump a - * 'snapshot' of the index onto System.out. The data is printed in a forma so that it can be easily - * pasted/used into JUNit testing code. - */ -// public void dumpAsTestData() { -// List> allData = this.find(""); -// for (Match match : allData) { -// PropertyInfo d = match.data; -// System.out.println("data(" -// +dumpString(d.getId())+", " -// +dumpString(d.getType())+", " -// +dumpString(d.getDefaultValue())+", " -// +dumpString(d.getDescription()) +");" -// ); -// for (PropertySource source : d.getSources()) { -// String st = source.getSourceType(); -// String sm = source.getSourceMethod(); -// if (sm!=null) { -// System.out.println(d.getId() +" from: "+st+"::"+sm); -// } -// } -// } -// } - -// private String dumpString(Object v) { -// if (v==null) { -// return "null"; -// } -// return dumpString(""+v); -// } - - private String dumpString(String s) { - if (s==null) { - return "null"; - } else { - StringBuilder buf = new StringBuilder("\""); - for (char c : s.toCharArray()) { - switch (c) { - case '\r': - buf.append("\\r"); - break; - case '\n': - buf.append("\\n"); - break; - case '\\': - buf.append("\\\\"); - break; - case '\"': - buf.append("\\\""); - break; - default: - buf.append(c); - break; - } - } - buf.append("\""); - return buf.toString(); - } - } - @Override protected String getKey(ConfigurationMetadataProperty entry) { return entry.getId(); } - /** - * Find the longest known property that is a prefix of the given name. Here prefix does not mean - * 'string prefix' but a prefix in the sense of treating '.' as a kind of separators. So - * 'prefix' is not allowed to end in the middle of a 'segment'. - */ -// public static PropertyInfo findLongestValidProperty(FuzzyMap index, String name) { -// int bracketPos = name.indexOf('['); -// int endPos = bracketPos>=0?bracketPos:name.length(); -// PropertyInfo prop = null; -// String prefix = null; -// while (endPos>0 && prop==null) { -// prefix = name.substring(0, endPos); -// String canonicalPrefix = StringUtil.camelCaseToHyphens(prefix); -// prop = index.get(canonicalPrefix); -// if (prop==null) { -// endPos = name.lastIndexOf('.', endPos-1); -// } -// } -// if (prop!=null) { -// //We should meet caller's expectation that matched properties returned by this method -// // match the names exactly even if we found them using relaxed name matching. -// return prop.withId(prefix); -// } -// return null; -// } - }