Fixes #48, allow restrictions on attribute values.

Author: ultraq

bundles/thymeleaf-extras-eclipse-plugin.content-assist/src/main/java/org/thymeleaf/extras/eclipse/contentassist/autocomplete/CompletionProposalComputer.java

@@ -33,7 +33,6 @@
 import org.thymeleaf.extras.eclipse.contentassist.autocomplete.generators.AttributeRestrictionProposalGenerator;
 import org.thymeleaf.extras.eclipse.contentassist.autocomplete.generators.ElementProcessorProposalGenerator;
 import org.thymeleaf.extras.eclipse.contentassist.autocomplete.generators.ExpressionObjectProposalGenerator;
-
 import static org.thymeleaf.extras.eclipse.contentassist.ContentAssistPlugin.*;
 
 import java.util.ArrayList;

bundles/thymeleaf-extras-eclipse-plugin.content-assist/src/main/java/org/thymeleaf/extras/eclipse/contentassist/autocomplete/generators/AttributeProcessorProposalGenerator.java

@@ -28,6 +28,8 @@
 import org.thymeleaf.extras.eclipse.dialect.xml.AttributeProcessor;
 import org.thymeleaf.extras.eclipse.dialect.xml.AttributeRestrictions;
 import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
 import static org.thymeleaf.extras.eclipse.contentassist.ContentAssistPlugin.findCurrentJavaProject;
 
 import java.util.ArrayList;
@@ -134,13 +136,7 @@ else if (!tag.equals(elementname)) {
 
 					if (restrictions.isSetAttributes()) {
 						for (String attribute: restrictions.getAttributes()) {
-							if (attribute.startsWith("-")) {
-								if (existingattributes.getNamedItem(attribute.substring(1)) != null) {
-									restricted = true;
-									break;
-								}
-							}
-							else if (existingattributes.getNamedItem(attribute) == null) {
+							if (!matchAttributeRestriction(attribute, existingattributes)) {
 								restricted = true;
 								break;
 							}
@@ -200,4 +196,51 @@ private static boolean makeAttributeProcessorSuggestions(IDOMNode node, ITextReg
 		}
 		return false;
 	}
+
+	/**
+	 * Checks if an attribute processor proposal should be made given the
+	 * attribute restriction.
+	 * 
+	 * @param restriction
+	 * @param existingattributes
+	 * @return <tt>true</tt> if an attribute processor can be proposed because
+	 *         it passed the current restriction.
+	 */
+	private static boolean matchAttributeRestriction(String restriction,
+		NamedNodeMap existingattributes) {
+
+		// Break the restriction into its parts
+		String restrictionName;
+		String restrictionValue;
+		if (restriction.contains("=")) {
+			int indexOfEq = restriction.indexOf('=');
+			restrictionName  = restriction.substring(0, indexOfEq);
+			restrictionValue = restriction.substring(indexOfEq + 1);
+		}
+		else {
+			restrictionName  = restriction;
+			restrictionValue = null;
+		}
+
+		// Flag to indicate if this is a restriction that the attribute _shouldn't_ be there
+		boolean negate = restriction.startsWith("-");
+		if (negate) {
+			restrictionName = restrictionName.substring(1);
+		}
+
+		// Check restriction against other attributes in the element
+		Node attribute = existingattributes.getNamedItem(restrictionName);
+		boolean allow = true;
+		if (attribute == null) {
+			allow = false;
+		}
+		else if (restrictionValue != null) {
+			String attributeValue = attribute.getNodeValue();
+			if (attributeValue != null && !attributeValue.equals(restrictionValue)) {
+				allow = false;
+			}
+		}
+
+		return negate ? !allow : allow;
+	}
 }

bundles/thymeleaf-extras-eclipse-plugin.content-assist/src/main/java/org/thymeleaf/extras/eclipse/contentassist/autocomplete/proposals/AbstractCompletionProposal.java

@@ -221,13 +221,13 @@ private static StringBuilder generateDocumentationRestrictions(List<String> rest
 		if (!yestags.isEmpty()) {
 			doctext.append("<dt>" + yestext + "</dt>");
 			for (String yestag: yestags) {
-				doctext.append("<dd>&lt;" + yestag + "&gt;</dd>");
+				doctext.append("<dd>" + yestag + "</dd>");
 			}
 		}
 		if (!notags.isEmpty()) {
 			doctext.append("<dt>" + notext + "</dt>");
 			for (String notag: notags) {
-				doctext.append("<dd>&lt;" + notag.substring(1) + "&gt;</dd>");
+				doctext.append("<dd>" + notag.substring(1) + "</dd>");
 			}
 		}
 

bundles/thymeleaf-extras-eclipse-plugin.content-assist/src/main/java/org/thymeleaf/extras/eclipse/contentassist/autocomplete/proposals/AttributeProcessorCompletionProposal.java

@@ -21,7 +21,6 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.thymeleaf.extras.eclipse.dialect.xml.AttributeProcessor;
-
 import static org.thymeleaf.extras.eclipse.contentassist.ContentAssistPlugin.*;
 
 /**