Fix #54: PHP code blocks should delegate to the 'are-we-in-a-word-and-that-feature-is-enabled' parent implementation for code completion

Author: bobbylight

src/main/java/org/fife/rsta/ac/html/HtmlCompletionProvider.java

@@ -422,7 +422,24 @@ private static boolean insideMarkupTag(RSyntaxTextArea textArea,
 
 
 	/**
-	 * {@inheritDoc}
+	 * Returns the base implementation - basically checking that the
+	 * caret comes immediately after letters.  This is here for
+	 * subclasses that sometimes auto-activate in markup, other times
+	 * auto-activate in some other language, such as PHP.
+	 *
+	 * @param tc The text component.
+	 * @return Whether auto-activation is okay outside of markup.
+	 * @see #isAutoActivateOkay(JTextComponent)
+	 */
+	protected boolean isAutoActivateOkayOutsideOfMarkup(JTextComponent tc) {
+		return super.isAutoActivateOkay(tc);
+	}
+
+
+	/**
+	 * Overridden to ensure auto-activation only occurs in a markup tag.
+	 *
+	 * @see #isAutoActivateOkayOutsideOfMarkup(JTextComponent)
 	 */
 	@Override
 	public boolean isAutoActivateOkay(JTextComponent tc) {

src/main/java/org/fife/rsta/ac/php/PhpCompletionProvider.java

@@ -242,11 +242,12 @@ else if (ch1=='?' && ch2=='>') {
 
 
 	/**
-	 * {@inheritDoc}
+	 * Overridden to properly handle both HTML markup and PHP code.
 	 */
 	@Override
 	public boolean isAutoActivateOkay(JTextComponent tc) {
-		return inPhpBlock(tc) ? false : super.isAutoActivateOkay(tc);
+		return inPhpBlock(tc) ? isAutoActivateOkayOutsideOfMarkup(tc) :
+				super.isAutoActivateOkay(tc);
 	}