symfony
diff --git a/‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
+3-2Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
+7-6Lines changed: 7 additions & 6 deletions b/‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
+7-6Lines changed: 7 additions & 6 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
+4-3Lines changed: 4 additions & 3 deletions b/‎src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
+4-3Lines changed: 4 additions & 3 deletions
@@ -1,10 +1,10 @@
-<div class="trace-line-header break-long-words {{ trace.file|default(false) ? 'sf-toggle' }}" data-toggle-selector="#trace-html-{{ prefix }}-{{ i }}" data-toggle-initial="{{ _display_code_snippet ? 'display' }}">
+<div class="trace-line-header break-long-words {{ trace.file|default(false) ? 'sf-toggle' }}" data-toggle-selector="#trace-html-{{ prefix }}-{{ i }}" data-toggle-initial="{{ style == 'expanded' ? 'display' }}">
     {% if trace.file|default(false) %}
         <span class="icon icon-close">{{ include('@Twig/images/icon-minus-square.svg') }}</span>
         <span class="icon icon-open">{{ include('@Twig/images/icon-plus-square.svg') }}</span>
     {% endif %}
 
-    {% if trace.function %}
+    {% if style != 'compact' and trace.function %}
         <span class="trace-class">{{ trace.class|abbr_class }}</span>{% if trace.type is not empty %}<span class="trace-type">{{ trace.type }}</span>{% endif %}<span class="trace-method">{{ trace.function }}</span><span class="trace-arguments">({{ trace.args|format_args }})</span>
     {% endif %}
 
@@ -17,6 +17,7 @@
         <span class="block trace-file-path">
             in
             <a href="{{ file_link }}">{{ file_path_parts[:-1]|join(constant('DIRECTORY_SEPARATOR')) }}{{ constant('DIRECTORY_SEPARATOR') }}<strong>{{ file_path_parts|last }}</strong></a>
+            {%- if style == 'compact' and trace.function %}<span class="trace-type">{{ trace.type }}</span><span class="trace-method">{{ trace.function }}</span>{% endif %}
             (line {{ line_number }})
         </span>
     {% endif %}
 
@@ -3,14 +3,14 @@
         <div class="trace-head">
             <span class="sf-toggle" data-toggle-selector="#trace-html-{{ index }}" data-toggle-initial="{{ expand ? 'display' }}">
                 <h3 class="trace-class">
+                    <span class="icon icon-close">{{ include('@Twig/images/icon-minus-square-o.svg') }}</span>
+                    <span class="icon icon-open">{{ include('@Twig/images/icon-plus-square-o.svg') }}</span>
+
                     <span class="trace-namespace">
                         {{ exception.class|split('\\')|slice(0, -1)|join('\\') }}
                         {{- exception.class|split('\\')|length > 1 ? '\\' }}
                     </span>
                     {{ exception.class|split('\\')|last }}
-
-                    <span class="icon icon-close">{{ include('@Twig/images/icon-minus-square-o.svg') }}</span>
-                    <span class="icon icon-open">{{ include('@Twig/images/icon-plus-square-o.svg') }}</span>
                 </h3>
 
                 {% if exception.message is not empty and index > 1 %}
@@ -22,10 +22,11 @@
         <div id="trace-html-{{ index }}" class="sf-toggle-content">
         {% set _is_first_user_code = true %}
         {% for i, trace in exception.trace %}
-            {% set _display_code_snippet = _is_first_user_code and ('/vendor/' not in trace.file) and ('/var/cache/' not in trace.file) and (trace.file is not empty) %}
+            {% set _is_vendor_trace = trace.file is not empty and ('/vendor/' in trace.file or '/var/cache/' in trace.file) %}
+            {% set _display_code_snippet = _is_first_user_code and not _is_vendor_trace %}
             {% if _display_code_snippet %}{% set _is_first_user_code = false %}{% endif %}
-            <div class="trace-line">
-                {{ include('@Twig/Exception/trace.html.twig', { prefix: index, i: i, trace: trace, _display_code_snippet: _display_code_snippet }, with_context = false) }}
+            <div class="trace-line {{ _is_vendor_trace ? 'trace-from-vendor' }}">
+                {{ include('@Twig/Exception/trace.html.twig', { prefix: index, i: i, trace: trace, style: _is_vendor_trace ? 'compact' : _display_code_snippet ? 'expanded' }, with_context = false) }}
             </div>
         {% endfor %}
         </div>
 
@@ -90,17 +90,18 @@ header .container { display: flex; justify-content: space-between; }
 .exception-illustration { flex-basis: 111px; flex-shrink: 0; height: 66px; margin-left: 15px; opacity: .7; }
 
 .trace + .trace { margin-top: 30px; }
-.trace-head { background-color: #e0e0e0; padding: 10px; }
+.trace-head { background-color: #e0e0e0; padding: 10px; position: relative; }
 .trace-head .trace-class { color: #222; font-size: 18px; font-weight: bold; line-height: 1.3; margin: 0; position: relative; }
 .trace-head .trace-namespace { color: #999; display: block; font-size: 13px; }
 .trace-head .icon { position: absolute; right: 0; top: 0; }
 .trace-head .icon svg { height: 24px; width: 24px; }
 
-.trace-details { background: #FFF; border: 1px solid #E0E0E0; box-shadow: 0px 0px 1px rgba(128, 128, 128, .2); margin: 1em 0; }
+.trace-details { background: #FFF; border: 1px solid #E0E0E0; box-shadow: 0px 0px 1px rgba(128, 128, 128, .2); margin: 1em 0; table-layout: fixed; }
 
 .trace-message { font-size: 14px; font-weight: normal; margin: .5em 0 0; }
-.trace-details { table-layout: fixed; }
+
 .trace-line { position: relative; padding-top: 8px; padding-bottom: 8px; }
+.trace-line + .trace-line { border-top: 1px solid #e0e0e0; }
 .trace-line:hover { background: #F5F5F5; }
 .trace-line a { color: #222; }
 .trace-line .icon { opacity: .4; position: absolute; left: 10px; top: 11px; }