detached 9cd7713

refactor(engine): remove dead Internal* bridge methods and clean port.Engine interface

commit
9cd77133f63b956d1a819ec5ba5900102ada1760
author
brice · · 2026-03-18 05:43 UTC
parent
54ea5e7
signature
GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email
4 files · +5 -60
Unified
UnifiedSplit
M cmd/dumber/main.go +2 -1
@@ -28,6 +28,7 @@ import (
2828 "github.com/bnema/dumber/internal/infrastructure/snapshot"
2929 "github.com/bnema/dumber/internal/infrastructure/textinput"
3030 "github.com/bnema/dumber/internal/infrastructure/updater"
31+ "github.com/bnema/dumber/internal/infrastructure/webkit"
3132 "github.com/bnema/dumber/internal/infrastructure/xdg"
3233 "github.com/bnema/dumber/internal/logging"
3334 "github.com/bnema/dumber/internal/ui"
@@ -514,7 +515,7 @@ func buildUIDependencies(
514515 currentSessionID entity.SessionID,
515516 startupCrashReports []string,
516517 ) *ui.Dependencies {
517- filterManager := engine.InternalFilterManager()
518+ filterManager := engine.(*webkit.Engine).InternalFilterManager()
518519
519520 focusProvider := textinput.NewFocusProvider()
520521
@@ -28,6 +28,7 @@ import (
28 "github.com/bnema/dumber/internal/infrastructure/snapshot"28 "github.com/bnema/dumber/internal/infrastructure/snapshot"
29 "github.com/bnema/dumber/internal/infrastructure/textinput"29 "github.com/bnema/dumber/internal/infrastructure/textinput"
30 "github.com/bnema/dumber/internal/infrastructure/updater"30 "github.com/bnema/dumber/internal/infrastructure/updater"
31+ "github.com/bnema/dumber/internal/infrastructure/webkit"
31 "github.com/bnema/dumber/internal/infrastructure/xdg"32 "github.com/bnema/dumber/internal/infrastructure/xdg"
32 "github.com/bnema/dumber/internal/logging"33 "github.com/bnema/dumber/internal/logging"
33 "github.com/bnema/dumber/internal/ui"34 "github.com/bnema/dumber/internal/ui"
@@ -514,7 +515,7 @@ func buildUIDependencies(
514 currentSessionID entity.SessionID,515 currentSessionID entity.SessionID,
515 startupCrashReports []string,516 startupCrashReports []string,
516 ) *ui.Dependencies {517 ) *ui.Dependencies {
517- filterManager := engine.InternalFilterManager()518+ filterManager := engine.(*webkit.Engine).InternalFilterManager()
518 519
519 focusProvider := textinput.NewFocusProvider()520 focusProvider := textinput.NewFocusProvider()
520 521
M internal/application/port/engine.go +0 -4
@@ -143,10 +143,6 @@ type Engine interface {
143143
144144 // SetHandlerContext sets the base context for message handler dispatch.
145145 SetHandlerContext(ctx context.Context)
146-
147- // InternalFilterManager returns the FilterManager for content filter lifecycle.
148- // Returns nil if content filtering is not supported.
149- InternalFilterManager() FilterManager
150146 }
151147
152148 // EngineSettingsUpdate carries a runtime config change to the engine.
@@ -143,10 +143,6 @@ type Engine interface {
143 143
144 // SetHandlerContext sets the base context for message handler dispatch.144 // SetHandlerContext sets the base context for message handler dispatch.
145 SetHandlerContext(ctx context.Context)145 SetHandlerContext(ctx context.Context)
146-
147- // InternalFilterManager returns the FilterManager for content filter lifecycle.
148- // Returns nil if content filtering is not supported.
149- InternalFilterManager() FilterManager
150 }146 }
151 147
152 // EngineSettingsUpdate carries a runtime config change to the engine.148 // EngineSettingsUpdate carries a runtime config change to the engine.
M internal/application/port/mocks/mocks.go +0 -46
@@ -2922,52 +2922,6 @@ func (_c *MockEngine_FilterApplier_Call) RunAndReturn(run func() port.FilterAppl
29222922 return _c
29232923 }
29242924
2925-// InternalFilterManager provides a mock function for the type MockEngine
2926-func (_mock *MockEngine) InternalFilterManager() port.FilterManager {
2927- ret := _mock.Called()
2928-
2929- if len(ret) == 0 {
2930- panic("no return value specified for InternalFilterManager")
2931- }
2932-
2933- var r0 port.FilterManager
2934- if returnFunc, ok := ret.Get(0).(func() port.FilterManager); ok {
2935- r0 = returnFunc()
2936- } else {
2937- if ret.Get(0) != nil {
2938- r0 = ret.Get(0).(port.FilterManager)
2939- }
2940- }
2941- return r0
2942-}
2943-
2944-// MockEngine_InternalFilterManager_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'InternalFilterManager'
2945-type MockEngine_InternalFilterManager_Call struct {
2946- *mock.Call
2947-}
2948-
2949-// InternalFilterManager is a helper method to define mock.On call
2950-func (_e *MockEngine_Expecter) InternalFilterManager() *MockEngine_InternalFilterManager_Call {
2951- return &MockEngine_InternalFilterManager_Call{Call: _e.mock.On("InternalFilterManager")}
2952-}
2953-
2954-func (_c *MockEngine_InternalFilterManager_Call) Run(run func()) *MockEngine_InternalFilterManager_Call {
2955- _c.Call.Run(func(args mock.Arguments) {
2956- run()
2957- })
2958- return _c
2959-}
2960-
2961-func (_c *MockEngine_InternalFilterManager_Call) Return(filterManager port.FilterManager) *MockEngine_InternalFilterManager_Call {
2962- _c.Call.Return(filterManager)
2963- return _c
2964-}
2965-
2966-func (_c *MockEngine_InternalFilterManager_Call) RunAndReturn(run func() port.FilterManager) *MockEngine_InternalFilterManager_Call {
2967- _c.Call.Return(run)
2968- return _c
2969-}
2970-
29712925 // InternalSchemePath provides a mock function for the type MockEngine
29722926 func (_mock *MockEngine) InternalSchemePath() string {
29732927 ret := _mock.Called()
@@ -2922,52 +2922,6 @@ func (_c *MockEngine_FilterApplier_Call) RunAndReturn(run func() port.FilterAppl
2922 return _c2922 return _c
2923 }2923 }
2924 2924
2925-// InternalFilterManager provides a mock function for the type MockEngine
2926-func (_mock *MockEngine) InternalFilterManager() port.FilterManager {
2927- ret := _mock.Called()
2928-
2929- if len(ret) == 0 {
2930- panic("no return value specified for InternalFilterManager")
2931- }
2932-
2933- var r0 port.FilterManager
2934- if returnFunc, ok := ret.Get(0).(func() port.FilterManager); ok {
2935- r0 = returnFunc()
2936- } else {
2937- if ret.Get(0) != nil {
2938- r0 = ret.Get(0).(port.FilterManager)
2939- }
2940- }
2941- return r0
2942-}
2943-
2944-// MockEngine_InternalFilterManager_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'InternalFilterManager'
2945-type MockEngine_InternalFilterManager_Call struct {
2946- *mock.Call
2947-}
2948-
2949-// InternalFilterManager is a helper method to define mock.On call
2950-func (_e *MockEngine_Expecter) InternalFilterManager() *MockEngine_InternalFilterManager_Call {
2951- return &MockEngine_InternalFilterManager_Call{Call: _e.mock.On("InternalFilterManager")}
2952-}
2953-
2954-func (_c *MockEngine_InternalFilterManager_Call) Run(run func()) *MockEngine_InternalFilterManager_Call {
2955- _c.Call.Run(func(args mock.Arguments) {
2956- run()
2957- })
2958- return _c
2959-}
2960-
2961-func (_c *MockEngine_InternalFilterManager_Call) Return(filterManager port.FilterManager) *MockEngine_InternalFilterManager_Call {
2962- _c.Call.Return(filterManager)
2963- return _c
2964-}
2965-
2966-func (_c *MockEngine_InternalFilterManager_Call) RunAndReturn(run func() port.FilterManager) *MockEngine_InternalFilterManager_Call {
2967- _c.Call.Return(run)
2968- return _c
2969-}
2970-
2971 // InternalSchemePath provides a mock function for the type MockEngine2925 // InternalSchemePath provides a mock function for the type MockEngine
2972 func (_mock *MockEngine) InternalSchemePath() string {2926 func (_mock *MockEngine) InternalSchemePath() string {
2973 ret := _mock.Called()2927 ret := _mock.Called()
M internal/infrastructure/webkit/engine.go +3 -9
@@ -88,15 +88,9 @@ func (e *Engine) FaviconDatabase() port.FaviconDatabase {
8888 return &faviconDatabaseAdapter{wkCtx: e.wkCtx}
8989 }
9090
91-// --- Temporary accessors for migration (M3->M4 bridge) ---
92-// These will be removed when ui.Dependencies is updated to use port.Engine.
93-
94-func (e *Engine) InternalContext() *WebKitContext { return e.wkCtx }
95-func (e *Engine) InternalSettings() *SettingsManager { return e.settings }
96-func (e *Engine) InternalInjector() *ContentInjector { return e.injector }
97-func (e *Engine) InternalMessageRouter() *MessageRouter { return e.messageRouter }
98-func (e *Engine) InternalPool() *WebViewPool { return e.pool }
99-func (e *Engine) InternalFactory() *WebViewFactory { return e.factory }
91+// InternalFilterManager returns the FilterManager for content filter lifecycle.
92+// This is on the concrete *Engine type (not the port.Engine interface) because
93+// FilterManager is a webkit-specific concern used only during dependency wiring.
10094 func (e *Engine) InternalFilterManager() port.FilterManager { return e.filterManager }
10195
10296 // SetHandlerContext sets the base context for message handler dispatch.
@@ -88,15 +88,9 @@ func (e *Engine) FaviconDatabase() port.FaviconDatabase {
88 return &faviconDatabaseAdapter{wkCtx: e.wkCtx}88 return &faviconDatabaseAdapter{wkCtx: e.wkCtx}
89 }89 }
90 90
91-// --- Temporary accessors for migration (M3->M4 bridge) ---91+// InternalFilterManager returns the FilterManager for content filter lifecycle.
92-// These will be removed when ui.Dependencies is updated to use port.Engine.92+// This is on the concrete *Engine type (not the port.Engine interface) because
93-93+// FilterManager is a webkit-specific concern used only during dependency wiring.
94-func (e *Engine) InternalContext() *WebKitContext { return e.wkCtx }
95-func (e *Engine) InternalSettings() *SettingsManager { return e.settings }
96-func (e *Engine) InternalInjector() *ContentInjector { return e.injector }
97-func (e *Engine) InternalMessageRouter() *MessageRouter { return e.messageRouter }
98-func (e *Engine) InternalPool() *WebViewPool { return e.pool }
99-func (e *Engine) InternalFactory() *WebViewFactory { return e.factory }
100 func (e *Engine) InternalFilterManager() port.FilterManager { return e.filterManager }94 func (e *Engine) InternalFilterManager() port.FilterManager { return e.filterManager }
101 95
102 // SetHandlerContext sets the base context for message handler dispatch.96 // SetHandlerContext sets the base context for message handler dispatch.

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 8

Tags 42

↑↓ moveenter openesc close