${m2.replace(/`;
+ let codeBlockStyle = "";
+ // Title style is unecessary for now. It can't be easily customized in Confluence.
+ // let titleStyle = "";
+ tag = tag.replace(code_re, function (m0, m1, m2) {
+ // let res = ''
+ let res = ``;
+ const splits = m2.split(/[|:]/);
+ splits.forEach( (el:string) => {
+ const elems = el.split('=');
+ if (elems[0] === "title"){
+ res = `${elems[1]}${res}`;
+ // res = `${elems[1]}${res}`;
+ }
+ // Basic theme matching.
+ if (elems[0] === "theme"){
+ // Predefined confluence themes.
+ switch (elems[1].toLowerCase()) {
+ case "django":
+ codeBlockStyle = `;color:#f8f8f8;background-color:#0a2b1d;`;
+ break;
+ case "emacs":
+ codeBlockStyle = `;color:#d3d3d3;background-color:black;`;
+ break;
+ case "fadetogrey":
+ codeBlockStyle = `;color:white;background-color:#121212;`;
+ break;
+ case "midnight":
+ codeBlockStyle = `;color:#d1edff;background-color:#0f192a;`;
+ break;
+ case "rdark":
+ codeBlockStyle = `;color:#b9bdb6;background-color:#1b2426;`;
+ break;
+ case "eclipse":
+ case "confluence":
+ codeBlockStyle = `;color:white;background-color:black;`;
+ }
+ }
+ });
+ res = `${res}`;
+ res = res.replace('$codeBlockStyle', codeBlockStyle);
+ // res = res.replace('$titleStyle', titleStyle);
+ return res;
+ });
codeTagFlag = true;
} else {
- tag = '';
+ tag = '';
+ //This pays attention to the list flag and adds the closing tag if needed.
+ if (listFlag) {
+ tag = `${tag}`;
+ }
codeTagFlag = false;
}
}
+ if (codeTagFlag && ! code_match) {
+ tag = tag.replace(/';
+ }
const panel_re = /\{panel(.*)}/;
if (! codeTagFlag && tag.match(panel_re)) {
@@ -251,11 +302,14 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
panelTagFlag = true;
} else {
tag = '';
+ if (listFlag) {
+ tag = `${tag}`;
+ }
panelTagFlag = false;
}
}
- if (! codeTagFlag) {
+ // if (! codeTagFlag) {
// lists
const li_re = /^([-*#]+)\s(.*)/;
const li_match = tag.match(li_re);
@@ -285,7 +339,12 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
tag = '';
listArr = listArr.slice(0, li_match[1].length);
}
- tag += "" + li_match[2] + " ";
+ // This prevents the closing tag from being added too prematurely.
+ if (codeTagFlag || panelTagFlag) {
+ tag += "" + li_match[2];
+ } else {
+ tag += " " + li_match[2] + " ";
+ }
}
@@ -296,10 +355,13 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
listFlag = false;
}
+ if (! codeTagFlag) {
// hr and dash lines
tag = tag.replace(/-{4,}/gi, '
');
tag = tag.replace(/-{3}/gi, '—');
tag = tag.replace(/-{2}/gi, '–');
+ }
+
// strong
tag = tag.replace(/\*([^*]*)\*/g, "$1");
// line-through
@@ -309,11 +371,12 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
tag = tag.replace(/\B-((\([^)]*\)|{[^}]*}|\[[^]]+\]){0,3})(\S.*?\S|\S)-\B/g," $3 ");
tag = tag.replace(/(?:\b)_((\([^)]*\)|{[^}]*}|\[[^]]+\]){0,3})(\S.*?\S|\S)_(?:\b)/g, "$3");
}
- } else {
- if (tag !== ``) {
- tag = tag.replace(/';
- }
- }
+ // This only really applied to the inner part of code blocks and noformat blocks, so I moved it there and used a flag to trigger it.
+ // } else {
+ // if (tag !== ``) {
+ // tag = tag.replace(/';
+ // }
+ // }
//close table
if (!tag.match(/<\/tr>$/) && tableFlag) {
diff --git a/src/test/suite/fixtures/expected/issues.html b/src/test/suite/fixtures/expected/issues.html
index 9490d75..24299cd 100644
--- a/src/test/suite/fixtures/expected/issues.html
+++ b/src/test/suite/fixtures/expected/issues.html
@@ -6,16 +6,18 @@
#3: Noformat macro
-
-
- $ date -R -v+1d
-
-
- Sat, 10 Feb 2018 10:37:39 +0100
-
-
-
-
+
+
+
+ $ date -R -v+1d
+
+
+ Sat, 10 Feb 2018 10:37:39 +0100
+
+
+
+
+
#5: Table without heading
diff --git a/src/test/suite/fixtures/expected/test.html b/src/test/suite/fixtures/expected/test.html
index cbab41d..aa75efc 100644
--- a/src/test/suite/fixtures/expected/test.html
+++ b/src/test/suite/fixtures/expected/test.html
@@ -258,31 +258,37 @@
-
-
- <test>
-
-
- <test1 />
-
-
- </test>
-
-
-
-
+
+ test
+
+
+ <test>
+
+
+ <test1 />
+
+
+ </test>
+
+
+
+
+
-
-
- bash
-
-
- echo very long command line with a lot of sings to check word wrap and how it looks like && echo much more elements to print
-
-
-
-
+
+ title
+
+
+ bash
+
+
+ echo very long command line with a lot of sings to check word wrap and how it looks like && echo much more elements to print
+
+
+
+
+
@@ -297,16 +303,18 @@
-
-
- <xml>
-
-
- </xml>
-
-
-
-
+
+
+
+ <xml>
+
+
+ </xml>
+
+
+
+
+