geckon01/whoops
1
0
Fork 0
mirror of https://github.com/filp/whoops.git synced 2026-09-12 02:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement exploring code in stack frames

Browse Source
This commit is contained in:
filp
2013-03-12 15:28:54 +00:00
parent 71c862311d
commit bd6ece16b4
2 changed files with 71 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Damnit/Exception/Inspector.php
+24 -1
View File
@@ -46,7 +46,30 @@ class Inspector
*/
public function getFrames()
{
$iterator = new FrameIterator($this->exception->getTrace());
$frames = $this->exception->getTrace();
$firstFrame = $this->getFrameFromException($this->exception);
array_unshift($frames, $firstFrame);
$iterator = new FrameIterator($frames);
return $iterator;
}
/**
* Given an exception, generates an array in the format
* generated by Exception::getTrace()
* @param Exception $exception
* @return array
*/
protected function getFrameFromException(Exception $exception)
{
return array(
'file' => $exception->getFile(),
'line' => $exception->getLine(),
'class' => get_class($exception),
'args' => array(
$exception->getMessage()
)
);
}
}
src/Damnit/Resources/pretty-template.php
+47 -6
View File
@@ -84,7 +84,11 @@
.frame-code {
padding: 10px;
background: #BDBDBD;
display: none;
}
.frame-code.active {
display: block;
}
.code-block {
padding: 10px;
@@ -131,7 +135,7 @@
}
</style>
</head>
<body onload="__damnit_ready();">
<body>
<div class="container">
<header>
<div class="exception">
@@ -150,9 +154,10 @@
</div>
</header>
<div class="stack-container">
<div class="frames-container clearfix <?php echo (!$v->hasFrames ? 'empty' : '') ?>">
<?php foreach($v->frames as $i => $frame): ?>
<div class="frame <?php echo ($i == 0 ? 'active' : '') ?>">
<div class="frame <?php echo ($i == 0 ? 'active' : '') ?>" id="frame-line-<?php echo $i ?>">
<span class="frame-file">
<?php echo $e($frame->getFile()) ?><!-- get rid of ugly whitespace
--><span class="frame-line"><?php echo (int) $frame->getLine() ?></span>
@@ -160,19 +165,55 @@
</div>
<?php endforeach ?>
</div>
<div class="details-container clearfix">
<div class="frame-code <?php echo (!$v->hasFrames ? 'empty' : '') ?>">
<pre class="code-block prettyprint linenums:42">&lt;?php /* hi */ if("hi") { (bool) true && 11.3 + false && fc(); }</pre>
<div class="frame-code-container <?php echo (!$v->hasFrames ? 'empty' : '') ?>">
<?php foreach($v->frames as $i => $frame): ?>
<div class="frame-code <?php echo ($i == 0 ) ? 'active' : '' ?>" id="frame-code-<?php echo $i ?>">
<?php
$line = $frame->getLine();
// the $line is 1-indexed, we nab -1 where needed to account for this
$range = $frame->getFileLines($line - 4, $line);
$start = key($range) + 1;
$code = join("\n", $range);
?>
<pre class="code-block prettyprint linenums:<?php echo $start ?>"><?php echo $e($code) ?></pre>
</div>
<?php endforeach ?>
</div>
</div>
</div>
</div>
<script src="http://cdnjs.cloudflare.com/ajax/libs/prettify/r224/prettify.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script>
window.__damnit_ready = function() {
$(function() {
prettyPrint();
};
var $frameLines = $('[id^="frame-line-"]');
var $activeLine = $('.frames-container .active');
var $activeFrame = $('.active[id^="frame-code-"]').show();
$frameLines.click(function() {
var $this = $(this);
var id = /frame\-line\-([\d]*)/.exec($this.attr('id'))[1];
var $codeFrame = $('#frame-code-' + id);
if($codeFrame) {
$activeLine.removeClass('active');
$activeFrame.removeClass('active');
$this.addClass('active');
$codeFrame.addClass('active');
$activeLine = $this;
$activeFrame = $codeFrame;
}
});
});
</script>
</body>
</html>