Skip to content

Commit 6ac41b9

Browse files
committed
Bug fixes and other improvements
1 parent 33aea74 commit 6ac41b9

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

src/app/main.parser.js

+10-12
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,11 @@ export function handleRecursive(currentDom, elementDom) {
8484
} else if (element.tagName.toUpperCase() === syntaxManager.MULTI_SYNTAX) {
8585
handleMultiSyntax(element, newElement);
8686
elementDom.appendChild(newElement);
87-
} else if (element.tagName.toUpperCase() === syntaxManager.BANNER) {
87+
} else if (element.tagName.toUpperCase() === syntaxManager.BANNER || element.tagName.toUpperCase() === syntaxManager.BANNER_PEER_2_PEER) {
8888
if (containsCustomTags) {
8989
throw new Error("Banner can't contain other tags");
9090
}
9191

92-
elementDom.appendChild(handlePostQueryElement(element, newElement));
93-
} else if (element.tagName.toUpperCase() === syntaxManager.BANNER_PEER_2_PEER) {
94-
if (containsCustomTags) {
95-
throw new Error("P2PBanner can't contain other tags");
96-
}
97-
9892
elementDom.appendChild(handlePostQueryElement(element, newElement));
9993
} else if (element.tagName.toUpperCase() === syntaxManager.SEARCH_HIGHLIGHT) {
10094
const markElement = document.createElement('span');
@@ -697,23 +691,27 @@ function handleMultiSyntax(element, newElement) {
697691
throw new Error("Syntax highlight can't contain other tags");
698692
}
699693

694+
const internalElement = document.createElement('div');
700695
newElement.classList.remove('multisyntax');
701-
newElement.classList.add('syntax-highlight');
702-
newElement.classList.add('has-blame');
703-
newElement = handleSyntaxHighlight(fakeResyntaxElement, newElement, true, finalCode);
696+
internalElement.classList.add('syntax-highlight');
697+
internalElement.classList.add('has-blame');
698+
handleSyntaxHighlight(fakeResyntaxElement, internalElement, true, finalCode, true);
699+
700+
newElement.classList.add('external-sh', 'expanded');
701+
newElement.appendChild(internalElement);
704702

705703
for (const addedRow of addedRows) {
706704
const tempMark = document.createElement('div');
707705
tempMark.classList.add('temp-mark', 'added-row');
708706
tempMark.style.setProperty('--start-mark', addedRow);
709-
newElement.appendChild(tempMark);
707+
internalElement.appendChild(tempMark);
710708
}
711709

712710
for (const addedRow of removedRows) {
713711
const tempMark = document.createElement('div');
714712
tempMark.classList.add('temp-mark', 'removed-row');
715713
tempMark.style.setProperty('--start-mark', addedRow);
716-
newElement.appendChild(tempMark);
714+
internalElement.appendChild(tempMark);
717715
}
718716
});
719717

0 commit comments

Comments
 (0)