feature #1329 Fix: source code modal doesn't show php attributes (voronkovich)

This PR was squashed before being merged into the main branch.

Discussion
----------

Fix: source code modal doesn't show php attributes

:hankey: :scream: :scream_cat:

![oie_h1QnxhxN05Yu](https://user-images.githubusercontent.com/2299535/166320470-382acddb-df6a-425a-bcc3-3a5dcc02f088.png)

Fixed:

![Screenshot 2022-05-02 at 23-53-37 Symfony Demo application](https://user-images.githubusercontent.com/2299535/166326168-ebb6a3bf-1e06-4939-92ef-cfe15096ac96.png)

Commits
-------

26c7151 Fix: source code modal doesn't show php attributes

Author: javiereguiluz

assets/js/doclinks.js

@@ -10,32 +10,37 @@ $(function() {
         return '<a class="doclink" target="_blank" href="' + url + '">' + content + '</a>';
     };
 
+    function wrap(content, links) {
+        return content.replace(
+            new RegExp(Object.keys(links).join('|'), 'g'),
+            token => anchor(links[token], token)
+        );
+    };
+
     // Wraps links to the Symfony documentation
     $modal.find('.hljs-comment').each(function() {
         $(this).html($(this).html().replace(/https:\/\/symfony.com\/doc\/[\w/.#-]+/g, function(url) {
             return anchor(url, url);
         }));
     });
 
-    // Wraps Symfony's annotations
-    var annotations = {
-        '@Cache': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html',
-        '@IsGranted': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html#isgranted',
-        '@ParamConverter': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html',
-        '@Route': 'https://symfony.com/doc/current/routing.html#creating-routes-as-annotations',
-        '@Security': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html#security'
+    // Wraps Symfony's attributes
+    var attributes = {
+        'Cache': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html',
+        'IsGranted': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html#isgranted',
+        'ParamConverter': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html',
+        'Route': 'https://symfony.com/doc/current/routing.html#creating-routes-as-attributes-or-annotations',
+        'Security': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html#security'
     };
 
-    $controllerCode.find('.hljs-doctag').each(function() {
-        var annotation = $(this).text();
+    $controllerCode.find('.hljs-meta').each(function() {
+        var src = $(this).text();
 
-        if (annotations[annotation]) {
-            $(this).html(anchor(annotations[annotation], annotation));
-        }
+        $(this).html(wrap(src, attributes));
     });
 
     // Wraps Twig's tags
-    $templateCode.find('.hljs-template-tag > .hljs-name').each(function() {
+    $templateCode.find('.hljs-template-tag + .hljs-name').each(function() {
         var tag = $(this).text();
 
         if ('else' === tag || tag.match(/^end/)) {

assets/js/highlight.js

@@ -5,4 +5,4 @@ import twig from 'highlight.js/lib/languages/twig';
 hljs.registerLanguage('php', php);
 hljs.registerLanguage('twig', twig);
 
-hljs.initHighlightingOnLoad();
+hljs.highlightAll();

assets/styles/app.scss

@@ -12,7 +12,7 @@ $lato-font-path: '~lato-font/fonts';
 @import "~bootswatch/flatly/bootswatch";
 @import "~@fortawesome/fontawesome-free/css/all.css";
 @import "~@fortawesome/fontawesome-free/css/v4-shims.css";
-@import "~highlight.js/styles/solarized-light.css";
+@import "~highlight.js/styles/base16/solarized-light.css";
 
 // pick the Lato fonts individually to avoid importing the entire font family
 @import '~lato-font/scss/public-api';

package.json

@@ -9,7 +9,7 @@
         "bootswatch": "^3.3.7",
         "core-js": "^3.0.0",
         "eonasdan-bootstrap-datetimepicker": "^4.17.47",
-        "highlight.js": "^10.4.1",
+        "highlight.js": "^11.5.1",
         "imports-loader": "^0.8.0",
         "jquery": "^3.5.1",
         "lato-font": "^3.0.0",

public/build/169.61570d43.js

@@ -5,11 +5,11 @@
         "/build/runtime.96aa4ea2.js",
         "/build/755.f5cf308f.js",
         "/build/498.3bafb5f9.js",
-        "/build/169.61570d43.js",
-        "/build/app.993b7531.js"
+        "/build/979.4967399b.js",
+        "/build/app.a5511055.js"
       ],
       "css": [
-        "/build/169.8ccdf84f.css",
+        "/build/979.dc75718b.css",
         "/build/app.ac992678.css"
       ]
     },
@@ -46,9 +46,9 @@
     "/build/runtime.96aa4ea2.js": "sha384-nMYLpi/v3txwhZt8UOBsMOTbgVmUPlpD8cPmrU3yblZ7Yg8l799XS9NC1BZ9P9Xs",
     "/build/755.f5cf308f.js": "sha384-SAv+SyvZr31CmFrJFfKEYK0fDrMVx8vh19SI4QznAB/ar+Z1k6IT9Mg2SDZtLwD2",
     "/build/498.3bafb5f9.js": "sha384-yoQvBlSFO4jMdQIBvie1V5XQ4M8F0CGnS2mFtS9RslTqLbW8IYO/xONlip3SUDGH",
-    "/build/169.61570d43.js": "sha384-5YrrxLGqNa0MkTVcoUS0ey4YjDbKSGG/W253kc95h1F1B+naqWhAxdQygYmhShtF",
-    "/build/app.993b7531.js": "sha384-j4enIn+WJyu1/cU3hEKrrpjjiUbY3/rTtftcQFZ3sH4Eg7lSVgHXfEoe8Q9fR5sO",
-    "/build/169.8ccdf84f.css": "sha384-M2cVsp0oOWSDHv3WMyFy5lTSMmDd0cY5EMO9CX+G1xUmxH85GYNPKPeyRNzoXD0v",
+    "/build/979.4967399b.js": "sha384-IPkjWWHEhfdos/b3w08uBZ2KjTFno/Ocwt1o6ardQjWJEbigWocfHbAeZfj+t7AX",
+    "/build/app.a5511055.js": "sha384-t5u9zzpbS+SwUVCOSeCZdoFdZ5n1rIZ5nWHPzaEYkZ6U2oaG2AOokBmGXzL7uORK",
+    "/build/979.dc75718b.css": "sha384-3Xq9zpkhbAPpNpmbJIfOIsDjVugU/PSQ4vcam/DSyD65+CvSOnCrlxkY+RpzfNKN",
     "/build/app.ac992678.css": "sha384-ICPCCj5CXbWgl5Qqe/h85MC7oJI7tfgk7ZWIPsFm93L6gG/fHXfzBERdusSM7Fy4",
     "/build/login.395771d5.js": "sha384-bKBy5bAsLAFHFo/zxqJkheRiwvRSVHXwogJPw7DWc6qfnP03VaNFMyEc/0cRBf0k",
     "/build/919.63ff4a5d.js": "sha384-0o9glCmkeYT/iE8RHdbPnoqMslSFjP/uN4ggsyjBVE5eq+V2RUFdEzYZBs5JNiyb",