Skip to content

Commit e839c0c

Browse files
jackfranklinDevtools-frontend LUCI CQ
authored andcommitted
Enable long import wrapping for JS imports
DISABLE_THIRD_PARTY_CHECK=big clang format run against all files in front_end and test/ Bug: 1319340 Change-Id: I1fff63cb07544ccd0e3059fc901f9a48ff4af13b Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3598879 Reviewed-by: Alex Rudenko <[email protected]> Commit-Queue: Jack Franklin <[email protected]> Reviewed-by: Wolfgang Beyer <[email protected]>
1 parent 4853b34 commit e839c0c

File tree

166 files changed

+1595
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+1595
-253
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ CommentPragmas: .*\@.*
77
AllowShortBlocksOnASingleLine: false
88
AllowShortFunctionsOnASingleLine: None
99
ReflowComments: false
10+
JavaScriptWrapImports: true

front_end/core/common/Color.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,15 @@
3333

3434
import * as Platform from '../platform/platform.js';
3535

36-
import {blendColors, contrastRatioAPCA, desiredLuminanceAPCA, luminance, luminanceAPCA, rgbaToHsla, rgbaToHwba} from './ColorUtils.js';
36+
import {
37+
blendColors,
38+
contrastRatioAPCA,
39+
desiredLuminanceAPCA,
40+
luminance,
41+
luminanceAPCA,
42+
rgbaToHsla,
43+
rgbaToHwba,
44+
} from './ColorUtils.js';
3745

3846
export class Color {
3947
#hslaInternal: number[]|undefined;

front_end/core/common/Object.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
*/
2929

3030
import type * as Platform from '../platform/platform.js';
31-
import type {EventDescriptor, EventListener, EventTarget, EventTargetEvent, EventPayloadToRestParameters} from './EventTarget.js';
31+
import type {
32+
EventDescriptor, EventListener, EventTarget, EventTargetEvent, EventPayloadToRestParameters} from './EventTarget.js';
3233

3334
export interface ListenerCallbackTuple<Events, T extends keyof Events> {
3435
thisObject?: Object;

front_end/core/common/Settings.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,19 @@ import {Format} from './Color.js';
3636
import {Console} from './Console.js';
3737
import type {GenericEvents, EventDescriptor, EventTargetEvent} from './EventTarget.js';
3838
import {ObjectWrapper} from './Object.js';
39-
import {getLocalizedSettingsCategory, getRegisteredSettings, maybeRemoveSettingExtension, type RegExpSettingItem, registerSettingExtension, registerSettingsForTest, resetSettings, SettingCategory, type SettingExtensionOption, type SettingRegistration, SettingType} from './SettingRegistration.js';
39+
import {
40+
getLocalizedSettingsCategory,
41+
getRegisteredSettings,
42+
maybeRemoveSettingExtension,
43+
type RegExpSettingItem,
44+
registerSettingExtension,
45+
registerSettingsForTest,
46+
resetSettings,
47+
SettingCategory,
48+
type SettingExtensionOption,
49+
type SettingRegistration,
50+
SettingType,
51+
} from './SettingRegistration.js';
4052

4153
let settingsInstance: Settings|undefined;
4254

front_end/core/host/InspectorFrontendHost.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ import * as i18n from '../i18n/i18n.js';
3636
import * as Platform from '../platform/platform.js';
3737
import * as Root from '../root/root.js';
3838

39-
import type {CanShowSurveyResult, ContextMenuDescriptor, EnumeratedHistogram, EventTypes, ExtensionDescriptor, InspectorFrontendHostAPI, LoadNetworkResourceResult, ShowSurveyResult, SyncInformation} from './InspectorFrontendHostAPI.js';
39+
import type {
40+
CanShowSurveyResult, ContextMenuDescriptor, EnumeratedHistogram, EventTypes, ExtensionDescriptor,
41+
InspectorFrontendHostAPI, LoadNetworkResourceResult, ShowSurveyResult,
42+
SyncInformation} from './InspectorFrontendHostAPI.js';
4043
import {EventDescriptors, Events} from './InspectorFrontendHostAPI.js';
4144
import {streamWrite as resourceLoaderStreamWrite} from './ResourceLoader.js';
4245

front_end/core/sdk/CSSProperty.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,17 +163,16 @@ export class CSSProperty {
163163

164164
const range = this.range.relativeTo(this.ownerStyle.range.startLine, this.ownerStyle.range.startColumn);
165165
const indentation = this.ownerStyle.cssText ?
166-
this.detectIndentation(this.ownerStyle.cssText) :
167-
Common.Settings.Settings.instance().moduleSetting('textEditorIndent').get();
166+
this.detectIndentation(this.ownerStyle.cssText) :
167+
Common.Settings.Settings.instance().moduleSetting('textEditorIndent').get();
168168
const endIndentation = this.ownerStyle.cssText ? indentation.substring(0, this.ownerStyle.range.endColumn) : '';
169169
const text = new TextUtils.Text.Text(this.ownerStyle.cssText || '');
170170
const newStyleText = text.replaceRange(range, Platform.StringUtilities.sprintf(';%s;', propertyText));
171171
const styleText = await CSSProperty.formatStyle(newStyleText, indentation, endIndentation);
172172
return this.ownerStyle.setText(styleText, majorChange);
173173
}
174174

175-
static async formatStyle(
176-
styleText: string, indentation: string, endIndentation: string): Promise<string> {
175+
static async formatStyle(styleText: string, indentation: string, endIndentation: string): Promise<string> {
177176
const doubleIndent = indentation.substring(endIndentation.length) + indentation;
178177
if (indentation) {
179178
indentation = '\n' + indentation;
@@ -197,7 +196,7 @@ export class CSSProperty {
197196
const disabledProperty = tokenType?.includes('comment') && isDisabledProperty(token);
198197
const isPropertyStart =
199198
(tokenType?.includes('string') || tokenType?.includes('meta') || tokenType?.includes('property') ||
200-
tokenType?.includes('variableName'));
199+
tokenType?.includes('variableName'));
201200
if (disabledProperty) {
202201
result = result.trimEnd() + indentation + token;
203202
} else if (isPropertyStart) {
@@ -222,8 +221,8 @@ export class CSSProperty {
222221
// implementation takes special care to restore a single
223222
// whitespace token in this edge case. https://crbug.com/1071296
224223
const trimmedPropertyText = propertyText.trim();
225-
result =
226-
result.trimEnd() + indentation + trimmedPropertyText + (trimmedPropertyText.endsWith(':') ? ' ' : '') + token;
224+
result = result.trimEnd() + indentation + trimmedPropertyText + (trimmedPropertyText.endsWith(':') ? ' ' : '') +
225+
token;
227226
needsSemi = false;
228227
insideProperty = false;
229228
propertyName = '';

front_end/core/sdk/ConsoleModel.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ import {Events as DebuggerModelEvents} from './DebuggerModel.js';
4444
import {LogModel} from './LogModel.js';
4545
import {RemoteObject} from './RemoteObject.js';
4646
import {Events as ResourceTreeModelEvents, ResourceTreeModel} from './ResourceTreeModel.js';
47-
import type {ConsoleAPICall, ExceptionWithTimestamp, ExecutionContext, QueryObjectRequestedEvent} from './RuntimeModel.js';
47+
import type {
48+
ConsoleAPICall, ExceptionWithTimestamp, ExecutionContext, QueryObjectRequestedEvent} from './RuntimeModel.js';
4849
import {Events as RuntimeModelEvents, RuntimeModel} from './RuntimeModel.js';
4950
import type {Target} from './Target.js';
5051
import {TargetManager} from './TargetManager.js';

front_end/core/sdk/NetworkManager.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
4141
import * as Protocol from '../../generated/protocol.js';
4242

4343
import {Cookie} from './Cookie.js';
44-
import type {BlockedCookieWithReason, ContentData, ExtraRequestInfo, ExtraResponseInfo, MIME_TYPE, NameValue, WebBundleInfo, WebBundleInnerRequestInfo} from './NetworkRequest.js';
44+
import type {
45+
BlockedCookieWithReason, ContentData, ExtraRequestInfo, ExtraResponseInfo, MIME_TYPE, NameValue, WebBundleInfo,
46+
WebBundleInnerRequestInfo} from './NetworkRequest.js';
4547
import {Events as NetworkRequestEvents, NetworkRequest} from './NetworkRequest.js';
4648
import type {Target} from './Target.js';
4749
import {Capability} from './Target.js';

front_end/core/sdk/RuntimeModel.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@ import type {FunctionDetails} from './DebuggerModel.js';
4141
import {DebuggerModel} from './DebuggerModel.js';
4242
import {HeapProfilerModel} from './HeapProfilerModel.js';
4343
import type {ScopeRef} from './RemoteObject.js';
44-
import {RemoteFunction, RemoteObject, RemoteObjectImpl, RemoteObjectProperty, ScopeRemoteObject} from './RemoteObject.js';
44+
import {
45+
RemoteFunction,
46+
RemoteObject,
47+
RemoteObjectImpl,
48+
RemoteObjectProperty,
49+
ScopeRemoteObject,
50+
} from './RemoteObject.js';
4551
import type {Target} from './Target.js';
4652
import {Capability, Type} from './Target.js';
4753
import {SDKModel} from './SDKModel.js';

front_end/entrypoints/formatter_worker/FormatterWorker.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
import * as Platform from '../../core/platform/platform.js';
3232
import * as Root from '../../core/root/root.js';
3333
import * as Acorn from '../../third_party/acorn/acorn.js';
34-
import type * as CodeMirrorModule from '../../third_party/codemirror/codemirror-legacy.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
34+
35+
// This file is required to bring some types into scope, even though it
36+
// is not used.
37+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
38+
import type * as CodeMirrorModule from '../../third_party/codemirror/codemirror-legacy.js';
3539

3640
import {AcornTokenizer, ECMA_VERSION} from './AcornTokenizer.js';
3741
import {CSSFormatter} from './CSSFormatter.js';

0 commit comments

Comments
 (0)