Merge pull request #42 from lawson89/master

Autocomplete cleanup

Author: gk-brown

sierra-tools/previewer/src/main/java/org/httprpc/sierra/tools/previewer/SierraXMLCompletionProvider.java

@@ -49,7 +49,7 @@ public class SierraXMLCompletionProvider extends DefaultCompletionProvider {
     // TagName -> {AttributeName -> Description/ValueDefinitionString}
     private final Map<String, Map<String, String>> elementAttributeDefinitions = new HashMap<>();
 
-    private final Map<String, Map<String, String>> baseClassAttributeDefinitions = new HashMap<>();
+    private final Map<String, Map<String, String>> sierraAttributeDefinitions = new HashMap<>();
 
     private final List<Completion> tagCompletions = new ArrayList<>();
 
@@ -66,7 +66,6 @@ private void loadTags() {
 
         tagCompletions.sort(Comparator.comparing(Completion::getInputText));
 
-        baseClassAttributeDefinitions.put(JComponent.class.getName(), getAttributesForClass(JComponent.class));
         addCommonAttributes();
 
     }
@@ -77,10 +76,10 @@ private void addCommonAttributes() {
         for (UILoader.Attribute attr : UILoader.Attribute.values()) { 
             attributes.put(attr.getName(), attr.getType().getSimpleName()); 
         }
-        baseClassAttributeDefinitions.put("CommonAttributes", attributes);
+        sierraAttributeDefinitions.put("CommonAttributes", attributes);
     }
 
-    private Map<String, String> getAttributesForClass(Class<?> type){
+    protected Map<String, String> getAttributesForClass(Class<?> type){
         Map<String, String> attributes = new HashMap<>();
         for (var entry : BeanAdapter.getProperties(type).entrySet()) {
             var property = entry.getValue();
@@ -135,10 +134,7 @@ public List<Completion> getCompletions(JTextComponent comp) {
                 return new ArrayList<>();
             }
 
-            // parent class
-            // @todo we need to walk all the class hierarchy here?
-            allAttributes.putAll(baseClassAttributeDefinitions.get(JComponent.class.getName()));
-            allAttributes.putAll(baseClassAttributeDefinitions.get("CommonAttributes"));
+            allAttributes.putAll(sierraAttributeDefinitions.get("CommonAttributes"));
 
             var definedAttributes = getAlreadyDefinedAttributes(comp, context.tagStartOffset, offset);
             List<String> availableAttributeNames = new ArrayList<>();

…wer/SierraXMLCompletionProviderTest.java …wer/SierraXMLCompletionProviderTest.javasierra-tools/previewer/src/test/java/org/httprpc/sierra/previewer/SierraXMLCompletionProviderTest.java renamed to sierra-tools/previewer/src/test/java/org/httprpc/sierra/tools/previewer/SierraXMLCompletionProviderTest.java sierra-tools/previewer/src/test/java/org/httprpc/sierra/previewer/SierraXMLCompletionProviderTest.java renamed to sierra-tools/previewer/src/test/java/org/httprpc/sierra/tools/previewer/SierraXMLCompletionProviderTest.java

@@ -11,17 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.httprpc.sierra.previewer;
+package org.httprpc.sierra.tools.previewer;
 
 import org.fife.ui.autocomplete.Completion;
 import org.httprpc.sierra.tools.previewer.SierraXMLCompletionProvider;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import javax.swing.JComponent;
+import javax.swing.JTextArea;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.PlainDocument;
+
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -227,4 +231,5 @@ void testTagNarrowing() throws BadLocationException {
         assertTrue(suggestionsBU.stream().anyMatch(c -> c.getInputText().equals("button")),
             "Suggestions after 'bu' should include the 'button' tag.");
     }
+    
 }