From 646753526b5977eef625820189f670d0e6cdde8d Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 24 Aug 2019 22:30:48 -0700 Subject: [PATCH] Fix lints --- experiments/skin-database/discord-bot/s3.js | 8 +-- experiments/skin-database/s3.js | 8 +-- js/components/ContextMenu.tsx | 14 +++--- js/components/MilkdropWindow/index.tsx | 4 +- js/reducers/playlist.ts | 3 +- js/utils.ts | 2 +- js/webampLazy.tsx | 4 +- modern/src/debugger/index.js | 56 +++++++++++---------- modern/src/utils.js | 4 +- modern/src/utils.test.js | 2 +- 10 files changed, 55 insertions(+), 50 deletions(-) diff --git a/experiments/skin-database/discord-bot/s3.js b/experiments/skin-database/discord-bot/s3.js index c497d575..58f89f46 100644 --- a/experiments/skin-database/discord-bot/s3.js +++ b/experiments/skin-database/discord-bot/s3.js @@ -4,11 +4,11 @@ AWS.config.update({ region: "us-west-2" }); const s3 = new AWS.S3(); function getFile(key) { - return new Promise((resolve, reject) => { + return new Promise((resolve, rejectPromise) => { const bucketName = "winamp2-js-skins"; s3.getObject({ Bucket: bucketName, Key: key }, (err, data) => { if (err) { - reject(err); + rejectPromise(err); return; } const body = Buffer.from(data.Body).toString("utf8"); @@ -18,11 +18,11 @@ function getFile(key) { } function putFile(key, body) { - return new Promise((resolve, reject) => { + return new Promise((resolve, rejectPromise) => { const bucketName = "winamp2-js-skins"; s3.putObject({ Bucket: bucketName, Key: key, Body: body }, err => { if (err) { - reject(err); + rejectPromise(err); return; } resolve(); diff --git a/experiments/skin-database/s3.js b/experiments/skin-database/s3.js index 39804f22..e5e279fb 100644 --- a/experiments/skin-database/s3.js +++ b/experiments/skin-database/s3.js @@ -4,11 +4,11 @@ AWS.config.update({ region: "us-west-2" }); const s3 = new AWS.S3(); function getFile(key) { - return new Promise((resolve, reject) => { + return new Promise((resolve, rejectPromise) => { const bucketName = "winamp2-js-skins"; s3.getObject({ Bucket: bucketName, Key: key }, (err, data) => { if (err) { - reject(err); + rejectPromise(err); return; } const body = Buffer.from(data.Body).toString("utf8"); @@ -18,11 +18,11 @@ function getFile(key) { } function putFile(key, body) { - return new Promise((resolve, reject) => { + return new Promise((resolve, rejectPromise) => { const bucketName = "winamp2-js-skins"; s3.putObject({ Bucket: bucketName, Key: key, Body: body }, err => { if (err) { - reject(err); + rejectPromise(err); return; } resolve(); diff --git a/js/components/ContextMenu.tsx b/js/components/ContextMenu.tsx index 0033654f..e6355865 100644 --- a/js/components/ContextMenu.tsx +++ b/js/components/ContextMenu.tsx @@ -15,13 +15,13 @@ interface PortalProps { const Portal = (props: PortalProps) => { const node: HTMLDivElement = useMemo(() => { - const node = document.createElement("div"); - node.id = "webamp-context-menu"; - node.style.position = "absolute"; - node.style.top = "0"; - node.style.left = "0"; - node.style.zIndex = String(props.zIndex + 1); - return node; + const div = document.createElement("div"); + div.id = "webamp-context-menu"; + div.style.position = "absolute"; + div.style.top = "0"; + div.style.left = "0"; + div.style.zIndex = String(props.zIndex + 1); + return div; }, [props.zIndex]); useEffect(() => { diff --git a/js/components/MilkdropWindow/index.tsx b/js/components/MilkdropWindow/index.tsx index 6ebe359d..ddf8caa6 100644 --- a/js/components/MilkdropWindow/index.tsx +++ b/js/components/MilkdropWindow/index.tsx @@ -143,8 +143,8 @@ function Milkdrop(props: Props) { windowId={WINDOWS.MILKDROP} onKeyDown={handleKeyDown} > - {(windowSize: { width: number; height: number }) => { - const size = props.fullscreen ? screenSize : windowSize; + {(genWindowSize: { width: number; height: number }) => { + const size = props.fullscreen ? screenSize : genWindowSize; return ( diff --git a/js/reducers/playlist.ts b/js/reducers/playlist.ts index a4f5c689..027ac730 100644 --- a/js/reducers/playlist.ts +++ b/js/reducers/playlist.ts @@ -51,7 +51,7 @@ const playlist = ( selectedTracks: new Set([state.trackOrder[action.index]]), lastSelectedIndex: action.index, }; - case CTRL_CLICKED_TRACK: + case CTRL_CLICKED_TRACK: { const id = state.trackOrder[action.index]; const newSelectedTracks = new Set(state.selectedTracks); toggleSetMembership(newSelectedTracks, id); @@ -63,6 +63,7 @@ const playlist = ( // Winamp 2 does, so we'll copy it. lastSelectedIndex: action.index, }; + } case SHIFT_CLICKED_TRACK: if (state.lastSelectedIndex == null) { return state; diff --git a/js/utils.ts b/js/utils.ts index cd14e57c..7802ed63 100644 --- a/js/utils.ts +++ b/js/utils.ts @@ -111,7 +111,7 @@ export const parseIni = (text: string): IniData => { const value = match[2] // Ignore anything after a second `=` // TODO: What if this is inside quotes or escaped? - .replace(/=.*$/g, "") + .replace(/\=.*$/g, "") .trim() // Strip quotes // TODO: What about escaped quotes? diff --git a/js/webampLazy.tsx b/js/webampLazy.tsx index f5f0c818..c193a0cd 100644 --- a/js/webampLazy.tsx +++ b/js/webampLazy.tsx @@ -195,8 +195,8 @@ class Winamp { if (importConvertPreset != null && presetConverterEndpoint != null) { convertPreset = async (file: File): Promise => { - const { convertPreset } = await importConvertPreset(); - return convertPreset( + const { convertPreset: convert } = await importConvertPreset(); + return convert( await FileUtils.genStringFromFileReference(file), presetConverterEndpoint ); diff --git a/modern/src/debugger/index.js b/modern/src/debugger/index.js index b3c89dea..6d10f18f 100644 --- a/modern/src/debugger/index.js +++ b/modern/src/debugger/index.js @@ -18,6 +18,17 @@ function readFileAsArrayBuffer(file) { }); } +function backgroundColorFromMessageTitle(messageTitle) { + switch (messageTitle) { + case "Success": + return "lightgreen"; + case "Fial": + return "pink"; + default: + return "none"; + } +} + function Wrapper() { const [maki, setMaki] = React.useState(null); const onDrop = React.useCallback(async acceptedFiles => { @@ -134,18 +145,17 @@ function Debugger({ maki }) { const nextValue = React.useCallback( value => { - const { i, stack, variables, commands } = value; dispatch({ type: "STEPPED", - variables, - commands, - commandOffset: i, - stack, + variables: value.variables, + commands: value.commands, + commandOffset: value.i, + stack: value.stack, }); if (paused) { return false; } - if (breakPoints.has(i)) { + if (breakPoints.has(value.i)) { dispatch({ type: "PAUSE" }); return; } @@ -208,26 +218,20 @@ function Debugger({ maki }) { {messages.map( - ({ message, messageTitle, flag, notanymoreId }, i) => ( - - - - - - - - ) + ({ message, messageTitle, flag, notanymoreId }, i) => { + const backgroundColor = backgroundColorFromMessageTitle( + messageTitle + ); + return ( + + + + + + + + ); + } )}
{i}{message} - {messageTitle} - {flag}{notanymoreId}
{i}{message}{messageTitle}{flag}{notanymoreId}
diff --git a/modern/src/utils.js b/modern/src/utils.js index 6199d7a6..bae0d078 100644 --- a/modern/src/utils.js +++ b/modern/src/utils.js @@ -1,8 +1,8 @@ import { xml2js } from "xml-js"; -let i = 0; +let nextId = 0; export function getId() { - return i++; + return nextId++; } // Depth-first tree map diff --git a/modern/src/utils.test.js b/modern/src/utils.test.js index 21cf74d8..263bdb4f 100644 --- a/modern/src/utils.test.js +++ b/modern/src/utils.test.js @@ -79,7 +79,7 @@ describe("inlineIncludes", () => { test("inlines the contents of included files as children of the include node", async () => { const zip = await getSkinZip(); const originalFile = zip.file; - zip.file = jest.fn(path => originalFile.call(zip, path)); + zip.file = jest.fn(filePath => originalFile.call(zip, filePath)); const xml = await Utils.readXml(zip, "SkIn.XmL"); const resolvedXml = await Utils.inlineIncludes(xml, zip);