simplify closing nodes

highlightjs · Feb 16, 2020 · 4726d40 · 4726d40
1 parent f2169fa
commit 4726d40
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/highlight.js b/src/highlight.js
@@ -541,11 +541,7 @@ const HLJS = function(hljs) {
         index = match.index + count;
       }
       processLexeme(codeToHighlight.substr(index));
-      for(current = top; current.parent; current = current.parent) { // close dangling modes
-        if (current.className) {
-          emitter.closeNode();
-        }
-      }
+      emitter.closeAllNodes();
       emitter.collapse();
       result = new HTMLRenderer(emitter, options).value();
       return {

diff --git a/src/lib/token_tree.js b/src/lib/token_tree.js
@@ -6,7 +6,7 @@ export default class TokenTree {
   get top() {
     return this.stack[this.stack.length - 1];
   }
-  push(node) {
+  add(node) {
     this.top.children.push(node);
   }
   addKeyword(text, kind) {
@@ -20,24 +20,28 @@ export default class TokenTree {
   addText(text) {
     if (text === "") { return; }
 
-    this.push(text);
+    this.add(text);
   }
   addSublanguage({rootNode}, name) {
     let node = rootNode;
     delete node.root; // no longer a root node
     node.kind = name;
     node.sublanguage = true;
-    this.push(node);
+    this.add(node);
   }
   openNode(kind) {
     var node = { kind, children: [] };
-    this.push(node);
+    this.add(node);
     this.stack.push(node);
   }
   closeNode() {
     if (this.stack.length > 1)
       this.stack.pop();
   }
+  closeAllNodes() {
+    while (this.stack.length > 1)
+      this.closeNode();
+  }
 
 
   toJSON() {