Proper line splitting excluding strings

- closes #14
mborik · Jun 1, 2021 · 7707be4 · 7707be4
1 parent 7fb33d8
commit 7707be4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -278,7 +278,6 @@
     "vscode:prepublish": "npm run compile",
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
-    "postinstall": "node ./node_modules/vscode/bin/install",
     "test": "npm run compile"
   },
   "devDependencies": {

diff --git a/src/formatProcessor.ts b/src/formatProcessor.ts
@@ -55,7 +55,18 @@ export class FormatProcessor extends ConfigPropsProvider {
 
 		const processFragment = (frag: string): LinePartFrag => {
 			const [, keyword = frag, rest ] = frag.match(/^(\S+)\s+(.*)$/) || [];
-			const args = rest?.split(/\s*,\s*/) || [];
+			const args: string[] = [];
+			if (typeof rest === 'string') {
+				if (rest.includes(',')) {
+					rest.split(/:(?=(?:[^'"]*['"][^'"]*['"])*[^'"]*$)/).forEach((arg, idx) => {
+						const ret = arg.trimEnd();
+						args.push(idx ? ret.trimStart() : ret);
+					});
+				}
+				else {
+					args.push(rest)
+				}
+			}
 			return { keyword, args };
 		}
 
@@ -163,7 +174,18 @@ export class FormatProcessor extends ConfigPropsProvider {
 				indentLevel = configProps.controlIndent;
 				lineParts.keyword = keyword.trim();
 				lineParts.firstParam = firstParam;
-				lineParts.args = rest ? rest.split(/\s*,\s*/) : [];
+				lineParts.args = [];
+				if (typeof rest === 'string') {
+					if (rest.includes(',')) {
+						rest.split(/:(?=(?:[^'"]*['"][^'"]*['"])*[^'"]*$)/).forEach((arg, idx) => {
+							const ret = arg.trimEnd();
+							lineParts.args?.push(idx ? ret.trimStart() : ret);
+						});
+					}
+					else {
+						lineParts.args.push(rest)
+					}
+				}
 
 				text = ''
 			}
@@ -176,11 +198,14 @@ export class FormatProcessor extends ConfigPropsProvider {
 					indentLevel = configProps.baseIndent;
 				}
 
-				const splitLine = text.split(/\s*\:\s*/);
-				if (configProps.splitInstructionsByColon && splitLine.length > 1) {
-					lineParts.fragments = splitLine.map(frag => processFragment(frag.trim()));
+				if (configProps.splitInstructionsByColon && text.includes(':')) {
+					const splitLine = text.split(/:(?=(?:[^'"]*['"][^'"]*['"])*[^'"]*$)/);
+					if (splitLine.length > 1) {
+						lineParts.fragments = splitLine.map(frag => processFragment(frag.trim()));
+					}
 				}
-				else {
+
+				if (!lineParts.fragments) {
 					const { keyword, args } = processFragment(text.trim());
 					lineParts.keyword = keyword;
 					lineParts.args = args;