Skip to content

Commit f30ec26

Browse files
wolfibDevtools-frontend LUCI CQ
authored and
Devtools-frontend LUCI CQ
committed
[Patch agent] Decode folder names in user-facing UI strings
Screenshots: https://imgur.com/a/OgNBVRq Bug: 406133185 Change-Id: I5f3504f4153487305a0c475630c9523d1b4ec9f5 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6433948 Commit-Queue: Alex Rudenko <alexrudenko@chromium.org> Auto-Submit: Wolfgang Beyer <wolfi@chromium.org> Reviewed-by: Alex Rudenko <alexrudenko@chromium.org>
1 parent f02dac7 commit f30ec26

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

front_end/panels/ai_assistance/PatchWidget.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ import '../../ui/components/tooltips/tooltips.js';
1111
import * as Common from '../../core/common/common.js';
1212
import * as Host from '../../core/host/host.js';
1313
import * as i18n from '../../core/i18n/i18n.js';
14-
import type * as Platform from '../../core/platform/platform.js';
14+
import * as Platform from '../../core/platform/platform.js';
1515
import * as Root from '../../core/root/root.js';
1616
import * as AiAssistanceModel from '../../models/ai_assistance/ai_assistance.js';
17-
import * as Persistence from '../../models/persistence/persistence.js';
1817
import * as Workspace from '../../models/workspace/workspace.js';
1918
import * as WorkspaceDiff from '../../models/workspace_diff/workspace_diff.js';
2019
import * as Buttons from '../../ui/components/buttons/buttons.js';
@@ -147,7 +146,7 @@ export interface ViewInput {
147146
sources?: string;
148147
projectName?: string;
149148
savedToDisk?: boolean;
150-
projectPath: Platform.DevToolsPath.UrlString;
149+
projectPath: Platform.DevToolsPath.RawPathString;
151150
applyToWorkspaceTooltipText: Platform.UIString.LocalizedString;
152151
onLearnMoreTooltipClick: () => void;
153152
onApplyToWorkspace: () => void;
@@ -392,15 +391,21 @@ export class PatchWidget extends UI.Widget.Widget {
392391
}
393392

394393
override performUpdate(): void {
394+
const projectName = this.#project ? Common.ParsedURL.ParsedURL.encodedPathToRawPathString(
395+
this.#project.displayName() as Platform.DevToolsPath.EncodedPathString) :
396+
undefined;
397+
const projectPath = this.#project ?
398+
Common.ParsedURL.ParsedURL.urlToRawPathString(
399+
this.#project.id() as Platform.DevToolsPath.UrlString, Host.Platform.isWin()) :
400+
Platform.DevToolsPath.EmptyRawPathString;
395401
this.#view(
396402
{
397403
workspaceDiff: this.#workspaceDiff,
398404
changeSummary: this.changeSummary,
399405
patchSuggestionState: this.#patchSuggestionState,
400406
sources: this.#patchSources,
401-
projectName: this.#project?.displayName(),
402-
projectPath: Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding.fileSystemPath(
403-
(this.#project?.id() || '') as Platform.DevToolsPath.UrlString),
407+
projectName,
408+
projectPath,
404409
savedToDisk: this.#savedToDisk,
405410
applyToWorkspaceTooltipText: this.#noLogging ?
406411
lockedString(UIStringsNotTranslate.applyToWorkspaceTooltipNoLogging) :

front_end/panels/ai_assistance/SelectWorkspaceDialog.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
/* eslint-disable rulesdir/no-imperative-dom-api */
55
/* eslint-disable rulesdir/no-lit-render-outside-of-view */
66

7-
import type * as Common from '../../core/common/common.js';
7+
import * as Common from '../../core/common/common.js';
8+
import * as Host from '../../core/host/host.js';
89
import * as i18n from '../../core/i18n/i18n.js';
910
import type * as Platform from '../../core/platform/platform.js';
1011
import * as Persistence from '../../models/persistence/persistence.js';
@@ -177,12 +178,12 @@ export class SelectWorkspaceDialog extends UI.Widget.VBox {
177178

178179
override performUpdate(): void {
179180
const viewInput = {
180-
projects:
181-
this.#projects.map(project => ({
182-
name: project.displayName(),
183-
path: Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding.fileSystemPath(
184-
(project?.id() || '') as Platform.DevToolsPath.UrlString),
185-
})),
181+
projects: this.#projects.map(project => ({
182+
name: Common.ParsedURL.ParsedURL.encodedPathToRawPathString(
183+
project.displayName() as Platform.DevToolsPath.EncodedPathString),
184+
path: Common.ParsedURL.ParsedURL.urlToRawPathString(
185+
project.id() as Platform.DevToolsPath.UrlString, Host.Platform.isWin()),
186+
})),
186187
selectedIndex: this.#selectedIndex,
187188
onProjectSelected: (index: number) => {
188189
this.#selectedIndex = index;

front_end/ui/visual_logging/KnownContextValues.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ export const knownContextValues = new Set([
489489
'autofill-view',
490490
'autofill-view-documentation',
491491
'autofill-view-feedback',
492+
'automatic-workspace-folders',
492493
'automatic-workspace-folders.connect',
493494
'automatically-ignore-list-known-third-party-scripts',
494495
'auxclick',
@@ -3345,6 +3346,7 @@ export const knownContextValues = new Set([
33453346
'src',
33463347
'srgb',
33473348
'stack-trace',
3349+
'stage-to-workspace',
33483350
'stalled',
33493351
'standard-emulated-device-list',
33503352
'start',

0 commit comments

Comments
 (0)