Merge pull request #306 from ejmr/issue-305

Fix invalid highlighting variables which contains 'this' or 'that'

Author: syohex

php-mode-test.el

@@ -596,6 +596,15 @@ style from Drupal."
     (should (eq (get-text-property (1- (match-end 0)) 'face)
                 'php-annotations-annotation-face))))
 
+(ert-deftest php-mode-test-issue-305 ()
+  "Test highlighting variables which contains 'this' or 'that'."
+  (with-php-mode-test ("issue-305.php")
+    (search-forward "Start:")
+    (search-forward "$this")
+    (should-not (eq 'font-lock-constant-face (get-text-property (- (point) 1) 'face)))
+    (search-forward "$that")
+    (should-not (eq 'font-lock-constant-face (get-text-property (- (point) 1) 'face)))))
+
 ;;; php-mode-test.el ends here
 
 ;; Local Variables:

php-mode.el

@@ -1328,7 +1328,7 @@ a completion list."
      ("->\\(\\sw+\\)\\s-*(" 1 'default)
 
      ;; Highlight special variables
-     ("\\$\\(this\\|that\\)" 1 font-lock-constant-face)
+     ("\\$\\(this\\|that\\)\\_>" 1 font-lock-constant-face)
      ("\\(\\$\\|->\\)\\([a-zA-Z0-9_]+\\)" 2 font-lock-variable-name-face)
 
      ;; Highlight function/method names

tests/issue-305.php

@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * GitHub Issue:    https://github.com/ejmr/php-mode/issues/305
+ *
+ * Test highighting of $this_foo, $that_foo
+ */
+
+// Start:
+$this_foo;
+$that_foo;