Skip to content

[demo] Split code and diffs into 2 separate columns to avoid overflow #2956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 1 commit into from
Apr 15, 2025
Merged

[demo] Split code and diffs into 2 separate columns to avoid overflow #2956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/views/_snippets/form/form_diff.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@if ($rectorRun->isSuccessful())
<div class="col-6" style="float: right;" class="diff-snippet">
@foreach ($rectorRun->getDiffSnippets() as $diffSnippet)
<pre style="position: absolute; z-index: 10; width: 32.7em; margin-top: {{ $diffSnippet->getLine() * 1.4 + 1.7 }}em"><code class="language-diff">{{ $diffSnippet->getSnippet() }}</code></pre>
<pre style="position: absolute; z-index: 10; width: 33.7em; margin-top: {{ $diffSnippet->getLine() * 1.4 + 1.7 }}em"><code class="language-diff">{{ $diffSnippet->getSnippet() }}</code></pre>
@endforeach
</div>
@endif
30 changes: 16 additions & 14 deletions resources/views/_snippets/form/form_fatal_errors.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
@if ($rectorRun->hasRun() && $rectorRun->isSuccessful() !== true)
<div class="alert alert-danger mb-3">
<p>
<strong>Rector run Failed:</strong>
</p>
<div class="row">
<div class="alert alert-danger mb-3">
<p>
<strong>Rector run Failed:</strong>
</p>

{!! $rectorRun->getFatalErrorMessage() !!}
{!! $rectorRun->getFatalErrorMessage() !!}

@if ($rectorRun->getErrors() !== [])
<ul class="mt-3 ms-0 pl-4">
@foreach ($rectorRun->getErrors() as $error)
<li>
{{ $error }}
</li>
@endforeach
</ul>
@endif
@if ($rectorRun->getErrors() !== [])
<ul class="mt-3 ms-0 pl-4">
@foreach ($rectorRun->getErrors() as $error)
<li>
{{ $error }}
</li>
@endforeach
</ul>
@endif
</div>
</div>
@endif
22 changes: 12 additions & 10 deletions resources/views/demo/demo.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ class="mb-5"
'defaultValue' => $rectorRun->getContent()
])

<div class="clearfix mb-3" style="clear: both"></div>
<div class="clearfix pb-0 mb-0" style="clear: both"></div>

@if ($rectorRun->isSuccessful() && $rectorRun->getAppliedRules())
<div class="row">
<div class="pt-0 pb-4 col-12 col-sm-6">
<div class="pt-0 pb-2 col-12 col-sm-6">
<p class="mb-2">Applied Rules:</p>

<ul class="list-noindent">
Expand All @@ -46,17 +46,19 @@ class="mb-5"
</li>
@endforeach
</ul>
</div>
<div class="pt-0 pb-4 col-12 col-sm-6">
<p class="mb-2">Is the result wrong?</p>
<a href="{{ issueLink($rectorRun) }}" class="btn btn-danger">Create an
issue</a>

<p class="mt-4 mb-2">Not a change you expect?</p>

<ul>
<li>
<a href="{{ issueLink($rectorRun) }}" class="text-danger">Create an issue</a> on GitHub
</li>

@if ($rectorRun->canCreateFixture())
<a href="{{ pullRequestLink($rectorRun) }}"
class="btn btn-primary ms-3">Create
a Test</a>
<li>...or to speed up fix &ndash; <a href="{{ pullRequestLink($rectorRun) }}" class="text-success">add a test fixture</a>
</li>
@endif
</ul>
</div>
</div>
@endif
Expand Down
2 changes: 1 addition & 1 deletion src/FileSystem/RectorFinder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace App\FileSystem;

use Throwable;
use App\Exception\InvalidRuleDescriptionException;
use App\RuleFilter\ValueObject\RectorSet;
use App\RuleFilter\ValueObject\RuleMetadata;
Expand All @@ -15,6 +14,7 @@
use Rector\PostRector\Contract\Rector\PostRectorInterface;
use ReflectionClass;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use Throwable;
use Webmozart\Assert\Assert;

final readonly class RectorFinder
Expand Down