Merge pull request #24 from MaxBec/development

v2.0.0 Beta2

Author: maxbec

out/extension.js

@@ -101,7 +101,7 @@
 					],
 					"enumDescriptions": [
 						"Formats the files in a column-style. E.g. in an items file each item is one line separated by tabs.",
-						"Formats the files in a multiline-style. E.g. in an items file each part of the channel configuration is written in a new line."
+						"Formats the files in a column-style with each hannel parameter in a new line. E.g. in an items file each part of the channel configuration is written in a new line.",
 						"Formats the files in a multiline-style. E.g. in an items file each part of an item is written in a new line."
 					]
 				},
@@ -207,7 +207,7 @@
 		"@types/glob": "^7.1.1",
 		"@types/mocha": "^5.2.6",
 		"@types/node": "^10.17.21",
-		"@types/vscode": "^1.44.0",
+		"@types/vscode": "^1.40.0",
 		"glob": "^7.1.6",
 		"mocha": "^6.2.3",
 		"tslint": "^5.20.1",

out/extension.js.map

@@ -25,7 +25,7 @@ const REGEX_ITEM_ICON = /<.+?>/;
 const REGEX_ITEM_GROUP = /\(.+?\)/;
 const REGEX_ITEM_TAG = /\[\s*(\".+?\")\s*(,\s*\".+?\"\s*)*\]/;
 const REGEX_ITEM_CHANNEL_START = /\{\s*(\w*=".*"?,?\s*)+\}?/;
-const REGEX_ITEM_CHANNEL_END = /\S*[\},]/;
+const REGEX_ITEM_CHANNEL_END = /.*[\},]/;
 
 const REGEX_SITEMAP_ELEMENTS = /\b(Frame|Default|Text|Group|Switch|Selection|Setpoint|Slider|Colorpicker|Webview|Mapview|Image|Video|Chart)\b/g;
 
@@ -289,7 +289,7 @@ function formatItemFile(range?: vscode.Range): vscode.TextEdit[] {
 		} else {
 			let itemChannelRange = doc.getWordRangeAtPosition(newPos, REGEX_ITEM_CHANNEL_END);
 			if (itemChannelRange && itemChannelRange.isSingleLine) {
-				itemChannel += doc.getText(itemChannelRange);
+				itemChannel += doc.getText(itemChannelRange).trimLeft();
 				if (itemChannel.endsWith("}")) {
 					channelPending = false;
 				}
@@ -302,7 +302,7 @@ function formatItemFile(range?: vscode.Range): vscode.TextEdit[] {
 
 		// Discover comment at end of line
 		let itemCommentRange = doc.getWordRangeAtPosition(newPos, REGEX_EOL_COMMENT);
-		if (itemCommentRange && itemCommentRange.isSingleLine) {
+		if (itemCommentRange && itemCommentRange.isSingleLine && itemCommentRange.start.character >= newPos.character) {
 			itemComment = doc.getText(itemCommentRange);
 			newPos = newPos.with(newPos.line, newPos.character + itemComment.length);
 			newPos = newPos.with(newPos.line, newPos.character + utils.countWhitespace(doc, newPos));
@@ -379,13 +379,24 @@ function formatItem(item: Item): string {
 
 		if (formatStyle === "ChannelColumn") {
 			let tabs = "";
+			let spaces = "";
 			let tabIndent = highestTypeLength + highestNameLength + highestLabelLength + highestIconLength + highestGroupLength + highestTagLength;
 
 			for (let i = 0; i < tabIndent; i++) {
 				tabs = tabs + "\t";
 			}
-			tabs = ",\n" + tabs + " ";
-			item.channel = item.channel.replace(/,\s*/g, tabs);
+
+			var identResult = item.channel.match(/.*\="/g);
+			let identCount = 0;
+			if (identResult) {
+				identCount = identResult[0].length;
+				for (let e = 0; e < identCount; e++) {
+					spaces = spaces + " ";
+				}
+			}
+
+			item.channel = item.channel.replace(/",\s*/g, '",\n' + tabs + " ");
+			item.channel = item.channel.replace(/([^"]),\s*/g, "$1,\n" + tabs + spaces);
 		}
 
 		// Build the formatted item and return it