From 14f3386ca88afc27bae25d51cc7e465d65febd54 Mon Sep 17 00:00:00 2001 From: Rick Schubert Date: Sun, 8 Sep 2019 21:33:16 +0100 Subject: [PATCH] Adjust for windows machins (CRLF carriage returns) --- package.json | 2 +- src/statistics.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 907d7f9..5b6b1a1 100644 --- a/package.json +++ b/package.json @@ -243,7 +243,7 @@ "compile": "tsc -p ./ && copyfiles -u 1 src/webview.html out", "watch": "npm run compile && copyfiles -u 1 src/courierprime/*.ttf out && copyfiles -u 1 src/noisetexture.png out", "postinstall": "node ./node_modules/vscode/bin/install", - "test": "./node_modules/jest/bin/jest.js" + "test": "node node_modules/jest/bin/jest.js" }, "devDependencies": { "@types/jest": "^24.0.18", diff --git a/src/statistics.ts b/src/statistics.ts index 42ceb75..67c1cb0 100644 --- a/src/statistics.ts +++ b/src/statistics.ts @@ -93,9 +93,11 @@ const createSceneStatistics = (script: string): singleSceneStatistic[] => { } export const retrieveScreenPlayStatistics = (script: string): screenPlayStatistics => { + // These adjustments are necessary for Windows style CRLF carriage returns + const scriptNormalised = script.replace(/\r\n/gm, "\n") return { - characterStats: createCharacterStatistics(script), - sceneStats: createSceneStatistics(script) + characterStats: createCharacterStatistics(scriptNormalised), + sceneStats: createSceneStatistics(scriptNormalised) } }