third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatterEditorAction.js - Issue 1523193002: DevTools: merge UISourceCode's parentPath, name, originURL and uri.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatterEditorAction.js

Issue 1523193002: DevTools: merge UISourceCode's parentPath, name, originURL and uri. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebaselined Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js ('k') | third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatterEditorAction.js

diff --git a/third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatterEditorAction.js b/third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatterEditorAction.js

index 0127e4c4355bbda5632eee65677abb82d52f36f5..311aa715aa7bbb9cfe2eaa62d8de1d65ea6a1b62 100644

--- a/third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatterEditorAction.js

+++ b/third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatterEditorAction.js

@@ -103,7 +103,7 @@ WebInspector.FormatterScriptMapping.FormatData = function(projectId, path, mappi

WebInspector.ScriptFormatterEditorAction = function()

{

this._projectId = "formatter:";

- this._project = new WebInspector.ContentProviderBasedProject(WebInspector.workspace, this._projectId, WebInspector.projectTypes.Formatter, "", "formatter");

+ this._project = new WebInspector.ContentProviderBasedProject(WebInspector.workspace, this._projectId, WebInspector.projectTypes.Formatter, "formatter");

/** @type {!Map.<!WebInspector.Script, !WebInspector.UISourceCode>} */

this._uiSourceCodes = new Map();

@@ -370,16 +370,8 @@ WebInspector.ScriptFormatterEditorAction.prototype = {

function innerCallback(formattedContent, formatterMapping)

{

var scripts = this._scriptsForUISourceCode(uiSourceCode);

- var name;

- if (uiSourceCode.contentType() === WebInspector.resourceTypes.Document)

- name = uiSourceCode.displayName();

- else

- name = uiSourceCode.name() || (scripts.length ? scripts[0].scriptId : "");

- var networkURL = WebInspector.networkMapping.networkURL(uiSourceCode);

var contentProvider = new WebInspector.StaticContentProvider(uiSourceCode.contentType(), formattedContent);

- var formattedUISourceCode = this._project.addContentProvider(networkURL, name + ":formatted", networkURL, contentProvider);

+ var formattedUISourceCode = this._project.addContentProvider(uiSourceCode.path() + ":formatted", contentProvider);

var formattedPath = formattedUISourceCode.path();

var formatData = new WebInspector.FormatterScriptMapping.FormatData(uiSourceCode.project().id(), uiSourceCode.path(), formatterMapping, scripts);

this._formatData.set(formattedUISourceCode, formatData);