gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-24 13:37:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42 from gitbutlerapp/sc-render-removals

Browse Source 
Better rendering of removed files
This commit is contained in:
Scott Chacon 2023-03-23 15:07:17 +01:00 committed by GitHub
commit d2fdecc752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 152 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/components/DiffViewer.svelte
View File

@ -14,6 +14,8 @@
let middleDiff = '';
let currentOffset = 0;
let htmlTagRegex = /(<([^>]+)>)/gi;
$: if (diff) {
middleDiff = '';
currentDiff = '';
@ -28,15 +30,16 @@
let diffLines = middleDiff.split('<br>');
diffLines.forEach((line, index) => {
lineClass = 'lineContext bg-zinc-800';
let firstChar = line.replace(htmlTagRegex, '').slice(0, 1);
if (index < 4) {
lineClass = 'lineDiff bg-zinc-900 text-zinc-500';
} else if (line.slice(0, 2) == '@@') {
lineClass = 'lineSplit bg-blue-900';
} else if (line.slice(0, 1) == '+') {
} else if (firstChar == '+') {
if (!line.includes('+++')) {
lineClass = 'lineSplit bg-green-900';
}
} else if (line.slice(0, 1) == '-') {
} else if (firstChar == '-') {
if (!line.includes('---')) {
lineClass = 'lineSplit bg-red-900';
}

16
src/routes/projects/[projectId]/commit/+page.svelte
View File

@ -76,21 +76,24 @@
let currentPath = '';
let currentDiff = '';
let addedContents = '';
let fileContents = '';
let fileContentsStatus = '';
// Replace HTML tags with an empty string
function selectPath(path) {
currentDiff = '';
addedContents = '';
fileContents = '';
if (gitDiff[path]) {
currentPath = path;
currentDiff = gitDiff[path];
} else {
let file = $filesStatus.filter((file) => file.path === path)[0];
if (file && file.status === 'added') {
if (file) {
fileContentsStatus = file.status;
getFile({ projectId: $project?.id, path: path }).then((contents) => {
currentPath = path;
addedContents = contents;
fileContents = contents;
});
}
}
@ -278,8 +281,9 @@
<div class="h-100 h-full max-h-screen flex-grow overflow-auto p-2">
{#if currentDiff}
<DiffViewer diff={currentDiff} path={currentPath} />
{:else if addedContents}
<pre class="bg-green-900">{addedContents}</pre>
{:else if fileContents}
<pre
class={fileContentsStatus == 'added' ? 'bg-green-900' : 'bg-red-900'}>{fileContents}</pre>
{:else}
<div class="p-20 text-center text-lg text-zinc-400">Select a file to view changes.</div>
{/if}