Add :: as another separator for composed identifiers in PHP. Fixes #749…

…, #653.
highlightjs · Mar 10, 2015 · d49e9fb · d49e9fb
1 parent 5e12a7a
commit d49e9fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/languages/php.js b/src/languages/php.js
@@ -72,8 +72,8 @@ function(hljs) {
       PREPROCESSOR,
       VARIABLE,
       {
-        // swallow class members to avoid parsing them as keywords
-        begin: /->+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/
+        // swallow composed identifiers to avoid parsing them as keywords
+        begin: /(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/
       },
       {
         className: 'function',

diff --git a/test/detect/php/default.txt b/test/detect/php/default.txt
@@ -35,7 +35,7 @@ line description';
         }
 
         $this->var = 0 - self::$st;
-        $this->list = list(Array("1"=> 2, 2=>self::ME));
+        $this->list = list(Array("1"=> 2, 2=>self::ME, 3 => \Location\Web\URI::class));
 
         return [
             'uri'   => $uri,