Remove unnecessary calls to cloneAsWritable()

Signed-off-by: William So <polyipseity@gmail.com>
polyipseity · May 5, 2023 · 3e43b2f · 3e43b2f
1 parent 2440533
commit 3e43b2f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 36 deletions.
diff --git a/sources/@types/obsidian.d.ts b/sources/@types/obsidian.d.ts
@@ -4,6 +4,14 @@ import type { Private } from "sources/utils/private"
 
 declare module "obsidian" {
 	interface DataAdapter extends Private<$DataAdapter> { }
+	interface Scope {
+		// eslint-disable-next-line @typescript-eslint/method-signature-style
+		register(
+			modifiers: readonly Modifier[],
+			key: string | null,
+			func: KeymapEventListener,
+		): KeymapEventHandler
+	}
 	interface ViewStateResult extends Private<$ViewStateResult> { }
 	interface WorkspaceLeaf extends Private<$WorkspaceLeaf> { }
 	interface WorkspaceRibbon extends Private<$WorkspaceRibbon> { }

diff --git a/sources/terminal/view.ts b/sources/terminal/view.ts
@@ -252,42 +252,26 @@ export class TerminalView extends ItemView {
 		super(leaf)
 		this.navigation = true
 		const { scope, focusedScope } = this
-		scope.register(
-			cloneAsWritable(TerminalView.modifiers),
-			"`",
-			event => {
-				this.#emulator?.terminal.focus()
-				consumeEvent(event)
-			},
-		)
-		focusedScope.register(
-			cloneAsWritable(TerminalView.modifiers),
-			"`",
-			event => {
-				const { contentEl: { ownerDocument: { activeElement } } } = this
-				if (instanceOf(activeElement, HTMLElement) ||
-					instanceOf(activeElement, SVGElement)) {
-					activeElement.blur()
-				}
-				consumeEvent(event)
-			},
-		)
-		focusedScope.register(
-			cloneAsWritable(TerminalView.modifiers),
-			"f",
-			event => {
-				this.startFind()
-				consumeEvent(event)
-			},
-		)
-		focusedScope.register(
-			cloneAsWritable(TerminalView.modifiers),
-			"k",
-			event => {
-				this.#emulator?.terminal.clear()
-				consumeEvent(event)
-			},
-		)
+		scope.register(TerminalView.modifiers, "`", event => {
+			this.#emulator?.terminal.focus()
+			consumeEvent(event)
+		})
+		focusedScope.register(TerminalView.modifiers, "`", event => {
+			const { contentEl: { ownerDocument: { activeElement } } } = this
+			if (instanceOf(activeElement, HTMLElement) ||
+				instanceOf(activeElement, SVGElement)) {
+				activeElement.blur()
+			}
+			consumeEvent(event)
+		})
+		focusedScope.register(TerminalView.modifiers, "f", event => {
+			this.startFind()
+			consumeEvent(event)
+		})
+		focusedScope.register(TerminalView.modifiers, "k", event => {
+			this.#emulator?.terminal.clear()
+			consumeEvent(event)
+		})
 	}
 
 	protected get state(): TerminalView.State {