From 83fdc7fbe006fcc6e87fd8ce9a0d5c701cd160ca Mon Sep 17 00:00:00 2001 From: Kean Mariotti Date: Fri, 30 Dec 2022 10:15:54 +0000 Subject: [PATCH] Fix eslint errors Test: npm run lint:check Bug: b/263471740 Change-Id: I8289c8b22d5af5e85fd94ccebf1d82abb0a062c2 --- tools/winscope-ng/karma.conf.js | 2 +- .../src/common/trace/flickerlib/ObjectFormatter.ts | 5 +++-- tools/winscope-ng/src/common/trace/flickerlib/common.js | 5 +++-- .../winscope-ng/src/common/trace/flickerlib/layers/Layer.ts | 2 +- .../src/common/trace/flickerlib/layers/Transform.ts | 2 +- .../src/common/trace/flickerlib/windows/WindowContainer.ts | 2 +- .../common/trace/flickerlib/windows/WindowManagerState.ts | 4 ++-- .../src/common/trace/flickerlib/windows/WindowState.ts | 2 +- tools/winscope-ng/src/common/trace/timestamp.ts | 2 -- tools/winscope-ng/src/parsers/parser.ts | 2 +- tools/winscope-ng/src/test/remote_tool_mock/app.component.ts | 2 +- tools/winscope-ng/src/trace_collection/proxy_client.ts | 2 +- tools/winscope-ng/webpack.config.unit.spec.js | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/winscope-ng/karma.conf.js b/tools/winscope-ng/karma.conf.js index 37b1d39a2..559235f79 100644 --- a/tools/winscope-ng/karma.conf.js +++ b/tools/winscope-ng/karma.conf.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let webpackConfig = require("./webpack.config.common"); +const webpackConfig = require("./webpack.config.common"); delete webpackConfig.entry; delete webpackConfig.output; diff --git a/tools/winscope-ng/src/common/trace/flickerlib/ObjectFormatter.ts b/tools/winscope-ng/src/common/trace/flickerlib/ObjectFormatter.ts index 1ac19e66b..3cf05501e 100644 --- a/tools/winscope-ng/src/common/trace/flickerlib/ObjectFormatter.ts +++ b/tools/winscope-ng/src/common/trace/flickerlib/ObjectFormatter.ts @@ -42,7 +42,7 @@ export default class ObjectFormatter { private static FLICKER_INTDEF_MAP = readIntdefMap(); static cloneObject(entry: any): any { - let obj: any = {} + const obj: any = {} const properties = ObjectFormatter.getProperties(entry); properties.forEach(prop => obj[prop] = entry[prop]); return obj; @@ -81,7 +81,8 @@ export default class ObjectFormatter { props.push(prop); } }); - } while (obj = Object.getPrototypeOf(obj)); + obj = Object.getPrototypeOf(obj); + } while (obj); return props; } diff --git a/tools/winscope-ng/src/common/trace/flickerlib/common.js b/tools/winscope-ng/src/common/trace/flickerlib/common.js index f3cfbcf58..f7f6f768d 100644 --- a/tools/winscope-ng/src/common/trace/flickerlib/common.js +++ b/tools/winscope-ng/src/common/trace/flickerlib/common.js @@ -99,6 +99,7 @@ const Region = require('flicker').com.android.server.wm.traces.common.region.Reg // Service const TaggingEngine = require('flicker').com.android.server.wm.traces.common.service.TaggingEngine; +const EMPTY_SIZE = Size.Companion.EMPTY; const EMPTY_BUFFER = ActiveBuffer.Companion.EMPTY; const EMPTY_COLOR3 = Color3.Companion.EMPTY; const EMPTY_COLOR = Color.Companion.EMPTY; @@ -113,14 +114,14 @@ const EMPTY_TRANSFORM = new Transform(0, EMPTY_MATRIX33); function toSize(proto) { if (proto == null) { - return EMPTY_BOUNDS; + return EMPTY_SIZE; } const width = proto.width ?? proto.w ?? 0; const height = proto.height ?? proto.h ?? 0; if (width || height) { return new Size(width, height); } - return EMPTY_BOUNDS; + return EMPTY_SIZE; } function toActiveBuffer(proto) { diff --git a/tools/winscope-ng/src/common/trace/flickerlib/layers/Layer.ts b/tools/winscope-ng/src/common/trace/flickerlib/layers/Layer.ts index bfc3da839..c9c41e0ea 100644 --- a/tools/winscope-ng/src/common/trace/flickerlib/layers/Layer.ts +++ b/tools/winscope-ng/src/common/trace/flickerlib/layers/Layer.ts @@ -41,7 +41,7 @@ Layer.fromProto = function (proto: any, excludesCompositionState = false): Layer let crop: Rect if (proto.crop) { crop = toRect(proto.crop) - }; + } const properties = new LayerProperties( visibleRegion, diff --git a/tools/winscope-ng/src/common/trace/flickerlib/layers/Transform.ts b/tools/winscope-ng/src/common/trace/flickerlib/layers/Transform.ts index 6bce384f1..654667d0a 100644 --- a/tools/winscope-ng/src/common/trace/flickerlib/layers/Transform.ts +++ b/tools/winscope-ng/src/common/trace/flickerlib/layers/Transform.ts @@ -65,7 +65,7 @@ function getDefaultTransform(type: number, x: number, y: number): Matrix33 { } export function isFlagSet(type: number, bits: number): Boolean { - var type = type || 0; + type = type || 0; return (type & bits) === bits; } diff --git a/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowContainer.ts b/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowContainer.ts index f69df79d1..8c4e34a2d 100644 --- a/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowContainer.ts +++ b/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowContainer.ts @@ -105,7 +105,7 @@ function createConfiguration(proto: any): Configuration { if (proto == null) { return null; } - var windowConfiguration = null; + let windowConfiguration = null; if (proto != null && proto.windowConfiguration != null) { windowConfiguration = createWindowConfiguration(proto.windowConfiguration); diff --git a/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowManagerState.ts b/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowManagerState.ts index 9dc407e5b..d2fe02b8d 100644 --- a/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowManagerState.ts +++ b/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowManagerState.ts @@ -34,10 +34,10 @@ WindowManagerState.fromProto = function ( realToElapsedTimeOffsetNs: bigint|undefined = undefined, useElapsedTime = false, ): WindowManagerState { - var inputMethodWIndowAppToken = ""; + const inputMethodWIndowAppToken = ""; if (proto.inputMethodWindow != null) { proto.inputMethodWindow.hashCode.toString(16) - }; + } let parseOrder = 0; const nextSeq = () => ++parseOrder; diff --git a/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowState.ts b/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowState.ts index 7ebd96056..8c626d586 100644 --- a/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowState.ts +++ b/tools/winscope-ng/src/common/trace/flickerlib/windows/WindowState.ts @@ -109,7 +109,7 @@ function getWindowType(proto: any, identifierName: string): number { } function getName(identifierName: string): string { - var name = identifierName; + let name = identifierName; if (identifierName.startsWith(WindowState.STARTING_WINDOW_PREFIX)) { name = identifierName.substring(WindowState.STARTING_WINDOW_PREFIX.length); diff --git a/tools/winscope-ng/src/common/trace/timestamp.ts b/tools/winscope-ng/src/common/trace/timestamp.ts index eb405978c..69cde16ee 100644 --- a/tools/winscope-ng/src/common/trace/timestamp.ts +++ b/tools/winscope-ng/src/common/trace/timestamp.ts @@ -32,10 +32,8 @@ export class Timestamp { throw new Error("realToElapsedTimeOffsetNs can't be undefined to use real timestamp"); } return new Timestamp(TimestampType.REAL, elapsedTimestamp + realToElapsedTimeOffsetNs); - break; case TimestampType.ELAPSED: return new Timestamp(TimestampType.ELAPSED, elapsedTimestamp); - break; default: throw new Error("Unhandled timestamp type"); } diff --git a/tools/winscope-ng/src/parsers/parser.ts b/tools/winscope-ng/src/parsers/parser.ts index 297c04fbb..aa1852617 100644 --- a/tools/winscope-ng/src/parsers/parser.ts +++ b/tools/winscope-ng/src/parsers/parser.ts @@ -68,7 +68,7 @@ abstract class Parser { } for (const fieldName in protoObj.$type.fields) { - if (protoObj.$type.fields.hasOwnProperty(fieldName)) { + if (Object.prototype.hasOwnProperty.call(protoObj.$type.fields, fieldName)) { const fieldProperties = protoObj.$type.fields[fieldName]; const field = protoObj[fieldName]; diff --git a/tools/winscope-ng/src/test/remote_tool_mock/app.component.ts b/tools/winscope-ng/src/test/remote_tool_mock/app.component.ts index dc3ac7e5c..f7e72514c 100644 --- a/tools/winscope-ng/src/test/remote_tool_mock/app.component.ts +++ b/tools/winscope-ng/src/test/remote_tool_mock/app.component.ts @@ -60,7 +60,7 @@ export class AppComponent { static readonly TARGET = "http://localhost:8080"; static readonly TIMESTAMP_IN_BUGREPORT_MESSAGE = 1670509911000000000n; - private winscope: WindowProxy|null = null; + private winscope: Window|null = null; private isWinscopeUp = false; private onMessagePongReceived = FunctionUtils.DO_NOTHING; diff --git a/tools/winscope-ng/src/trace_collection/proxy_client.ts b/tools/winscope-ng/src/trace_collection/proxy_client.ts index b1f4efc68..2079c00ef 100644 --- a/tools/winscope-ng/src/trace_collection/proxy_client.ts +++ b/tools/winscope-ng/src/trace_collection/proxy_client.ts @@ -53,7 +53,7 @@ class ProxyRequest { method: string, path: string, onSuccess: ((request: XMLHttpRequest) => void|Promise) | undefined, - type?: XMLHttpRequestResponseType, + type?: XMLHttpRequest['responseType'], jsonRequest: any = null ): Promise { return new Promise((resolve) => { diff --git a/tools/winscope-ng/webpack.config.unit.spec.js b/tools/winscope-ng/webpack.config.unit.spec.js index 8269b2d21..c38ef0182 100644 --- a/tools/winscope-ng/webpack.config.unit.spec.js +++ b/tools/winscope-ng/webpack.config.unit.spec.js @@ -16,7 +16,7 @@ const path = require('path'); const glob = require('glob'); -let config = require('./webpack.config.common'); +const config = require('./webpack.config.common'); config["mode"] = "development"; @@ -25,7 +25,7 @@ const allTestFiles = [ ...glob.sync('./src/**/*.spec.ts') ] const unitTestFiles = allTestFiles - .filter(file => !file.match(".*component\.spec\.(js|ts)$")) + .filter(file => !file.match(".*component\\.spec\\.(js|ts)$")) .filter(file => !file.match(".*e2e.*")) config["entry"] = { tests: unitTestFiles,