From 5e6d5c466be3d31d666619a4395d2055860201c3 Mon Sep 17 00:00:00 2001
From: Pavel Laptev <pawellaptew@gmail.com>
Date: Sun, 11 Feb 2024 20:40:43 +0100
Subject: [PATCH] chore: refactor code formatting and remove unused imports and
 variables

---
 .../src/lib/components/BranchCard.svelte      |   9 +-
 .../src/lib/components/BranchHeader.svelte    | 104 +++---------------
 .../src/lib/components/BranchLane.svelte      |   8 +-
 .../src/lib/components/FileListItem.svelte    |  10 +-
 4 files changed, 35 insertions(+), 96 deletions(-)

diff --git a/gitbutler-ui/src/lib/components/BranchCard.svelte b/gitbutler-ui/src/lib/components/BranchCard.svelte
index 635488900..12ac31e90 100644
--- a/gitbutler-ui/src/lib/components/BranchCard.svelte
+++ b/gitbutler-ui/src/lib/components/BranchCard.svelte
@@ -50,7 +50,10 @@
 	let rsViewport: HTMLElement;
 
 	const userSettings = getContext<SettingsStore>(SETTINGS_CONTEXT);
-	const defaultBranchWidthRem = persisted<number | undefined>(24, 'defaulBranchWidth' + project.id);
+	const defaultBranchWidthRem = persisted<number | undefined>(
+		24,
+		'defaulBranchWidth' + project.id
+	);
 	const laneWidthKey = 'laneWidth_';
 
 	let laneWidth: number;
@@ -129,6 +132,10 @@
 	}
 
 	$: isLaneCollapsed = projectLaneCollapsed(project.id, branch.id);
+
+	// $: if (isLaneCollapsed) {
+	// 	console.log('isLaneCollapsed', $isLaneCollapsed);
+	// }
 </script>
 
 {#if $isLaneCollapsed}
diff --git a/gitbutler-ui/src/lib/components/BranchHeader.svelte b/gitbutler-ui/src/lib/components/BranchHeader.svelte
index 44e69e544..6c5d94c32 100644
--- a/gitbutler-ui/src/lib/components/BranchHeader.svelte
+++ b/gitbutler-ui/src/lib/components/BranchHeader.svelte
@@ -2,17 +2,13 @@
 	import ActiveBranchStatus from './ActiveBranchStatus.svelte';
 	import BranchLabel from './BranchLabel.svelte';
 	import BranchLanePopupMenu from './BranchLanePopupMenu.svelte';
-	// import BranchLanePopupMenu from './BranchLanePopupMenu.svelte';
 	import MergeButton from './MergeButton.svelte';
 	import Tag from './Tag.svelte';
 	import { clickOutside } from '$lib/clickOutside';
-	// import { clickOutside } from '$lib/clickOutside';
 	import Button from '$lib/components/Button.svelte';
 	import Icon, { type IconColor } from '$lib/components/Icon.svelte';
-	// import { normalizeBranchName } from '$lib/utils/branch';
 	import * as toasts from '$lib/utils/toasts';
 	import { tooltip } from '$lib/utils/tooltip';
-	// import { open } from '@tauri-apps/api/shell';
 	import toast from 'svelte-french-toast';
 	import type { BranchService } from '$lib/branches/service';
 	import type { GitHubService } from '$lib/github/service';
@@ -37,7 +33,6 @@
 
 	let meatballButton: HTMLDivElement;
 	let visible = false;
-	let container: HTMLDivElement;
 	let isApplying = false;
 	let isDeleting = false;
 	let isMerging = false;
@@ -161,7 +156,7 @@
 	</div>
 {:else}
 	<div class="header__wrapper">
-		<div class="header card" bind:this={container} class:isUnapplied>
+		<div class="header card" class:isUnapplied>
 			<div class="header__info">
 				<div class="header__label">
 					<BranchLabel
@@ -179,88 +174,22 @@
 						{isLaneCollapsed}
 						prUrl={$pr$?.htmlUrl}
 					/>
-					<!-- {#if !branch.upstream}
-						{#if !branch.active}
-							<Tag
-								icon="virtual-branch-small"
-								color="light"
-								help="These changes are stashed away from your working directory."
-								reversedDirection>unapplied</Tag
-							>
-						{:else if hasIntegratedCommits}
-							<Tag
-								icon="removed-branch-small"
-								color="success"
-								help="These changes have been integrated upstream, update your workspace to make this lane disappear."
-								reversedDirection>integrated</Tag
-							>
-						{:else}
-							<Tag
-								icon="virtual-branch-small"
-								color="light"
-								help="These changes are in your working directory."
-								reversedDirection>virtual</Tag
-							>
-						{/if}
-						{#if !isUnapplied}
-							<Tag
-								disabled
-								help="Branch name that will be used when pushing. You can change it from the lane menu."
-							>
-								origin/{branch.upstreamName
-									? branch.upstreamName
-									: normalizeBranchName(branch.name)}</Tag
-							>
-						{/if}
-					{:else} -->
-					{#if branch.upstream}
-						<!-- <Tag
-							icon="open-link"
-							color="ghost"
-							border
-							clickable
-							shrinkable
-							on:click={(e) => {
-								const url = base?.branchUrl(branch.upstream?.name);
-								if (url) open(url);
-								e.preventDefault();
-								e.stopPropagation();
-							}}
+
+					{#if branch.upstream && prIcon}
+						<div
+							class="pr-status"
+							role="button"
+							tabindex="0"
+							on:click={fetchPrStatus}
+							on:keypress={fetchPrStatus}
+							use:tooltip={statusToTooltip(prStatus)}
 						>
-							origin/{branch.upstreamName}
-						</Tag>
-						{#if $pr$?.htmlUrl}
-							<Tag
-								icon="pr-small"
-								color="ghost"
-								border
-								clickable
-								on:click={(e) => {
-									const url = $pr$?.htmlUrl;
-									if (url) open(url);
-									e.preventDefault();
-									e.stopPropagation();
-								}}
-							>
-								View PR
-							</Tag>
-						{/if} -->
-						{#if prIcon}
-							<div
-								class="pr-status"
-								role="button"
-								tabindex="0"
-								on:click={fetchPrStatus}
-								on:keypress={fetchPrStatus}
-								use:tooltip={statusToTooltip(prStatus)}
-							>
-								{#if isFetching}
-									<Icon name="spinner" />
-								{:else}
-									<Icon name={prIcon} color={prColor} />
-								{/if}
-							</div>
-						{/if}
+							{#if isFetching}
+								<Icon name="spinner" />
+							{:else}
+								<Icon name={prIcon} color={prColor} />
+							{/if}
+						</div>
 					{/if}
 					{#await branch.isMergeable then isMergeable}
 						{#if !isMergeable}
@@ -397,7 +326,6 @@
 								kind="outlined"
 								color="neutral"
 								on:click={() => {
-									console.log('meatballButton', meatballButton);
 									visible = !visible;
 								}}
 							/>
diff --git a/gitbutler-ui/src/lib/components/BranchLane.svelte b/gitbutler-ui/src/lib/components/BranchLane.svelte
index 45e9b5f5f..ce7649117 100644
--- a/gitbutler-ui/src/lib/components/BranchLane.svelte
+++ b/gitbutler-ui/src/lib/components/BranchLane.svelte
@@ -66,7 +66,7 @@
 	class="wrapper"
 	data-tauri-drag-region
 	class:target-branch={branch.active && branch.selectedForChanges}
-	class:selected
+	class:file-selected={selected}
 >
 	<BranchCard
 		{branch}
@@ -103,7 +103,9 @@
 				selectable={$commitBoxOpen && !isUnapplied}
 				on:close={() => {
 					const selectedId = selected?.id;
-					selectedFiles.update((fileIds) => fileIds.filter((file) => file.id != selectedId));
+					selectedFiles.update((fileIds) =>
+						fileIds.filter((file) => file.id != selectedId)
+					);
 				}}
 			/>
 			<Resizer
@@ -143,7 +145,7 @@
 		);
 	}
 
-	.selected {
+	.file-selected {
 		--selected-resize-shift: calc(var(--space-6) * -1);
 		--selected-target-branch-right-padding: calc(var(--space-4) * -1);
 		--selected-opacity: 0;
diff --git a/gitbutler-ui/src/lib/components/FileListItem.svelte b/gitbutler-ui/src/lib/components/FileListItem.svelte
index d063e01d3..e7335f929 100644
--- a/gitbutler-ui/src/lib/components/FileListItem.svelte
+++ b/gitbutler-ui/src/lib/components/FileListItem.svelte
@@ -56,8 +56,10 @@
 					{indeterminate}
 					on:change={(e) => {
 						selectedOwnership.update((ownership) => {
-							if (e.detail) file.hunks.forEach((h) => ownership.addHunk(file.id, h.id));
-							if (!e.detail) file.hunks.forEach((h) => ownership.removeHunk(file.id, h.id));
+							if (e.detail)
+								file.hunks.forEach((h) => ownership.addHunk(file.id, h.id));
+							if (!e.detail)
+								file.hunks.forEach((h) => ownership.removeHunk(file.id, h.id));
 							return ownership;
 						});
 					}}
@@ -120,13 +122,13 @@
 		line-height: 120%;
 	}
 	.path {
-		color: var(--clr-theme-scale-ntrl-40);
+		color: var(--clr-theme-scale-ntrl-0);
 		line-height: 120%;
 		flex-shrink: 1;
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		overflow: hidden;
-		line-height: 120%;
+		opacity: 0.3;
 	}
 	.selected-draggable {
 		background-color: var(--clr-theme-pop-container);