Adjust for windows machins (CRLF carriage returns)

piersdeseilligny · Sep 8, 2019 · 14f3386 · 14f3386
1 parent cd500a8
commit 14f3386
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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)
     }
 }