LIST, MERGE, DELETE: Split only at lines starting with numbers

benchmarko · benchmarko · commit 668b8a12774b · 2024-05-26T13:28:12.000+02:00
diff --git a/Controller.js b/Controller.js
@@ -561,10 +561,32 @@ Controller.prototype = {
 		}
 	},
 
+	splitLines: function (input) {
+		var lines = [],
+			lineParts = input.split(/^(\s*\d+)/m), // get numbers starting at the beginning of a line
+			i, number, content;
+
+		if (lineParts[0] === "") {
+			lineParts.shift(); // remove first empty item
+		}
+
+		for (i = 0; i < lineParts.length; i += 2) {
+			number = lineParts[i];
+			content = lineParts[i + 1];
+
+			if (content.endsWith("\n")) {
+				content = content.substring(0, content.length - 1);
+			}
+			lines.push(number + content);
+		}
+
+		return lines;
+	},
+
 	// merge two scripts with sorted line numbers, lines from script2 overwrite lines from script1
 	mergeScripts: function (sScript1, sScript2) {
-		var aLines1 = sScript1.trimEnd().split("\n"),
-			aLines2 = sScript2.trimEnd().split("\n"),
+		var aLines1 = this.splitLines(sScript1.trimEnd()),
+			aLines2 = this.splitLines(sScript2.trimEnd()),
 			aResult = [],
 			iLine1, sLine2, iLine2, sResult;
 
@@ -599,7 +621,7 @@ Controller.prototype = {
 
 	// get line range from a script with sorted line numbers
 	fnGetLinesInRange: function (sScript, iFirstLine, iLastLine) {
-		var aLines = sScript ? sScript.split("\n") : [];
+		var aLines = sScript ? this.splitLines(sScript) : [];
 
 		while (aLines.length && parseInt(aLines[0], 10) < iFirstLine) {
 			aLines.shift();
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <link rel="stylesheet" href="cpcbasic.css" />
-<title id="title">CPC Basic v0.10.11</title>
+<title id="title">CPC Basic v0.10.12</title>
 </head>
 
 <body id="pageBody">
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cpcbasic",
-  "version": "0.10.11",
+  "version": "0.10.12",
   "description": "# CPCBasic - Run CPC BASIC in a Browser",
   "main": "cpcbasic.js",
   "directories": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cpcbasic",`
`3`		`- "version": "0.10.11",`
	`3`	`+ "version": "0.10.12",`
`4`	`4`	`"description": "# CPCBasic - Run CPC BASIC in a Browser",`
`5`	`5`	`"main": "cpcbasic.js",`
`6`	`6`	`"directories": {`