zzos/react-native-devtools-frontend
1
0
Fork 0
mirror of https://github.com/react/react-native-devtools-frontend.git synced 2026-10-07 04:26:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use functions instead of classes for formatter

Browse Source 
Both of these classes were performing side-effect work in their
constructor and eventually calling the callback. Instead, these
should become proper functions.

In a follow-up CL, I will also remove the callback and refactor
to return proper promises instead.

R=szuend@chromium.org

Bug: none
Change-Id: I91d91f04c5ade75ee7e124719f1285a8a09a44be
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3053748
Commit-Queue: Tim van der Lippe <tvanderlippe@chromium.org>
Reviewed-by: Simon Zünd <szuend@chromium.org>
This commit is contained in:
Tim van der Lippe
2021-07-27 10:04:09 +00:00
committed by Devtools-frontend LUCI CQ
parent 3c3cd80fc6
commit ea2fe19c2d
3 changed files with 25 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front_end/models/formatter/ScriptFormatter.ts
+24 -45
View File
@@ -33,7 +33,7 @@
import * as Common from '../../core/common/common.js';
import * as Platform from '../../core/platform/platform.js';
import type {FormatMapping, FormatResult} from './FormatterWorkerPool.js';
import type {FormatMapping} from './FormatterWorkerPool.js';
import {formatterWorkerPool} from './FormatterWorkerPool.js';
function locationToPosition(lineEndings: number[], lineNumber: number, columnNumber: number): number {
@@ -57,55 +57,34 @@ export function format(
contentType: Common.ResourceType.ResourceType, mimeType: string, content: string,
callback: (arg0: string, arg1: FormatterSourceMapping) => Promise<void>): void {
if (contentType.isDocumentOrScriptOrStyleSheet()) {
new ScriptFormatter(mimeType, content, callback);
formatScriptContent(mimeType, content, callback);
} else {
new ScriptIdentityFormatter(mimeType, content, callback);
}
}
export class ScriptFormatter {
_mimeType: string;
_originalContent: string;
_callback: (arg0: string, arg1: FormatterSourceMapping) => Promise<void>;
constructor(
mimeType: string, content: string, callback: (arg0: string, arg1: FormatterSourceMapping) => Promise<void>) {
this._mimeType = mimeType;
this._originalContent = content.replace(/\r\n?|[\n\u2028\u2029]/g, '\n').replace(/^\uFEFF/, '');
this._callback = callback;
this._initialize();
}
async _initialize(): Promise<void> {
const pool = formatterWorkerPool();
const indent = Common.Settings.Settings.instance().moduleSetting('textEditorIndent').get();
const formatResult = await pool.format(this._mimeType, this._originalContent, indent);
if (!formatResult) {
this._callback(this._originalContent, new IdentityFormatterSourceMapping());
} else {
this._didFormatContent(formatResult);
}
}
_didFormatContent(formatResult: FormatResult): void {
const originalContentLineEndings = Platform.StringUtilities.findLineEndingIndexes(this._originalContent);
const formattedContentLineEndings = Platform.StringUtilities.findLineEndingIndexes(formatResult.content);
const sourceMapping =
new FormatterSourceMappingImpl(originalContentLineEndings, formattedContentLineEndings, formatResult.mapping);
this._callback(formatResult.content, sourceMapping);
}
}
class ScriptIdentityFormatter {
constructor(
mimeType: string, content: string, callback: (arg0: string, arg1: FormatterSourceMapping) => Promise<void>) {
callback(content, new IdentityFormatterSourceMapping());
}
}
export async function formatScriptContent(
mimeType: string, content: string,
callback: (arg0: string, arg1: FormatterSourceMapping) => Promise<void>): Promise<void> {
const originalContent = content.replace(/\r\n?|[\n\u2028\u2029]/g, '\n').replace(/^\uFEFF/, '');
const pool = formatterWorkerPool();
const indent = Common.Settings.Settings.instance().moduleSetting('textEditorIndent').get();
const formatResult = await pool.format(mimeType, originalContent, indent);
if (!formatResult) {
callback(originalContent, new IdentityFormatterSourceMapping());
return;
}
const originalContentLineEndings = Platform.StringUtilities.findLineEndingIndexes(originalContent);
const formattedContentLineEndings = Platform.StringUtilities.findLineEndingIndexes(formatResult.content);
const sourceMapping =
new FormatterSourceMappingImpl(originalContentLineEndings, formattedContentLineEndings, formatResult.mapping);
callback(formatResult.content, sourceMapping);
}
export abstract class FormatterSourceMapping {
abstract originalToFormatted(lineNumber: number, columnNumber?: number): number[];
abstract formattedToOriginal(lineNumber: number, columnNumber?: number): number[];
front_end/models/formatter/formatter-legacy.ts
-3
View File
@@ -14,9 +14,6 @@ Formatter.FormatterWorkerPool = FormatterModule.FormatterWorkerPool.FormatterWor
Formatter.formatterWorkerPool = FormatterModule.FormatterWorkerPool.formatterWorkerPool;
/** @constructor */
Formatter.ScriptFormatter = FormatterModule.ScriptFormatter.ScriptFormatter;
/** @interface */
Formatter.FormatterSourceMapping = FormatterModule.ScriptFormatter.FormatterSourceMapping;
front_end/ui/legacy/components/source_frame/SourceFrame.ts
+1 -1
View File
@@ -450,7 +450,7 @@ export class SourceFrameImpl extends UI.View.SimpleView implements UI.Searchable
this._formattedContentPromise = new Promise(x => {
fulfill = x;
});
new Formatter.ScriptFormatter.ScriptFormatter(
Formatter.ScriptFormatter.formatScriptContent(
this._highlighterType, this._rawContent || '', async (content, map) => {
fulfill({content, map});
});