hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge conflicts

Browse Source 
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-02-14 13:40:27 +02:00
parent eecd4d556e
commit a966b51e56
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts
View File

@ -6,14 +6,16 @@
import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable"; import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable";
import { terminalShellEnvModify } from "./terminal-shell-env-modifiers"; import { terminalShellEnvModify } from "./terminal-shell-env-modifiers";
const terminalShellEnvModifyInjectable = getInjectable({ const terminalShellEnvModifyInjectable = getInjectable({
id: "terminal-shell-env-modify",
instantiate: (di) => instantiate: (di) =>
terminalShellEnvModify({ terminalShellEnvModify({
extensions: di.inject(mainExtensionsInjectable), extensions: di.inject(mainExtensionsInjectable),
}), }),
lifecycle: lifecycleEnum.singleton, lifecycle: lifecycleEnum.singleton,
}); });
export default terminalShellEnvModifyInjectable; export default terminalShellEnvModifyInjectable;

2
src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx
View File

@ -63,6 +63,8 @@ function getRegisteredStatusBarItems({ registrations }: Dependencies): IComputed
} }
const registeredStatusBarItemsInjectable = getInjectable({ const registeredStatusBarItemsInjectable = getInjectable({
id: "registered-status-bar-items",
instantiate: (di) => getRegisteredStatusBarItems({ instantiate: (di) => getRegisteredStatusBarItems({
registrations: di.inject(statusBarItemsInjectable), registrations: di.inject(statusBarItemsInjectable),
}), }),

2
src/renderer/components/status-bar/status-bar-items.injectable.ts
View File

@ -7,6 +7,8 @@ import { computed } from "mobx";
import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable";
const statusBarItemsInjectable = getInjectable({ const statusBarItemsInjectable = getInjectable({
id: "status-bar-items",
instantiate: (di) => { instantiate: (di) => {
const extensions = di.inject(rendererExtensionsInjectable); const extensions = di.inject(rendererExtensionsInjectable);

4
src/renderer/components/status-bar/status-bar.test.tsx
View File

@ -10,7 +10,7 @@ import { getDiForUnitTesting } from "../../getDiForUnitTesting";
import type { DiRender } from "../test-utils/renderFor"; import type { DiRender } from "../test-utils/renderFor";
import { renderFor } from "../test-utils/renderFor"; import { renderFor } from "../test-utils/renderFor";
import { computed, IObservableArray, observable } from "mobx"; import { computed, IObservableArray, observable } from "mobx";
import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable"; import type { DiContainer } from "@ogre-tools/injectable";
import statusBarItemsInjectable from "./status-bar-items.injectable"; import statusBarItemsInjectable from "./status-bar-items.injectable";
import type { StatusBarRegistration } from "./status-bar-registration"; import type { StatusBarRegistration } from "./status-bar-registration";
import { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; import { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
@ -35,7 +35,7 @@ class SomeTestExtension extends LensRendererExtension {
describe("<StatusBar />", () => { describe("<StatusBar />", () => {
let render: DiRender; let render: DiRender;
let di: ConfigurableDependencyInjectionContainer; let di: DiContainer;
let statusBarItems: IObservableArray<any>; let statusBarItems: IObservableArray<any>;
beforeEach(async () => { beforeEach(async () => {