fix leading spaces in noformat/code macros

denco · Nov 10, 2023 · dd36b4a · dd36b4a
1 parent fd5c142
commit dd36b4a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/markupParser.ts b/src/markupParser.ts
@@ -59,7 +59,12 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
 	let listArr: string[] = [];
 
 	for (const entry of sourceText.split(/\r?\n|\r/gi)) {
-		let tag = entry.trim(); //remove leading and trailing spaces
+		let tag = entry
+
+		if (!codeTagFlag) {
+			tag = tag.trim(); //remove leading and trailing spaces
+		}
+
 		let html_tag = false;
 
 		if ((tag.length === 0)
@@ -72,7 +77,7 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
 		}
 
 		if (!codeTagFlag) {
-			tag = tag.replace(/h(\d+)\.\s([^\n]+)/g, "<h$1>$2</h$1>");
+			tag = tag.replace(/h(\d+)\.\s([^\r?\n]+)/g, "<h$1>$2</h$1>");
 
 			// tag = tag.replace(/_([^_]*)_/g, "<em>$1</em>");
 			tag = tag.replace(/\+([^+]*)\+/g, "<u>$1</u>");
@@ -407,11 +412,10 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
 
 		if (!tag.match(/<\/?code|<\/?pre>|<\/?table>|<\/?t[r|d|h]|<\/?li|<\/?ul|<\/?ol|<\/?div/) && !codeTagFlag) {
 			tag = `<div>${tag}</div>`;
-		} else if (codeTagFlag && tag.indexOf('>') < 0) {
-			tag = tag + '\n';
+		} else if (codeTagFlag && tag.indexOf('<') < 0) {
+			tag = `${tag}\n`;
 		}
 		result += `${tag}`;
 	}
-
 	return result;
 }
diff --git a/src/test/suite/fixtures/expected/test.html b/src/test/suite/fixtures/expected/test.html
@@ -205,7 +205,10 @@ <h2><strong>code:</strong></h2>
 </div>
 <div class="code-block">
   <span class="code-title">test</span>
-  <pre><code style='font-family: Menlo, Monaco, Consolas, monospace'>&lt;test>&lt;test1 />&lt;/test></code></pre>
+    <pre><code style='font-family: Menlo, Monaco, Consolas, monospace'>&lt;test>
+    &lt;test1 />
+&lt;/test>
+</code></pre>
 </div>
 <div class="code-block">
   <span class="code-title">title</span>
@@ -219,6 +222,8 @@ <h2><strong>code:</strong></h2>
   <h2><strong>noformat:</strong></h2>
 </div>
 <div class="code-block">
-  <pre><code style='font-family: Menlo, Monaco, Consolas, monospace'>&lt;xml>&lt;/xml></code></pre>
+  <pre><code style='font-family: Menlo, Monaco, Consolas, monospace'>&lt;xml>
+&lt;/xml>
+</code></pre>
 </div>
 <pre><code style='font-family: Menlo, Monaco, Consolas, monospace'>noformat &lt;tag>&lt;/tag> oneline</code></pre>