From c643c224ab779629ec44ad3c18fa39c944e360f1 Mon Sep 17 00:00:00 2001
From: Camden Cheek <camden@ccheek.com>
Date: Fri, 2 Aug 2024 15:01:48 -0600
Subject: [PATCH] Chore: remove non-null assertions (#64249)

Followup from #64236
---
 .../src/lib/codenav/ExplorePanel.svelte       |  4 ++--
 .../lib/codenav/ExplorePanelFileUsages.svelte | 22 ++++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/client/web-sveltekit/src/lib/codenav/ExplorePanel.svelte b/client/web-sveltekit/src/lib/codenav/ExplorePanel.svelte
index 5c8a74aa031..61a17c4f0d6 100644
--- a/client/web-sveltekit/src/lib/codenav/ExplorePanel.svelte
+++ b/client/web-sveltekit/src/lib/codenav/ExplorePanel.svelte
@@ -51,13 +51,13 @@
         const repoGroups: RepoGroup[] = []
 
         for (const usage of usages) {
-            const repo = usage.usageRange!.repository
+            const repo = usage.usageRange.repository
             if (seenRepos[repo] === undefined) {
                 seenRepos[repo] = { index: repoGroups.length, seenPaths: {} }
                 repoGroups.push({ repo, pathGroups: [] })
             }
 
-            const path = usage.usageRange!.path
+            const path = usage.usageRange.path
             const seenPaths = seenRepos[repo].seenPaths
             const pathGroups = repoGroups[seenRepos[repo].index].pathGroups
 
diff --git a/client/web-sveltekit/src/lib/codenav/ExplorePanelFileUsages.svelte b/client/web-sveltekit/src/lib/codenav/ExplorePanelFileUsages.svelte
index 8be60a91858..d63d2efd6be 100644
--- a/client/web-sveltekit/src/lib/codenav/ExplorePanelFileUsages.svelte
+++ b/client/web-sveltekit/src/lib/codenav/ExplorePanelFileUsages.svelte
@@ -16,12 +16,8 @@
     export let usages: ExplorePanel_Usage[]
     export let scrollContainer: HTMLElement | undefined
 
-    // TODO: remove all the usageRange! assertions once the backend is updated to
-    // use a non-nullable type in the API. I've already confirmed that it should always
-    // be non-null.
-    //
     // FIXME: Assumes that all usages for a repo/path combo are at the same revision.
-    $: revision = usages[0].usageRange!.revision
+    $: revision = usages[0].usageRange.revision
 
     let highlightedHTMLChunks: string[][] | undefined
     let visible = false
@@ -33,8 +29,8 @@
                 path: path,
             },
             ranges: usages.map(usage => ({
-                startLine: usage.usageRange!.range.start.line,
-                endLine: usage.usageRange!.range.end.line + 1,
+                startLine: usage.usageRange.range.start.line,
+                endLine: usage.usageRange.range.end.line + 1,
             })),
         })
             .then(result => {
@@ -44,7 +40,7 @@
     }
 
     function hrefForUsage(usage: ExplorePanel_Usage): string {
-        const { repository, revision, path, range } = usage.usageRange!
+        const { repository, revision, path, range } = usage.usageRange
         return SourcegraphURL.from(`${repository}@${revision}/-/blob/${path}`)
             .setLineRange({
                 line: range.start.line + 1,
@@ -56,13 +52,13 @@
     }
 
     $: usageExcerpts = usages.map((usage, index) => ({
-        startLine: usage.usageRange!.range.start.line,
+        startLine: usage.usageRange.range.start.line,
         matches: [
             {
-                startLine: usage.usageRange!.range.start.line,
-                startCharacter: usage.usageRange!.range.start.character,
-                endLine: usage.usageRange!.range.end.line,
-                endCharacter: usage.usageRange!.range.end.character,
+                startLine: usage.usageRange.range.start.line,
+                startCharacter: usage.usageRange.range.start.character,
+                endLine: usage.usageRange.range.end.line,
+                endCharacter: usage.usageRange.range.end.character,
             },
         ],
         plaintextLines: [usage.surroundingContent],