-
Notifications
You must be signed in to change notification settings - Fork 489
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Changes] Add CombinedDiffView and render it when patching enabled
Bug: 393265936 Change-Id: Ia0ff8777371da43d4d8f13a617ac391c6d7fa438 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6291327 Reviewed-by: Alex Rudenko <[email protected]> Commit-Queue: Ergün Erdoğmuş <[email protected]>
- Loading branch information
Showing
8 changed files
with
401 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| // Copyright 2025 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| import * as Platform from '../../core/platform/platform.js'; | ||
| import * as SDK from '../../core/sdk/sdk.js'; | ||
| import * as Bindings from '../../models/bindings/bindings.js'; | ||
| import * as Breakpoints from '../../models/breakpoints/breakpoints.js'; | ||
| import * as Persistence from '../../models/persistence/persistence.js'; | ||
| import * as Workspace from '../../models/workspace/workspace.js'; | ||
| import * as WorkspaceDiff from '../../models/workspace_diff/workspace_diff.js'; | ||
| import {describeWithEnvironment, updateHostConfig} from '../../testing/EnvironmentHelpers.js'; | ||
| import {expectCall} from '../../testing/ExpectStubCall.js'; | ||
| import {createFileSystemUISourceCode} from '../../testing/UISourceCodeHelpers.js'; | ||
|
|
||
| import * as CombinedDiffView from './CombinedDiffView.js'; | ||
|
|
||
| const {urlString} = Platform.DevToolsPath; | ||
|
|
||
| const URL = urlString`file:///tmp/example.html`; | ||
|
|
||
| function createWorkspace(): Workspace.Workspace.WorkspaceImpl { | ||
| return Workspace.Workspace.WorkspaceImpl.instance({forceNew: true}); | ||
| } | ||
|
|
||
| function createWorkspaceDiff({workspace}: {workspace: Workspace.Workspace.WorkspaceImpl}): | ||
| WorkspaceDiff.WorkspaceDiff.WorkspaceDiffImpl { | ||
| const debuggerWorkspaceBinding = Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance({ | ||
| forceNew: true, | ||
| targetManager: SDK.TargetManager.TargetManager.instance(), | ||
| resourceMapping: | ||
| new Bindings.ResourceMapping.ResourceMapping(SDK.TargetManager.TargetManager.instance(), workspace), | ||
| }); | ||
| const breakpointManager = Breakpoints.BreakpointManager.BreakpointManager.instance({ | ||
| forceNew: true, | ||
| targetManager: SDK.TargetManager.TargetManager.instance(), | ||
| workspace, | ||
| debuggerWorkspaceBinding, | ||
| }); | ||
| Persistence.Persistence.PersistenceImpl.instance({forceNew: true, workspace, breakpointManager}); | ||
| Persistence.NetworkPersistenceManager.NetworkPersistenceManager.instance({forceNew: true, workspace}); | ||
| return new WorkspaceDiff.WorkspaceDiff.WorkspaceDiffImpl(workspace); | ||
| } | ||
|
|
||
| async function createCombinedDiffView({workspaceDiff}: {workspaceDiff: WorkspaceDiff.WorkspaceDiff.WorkspaceDiffImpl}) { | ||
| const view = sinon.stub<[CombinedDiffView.ViewInput, unknown, HTMLElement]>(); | ||
| const combinedDiffView = new CombinedDiffView.CombinedDiffView(undefined, view); | ||
| combinedDiffView.workspaceDiff = workspaceDiff; | ||
|
|
||
| /** | ||
| * Triggers the action and returns args of the next view function | ||
| * call. | ||
| */ | ||
| async function expectViewUpdate(action: () => void) { | ||
| const result = expectCall(view); | ||
| action(); | ||
| const viewArgs = await result; | ||
| return viewArgs[0]; | ||
| } | ||
|
|
||
| const initialViewInput = await expectViewUpdate(() => { | ||
| combinedDiffView.markAsRoot(); | ||
| combinedDiffView.show(document.body); | ||
| }); | ||
|
|
||
| return {initialViewInput, combinedDiffView, view, expectViewUpdate}; | ||
| } | ||
|
|
||
| describeWithEnvironment('CombinedDiffView', () => { | ||
| let workspaceDiff: WorkspaceDiff.WorkspaceDiff.WorkspaceDiffImpl; | ||
| let uiSourceCode: Workspace.UISourceCode.UISourceCode; | ||
| beforeEach(() => { | ||
| // This is needed for tracking file system UI source codes. | ||
| updateHostConfig({devToolsImprovedWorkspaces: {enabled: true}}); | ||
| const workspace = createWorkspace(); | ||
| workspaceDiff = createWorkspaceDiff({workspace}); | ||
| ({uiSourceCode} = | ||
| createFileSystemUISourceCode({url: URL, content: 'const data={original:true}', mimeType: 'text/javascript'})); | ||
| }); | ||
|
|
||
| it('should render modified UISourceCode from a workspaceDiff on initial render', async () => { | ||
| uiSourceCode.setWorkingCopy('const data={original:false}'); | ||
| const {initialViewInput} = await createCombinedDiffView({workspaceDiff}); | ||
|
|
||
| assert.lengthOf(initialViewInput.singleDiffViewInputs, 1); | ||
| }); | ||
|
|
||
| it('should render newly modified UISourceCode from a workspaceDiff', async () => { | ||
| const {initialViewInput, expectViewUpdate} = await createCombinedDiffView({workspaceDiff}); | ||
| assert.lengthOf(initialViewInput.singleDiffViewInputs, 0); | ||
|
|
||
| const viewInput = await expectViewUpdate(() => { | ||
| uiSourceCode.setWorkingCopy('const data={original:false}'); | ||
| }); | ||
|
|
||
| assert.lengthOf(viewInput.singleDiffViewInputs, 1); | ||
| }); | ||
|
|
||
| it('should re-render modified UISourceCode from a workspaceDiff', async () => { | ||
| uiSourceCode.setWorkingCopy('const data={original:false}'); | ||
| const {initialViewInput, expectViewUpdate} = await createCombinedDiffView({workspaceDiff}); | ||
| assert.lengthOf(initialViewInput.singleDiffViewInputs, 1); | ||
|
|
||
| await expectViewUpdate(() => { | ||
| uiSourceCode.setWorkingCopy('const data={modified:true}'); | ||
| }); | ||
| }); | ||
| }); |
Oops, something went wrong.