From d00877c0c8096becf5af8c53f9fc684df634fc1d Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Wed, 13 Apr 2022 13:35:41 +0300 Subject: [PATCH] Rename another delegate for accuracy Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- src/main/menu/stop-application-menu.injectable.ts | 4 ++-- .../before-application-hard-quit-injection-token.ts} | 4 ++-- .../implementations/clean-up-deep-linking.injectable.ts | 4 ++-- .../implementations/clean-up-shell-sessions.injectable.ts | 4 ++-- .../implementations/quit-application.injectable.ts | 4 ++-- src/main/tray/stop-tray.injectable.ts | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) rename src/main/start-main-application/{on-application-hard-quit/on-application-hard-quit-injection-token.ts => before-application-hard-quit/before-application-hard-quit-injection-token.ts} (72%) rename src/main/start-main-application/{on-application-hard-quit => before-application-hard-quit}/implementations/clean-up-deep-linking.injectable.ts (80%) rename src/main/start-main-application/{on-application-hard-quit => before-application-hard-quit}/implementations/clean-up-shell-sessions.injectable.ts (75%) diff --git a/src/main/menu/stop-application-menu.injectable.ts b/src/main/menu/stop-application-menu.injectable.ts index d50fe2f936..7dcc999f6d 100644 --- a/src/main/menu/stop-application-menu.injectable.ts +++ b/src/main/menu/stop-application-menu.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuInjectable from "./application-menu.injectable"; -import { onApplicationHardQuitInjectionToken } from "../start-main-application/on-application-hard-quit/on-application-hard-quit-injection-token"; +import { beforeApplicationHardQuitInjectionToken } from "../start-main-application/before-application-hard-quit/before-application-hard-quit-injection-token"; const stopApplicationMenuInjectable = getInjectable({ id: "stop-application-menu", @@ -21,7 +21,7 @@ const stopApplicationMenuInjectable = getInjectable({ }; }, - injectionToken: onApplicationHardQuitInjectionToken, + injectionToken: beforeApplicationHardQuitInjectionToken, }); export default stopApplicationMenuInjectable; diff --git a/src/main/start-main-application/on-application-hard-quit/on-application-hard-quit-injection-token.ts b/src/main/start-main-application/before-application-hard-quit/before-application-hard-quit-injection-token.ts similarity index 72% rename from src/main/start-main-application/on-application-hard-quit/on-application-hard-quit-injection-token.ts rename to src/main/start-main-application/before-application-hard-quit/before-application-hard-quit-injection-token.ts index 46499cd465..664d79ff2e 100644 --- a/src/main/start-main-application/on-application-hard-quit/on-application-hard-quit-injection-token.ts +++ b/src/main/start-main-application/before-application-hard-quit/before-application-hard-quit-injection-token.ts @@ -5,8 +5,8 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import type { Runnable } from "../run-many-for"; -export const onApplicationHardQuitInjectionToken = getInjectionToken< +export const beforeApplicationHardQuitInjectionToken = getInjectionToken< Runnable<{ cancel: () => void }> >({ - id: "on-application-hard-quit", + id: "before-application-hard-quit", }); diff --git a/src/main/start-main-application/on-application-hard-quit/implementations/clean-up-deep-linking.injectable.ts b/src/main/start-main-application/before-application-hard-quit/implementations/clean-up-deep-linking.injectable.ts similarity index 80% rename from src/main/start-main-application/on-application-hard-quit/implementations/clean-up-deep-linking.injectable.ts rename to src/main/start-main-application/before-application-hard-quit/implementations/clean-up-deep-linking.injectable.ts index c77c9fb92a..12e7a467cf 100644 --- a/src/main/start-main-application/on-application-hard-quit/implementations/clean-up-deep-linking.injectable.ts +++ b/src/main/start-main-application/before-application-hard-quit/implementations/clean-up-deep-linking.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationHardQuitInjectionToken } from "../on-application-hard-quit-injection-token"; +import { beforeApplicationHardQuitInjectionToken } from "../before-application-hard-quit-injection-token"; import lensProtocolRouterMainInjectable from "../../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable"; const cleanUpDeepLinkingInjectable = getInjectable({ @@ -19,7 +19,7 @@ const cleanUpDeepLinkingInjectable = getInjectable({ }; }, - injectionToken: onApplicationHardQuitInjectionToken, + injectionToken: beforeApplicationHardQuitInjectionToken, }); export default cleanUpDeepLinkingInjectable; diff --git a/src/main/start-main-application/on-application-hard-quit/implementations/clean-up-shell-sessions.injectable.ts b/src/main/start-main-application/before-application-hard-quit/implementations/clean-up-shell-sessions.injectable.ts similarity index 75% rename from src/main/start-main-application/on-application-hard-quit/implementations/clean-up-shell-sessions.injectable.ts rename to src/main/start-main-application/before-application-hard-quit/implementations/clean-up-shell-sessions.injectable.ts index 8581c8bc7e..7295a420fe 100644 --- a/src/main/start-main-application/on-application-hard-quit/implementations/clean-up-shell-sessions.injectable.ts +++ b/src/main/start-main-application/before-application-hard-quit/implementations/clean-up-shell-sessions.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationHardQuitInjectionToken } from "../on-application-hard-quit-injection-token"; +import { beforeApplicationHardQuitInjectionToken } from "../before-application-hard-quit-injection-token"; import { ShellSession } from "../../../shell-session/shell-session"; const cleanUpShellSessionsInjectable = getInjectable({ @@ -15,7 +15,7 @@ const cleanUpShellSessionsInjectable = getInjectable({ }, }), - injectionToken: onApplicationHardQuitInjectionToken, + injectionToken: beforeApplicationHardQuitInjectionToken, }); export default cleanUpShellSessionsInjectable; diff --git a/src/main/start-main-application/on-application-soft-quit/implementations/quit-application.injectable.ts b/src/main/start-main-application/on-application-soft-quit/implementations/quit-application.injectable.ts index 802f534853..908491de06 100644 --- a/src/main/start-main-application/on-application-soft-quit/implementations/quit-application.injectable.ts +++ b/src/main/start-main-application/on-application-soft-quit/implementations/quit-application.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { onApplicationHardQuitInjectionToken } from "../../on-application-hard-quit/on-application-hard-quit-injection-token"; +import { beforeApplicationHardQuitInjectionToken } from "../../before-application-hard-quit/before-application-hard-quit-injection-token"; import { runManyFor } from "../../run-many-for"; import { onApplicationSoftQuitInjectionToken } from "../on-application-soft-quit-injection-token"; import isIntegrationTestingInjectable from "../../../../common/vars/is-integration-testing.injectable"; @@ -13,7 +13,7 @@ const quitApplicationInjectable = getInjectable({ instantiate: (di) => { const runMany = runManyFor(di); - const runOnApplicationQuit = runMany(onApplicationHardQuitInjectionToken); + const runOnApplicationQuit = runMany(beforeApplicationHardQuitInjectionToken); const isIntegrationTesting = di.inject(isIntegrationTestingInjectable); return { diff --git a/src/main/tray/stop-tray.injectable.ts b/src/main/tray/stop-tray.injectable.ts index ad2b85a3f5..403897c8fd 100644 --- a/src/main/tray/stop-tray.injectable.ts +++ b/src/main/tray/stop-tray.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import trayInjectable from "./tray.injectable"; -import { onApplicationHardQuitInjectionToken } from "../start-main-application/on-application-hard-quit/on-application-hard-quit-injection-token"; +import { beforeApplicationHardQuitInjectionToken } from "../start-main-application/before-application-hard-quit/before-application-hard-quit-injection-token"; const stopTrayInjectable = getInjectable({ id: "stop-tray", @@ -19,7 +19,7 @@ const stopTrayInjectable = getInjectable({ }; }, - injectionToken: onApplicationHardQuitInjectionToken, + injectionToken: beforeApplicationHardQuitInjectionToken, }); export default stopTrayInjectable;