From 631d0caa6928f94dc0d2827a7f5629aeb94a36b8 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 17 May 2022 09:13:05 -0700
Subject: [PATCH] Pick up latest Marked.js release

Fixes #142003
---
 src/vs/base/common/marked/cgmanifest.json |   4 +-
 src/vs/base/common/marked/marked.js       | 252 ++++++++++++++++------
 2 files changed, 183 insertions(+), 73 deletions(-)

diff --git a/src/vs/base/common/marked/cgmanifest.json b/src/vs/base/common/marked/cgmanifest.json
index 47100d82d7f4d..60e11b4144ea9 100644
--- a/src/vs/base/common/marked/cgmanifest.json
+++ b/src/vs/base/common/marked/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "marked",
 					"repositoryUrl": "https://github.com/markedjs/marked",
-					"commitHash": "d1b7d521c41bcf915f81f0218b0e5acd607c1b72"
+					"commitHash": "2002557d004139ca2208c910d9ca999829b65406"
 				}
 			},
 			"license": "MIT",
-			"version": "3.0.2"
+			"version": "4.0.16"
 		}
 	],
 	"version": 1
diff --git a/src/vs/base/common/marked/marked.js b/src/vs/base/common/marked/marked.js
index 09c308378d455..b7d8fe40e5e1b 100644
--- a/src/vs/base/common/marked/marked.js
+++ b/src/vs/base/common/marked/marked.js
@@ -23,6 +23,7 @@
   typeof define === 'function' && define.amd ? define(['exports'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.marked = {}));
 })(this, (function (exports) { 'use strict';
+
   function _defineProperties(target, props) {
     for (var i = 0; i < props.length; i++) {
       var descriptor = props[i];
@@ -141,6 +142,10 @@
     return html;
   }
   var unescapeTest = /&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig;
+  /**
+   * @param {string} html
+   */
+
   function unescape(html) {
     // explicitly match decimal, hex, and named HTML entities
     return html.replace(unescapeTest, function (_, n) {
@@ -155,8 +160,13 @@
     });
   }
   var caret = /(^|[^\[])\^/g;
+  /**
+   * @param {string | RegExp} regex
+   * @param {string} opt
+   */
+
   function edit(regex, opt) {
-    regex = regex.source || regex;
+    regex = typeof regex === 'string' ? regex : regex.source;
     opt = opt || '';
     var obj = {
       replace: function replace(name, val) {
@@ -173,6 +183,12 @@
   }
   var nonWordAndColonTest = /[^\w:]/g;
   var originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
+  /**
+   * @param {boolean} sanitize
+   * @param {string} base
+   * @param {string} href
+   */
+
   function cleanUrl(sanitize, base, href) {
     if (sanitize) {
       var prot;
@@ -204,6 +220,11 @@
   var justDomain = /^[^:]+:\/*[^/]*$/;
   var protocol = /^([^:]+:)[\s\S]*$/;
   var domain = /^([^:]+:\/*[^/]*)[\s\S]*$/;
+  /**
+   * @param {string} base
+   * @param {string} href
+   */
+
   function resolveUrl(base, href) {
     if (!baseUrls[' ' + base]) {
       // we can ignore everything in base after the last slash of its path component,
@@ -282,7 +303,7 @@
       cells.shift();
     }
 
-    if (!cells[cells.length - 1].trim()) {
+    if (cells.length > 0 && !cells[cells.length - 1].trim()) {
       cells.pop();
     }
 
@@ -300,9 +321,15 @@
     }
 
     return cells;
-  } // Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
-  // /c*$/ is vulnerable to REDOS.
-  // invert: Remove suffix of non-c chars instead. Default falsey.
+  }
+  /**
+   * Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
+   * /c*$/ is vulnerable to REDOS.
+   *
+   * @param {string} str
+   * @param {string} c
+   * @param {boolean} invert Remove suffix of non-c chars instead. Default falsey.
+   */
 
   function rtrim(str, c, invert) {
     var l = str.length;
@@ -326,7 +353,7 @@
       }
     }
 
-    return str.substr(0, l - suffLen);
+    return str.slice(0, l - suffLen);
   }
   function findClosingBracket(str, b) {
     if (str.indexOf(b[1]) === -1) {
@@ -359,6 +386,11 @@
     }
   } // copied from https://stackoverflow.com/a/5450113/806777
 
+  /**
+   * @param {string} pattern
+   * @param {number} count
+   */
+
   function repeatString(pattern, count) {
     if (count < 1) {
       return '';
@@ -395,15 +427,15 @@
       };
       lexer.state.inLink = false;
       return token;
-    } else {
-      return {
-        type: 'image',
-        raw: raw,
-        href: href,
-        title: title,
-        text: escape(text)
-      };
     }
+
+    return {
+      type: 'image',
+      raw: raw,
+      href: href,
+      title: title,
+      text: escape(text)
+    };
   }
 
   function indentCodeCompensation(raw, text) {
@@ -446,11 +478,11 @@
       var cap = this.rules.block.newline.exec(src);
 
       if (cap && cap[0].length > 0) {
-          return {
-            type: 'space',
-            raw: cap[0]
-          };
-        }
+        return {
+          type: 'space',
+          raw: cap[0]
+        };
+      }
     };
 
     _proto.code = function code(src) {
@@ -526,7 +558,7 @@
       var cap = this.rules.block.blockquote.exec(src);
 
       if (cap) {
-        var text = cap[0].replace(/^ *> ?/gm, '');
+        var text = cap[0].replace(/^ *>[ \t]?/gm, '');
         return {
           type: 'blockquote',
           raw: cap[0],
@@ -558,7 +590,7 @@
         } // Get next list item
 
 
-        var itemRegex = new RegExp("^( {0,3}" + bull + ")((?: [^\\n]*)?(?:\\n|$))"); // Check if current bullet point can start a new List Item
+        var itemRegex = new RegExp("^( {0,3}" + bull + ")((?:[\t ][^\\n]*)?(?:\\n|$))"); // Check if current bullet point can start a new List Item
 
         while (src) {
           endEarly = false;
@@ -599,31 +631,37 @@
           }
 
           if (!endEarly) {
-            var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])"); // Check if following lines should be included in List Item
+            var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))");
+            var hrRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)"); // Check if following lines should be included in List Item
 
             while (src) {
               rawLine = src.split('\n', 1)[0];
               line = rawLine; // Re-align to follow commonmark nesting rules
 
-            if (this.options.pedantic) {
-              line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
-            } // End list item if found start of new bullet
+              if (this.options.pedantic) {
+                line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
+              } // End list item if found start of new bullet
 
 
-            if (nextBulletRegex.test(line)) {
-              break;
+              if (nextBulletRegex.test(line)) {
+                break;
+              } // Horizontal rule found
+
+
+              if (hrRegex.test(src)) {
+                break;
               }
 
-            if (line.search(/[^ ]/) >= indent || !line.trim()) {
+              if (line.search(/[^ ]/) >= indent || !line.trim()) {
                 // Dedent if possible
-              itemContents += '\n' + line.slice(indent);
+                itemContents += '\n' + line.slice(indent);
               } else if (!blankLine) {
                 // Until blank line, item doesn't need indentation
                 itemContents += '\n' + line;
-            } else {
+              } else {
                 // Otherwise, improper indentation ends this item
-              break;
-            }
+                break;
+              }
 
               if (!blankLine && !line.trim()) {
                 // Check if current line is blank
@@ -757,7 +795,7 @@
             };
           }),
           align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-          rows: cap[3] ? cap[3].replace(/\n[ \t]*$/, '').split('\n') : []
+          rows: cap[3] && cap[3].trim() ? cap[3].replace(/\n[ \t]*$/, '').split('\n') : []
         };
 
         if (item.header.length === item.align.length) {
@@ -793,7 +831,7 @@
 
           for (j = 0; j < l; j++) {
             item.header[j].tokens = [];
-            this.lexer.inlineTokens(item.header[j].text, item.header[j].tokens);
+            this.lexer.inline(item.header[j].text, item.header[j].tokens);
           } // cell child tokens
 
 
@@ -804,7 +842,7 @@
 
             for (k = 0; k < row.length; k++) {
               row[k].tokens = [];
-              this.lexer.inlineTokens(row[k].text, row[k].tokens);
+              this.lexer.inline(row[k].text, row[k].tokens);
             }
           }
 
@@ -1195,10 +1233,10 @@
     newline: /^(?: *(?:\n|$))+/,
     code: /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,
     fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?=\n|$)|$)/,
-    hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
+    hr: /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/,
     heading: /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,
     blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
-    list: /^( {0,3}bull)( [^\n]+?)?(?:\n|$)/,
+    list: /^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/,
     html: '^ {0,3}(?:' // optional indentation
     + '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
     + '|comment[^\\n]*(\\n+|$)' // (2)
@@ -1288,9 +1326,9 @@
     emStrong: {
       lDelim: /^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,
       //        (1) and (2) can only be a Right Delimiter. (3) and (4) can only be Left.  (5) and (6) can be either Left or Right.
-      //        () Skip orphan delim inside strong    (1) #***                (2) a***#, a***                   (3) #***a, ***a                 (4) ***#              (5) #***#                 (6) a***a
-      rDelimAst: /^[^_*]*?\_\_[^_*]*?\*[^_*]*?(?=\_\_)|[punct_](\*+)(?=[\s]|$)|[^punct*_\s](\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|[^punct*_\s](\*+)(?=[^punct*_\s])/,
-      rDelimUnd: /^[^_*]*?\*\*[^_*]*?\_[^_*]*?(?=\*\*)|[punct*](\_+)(?=[\s]|$)|[^punct*_\s](\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/ // ^- Not allowed for _
+      //          () Skip orphan inside strong  () Consume to delim (1) #***                (2) a***#, a***                   (3) #***a, ***a                 (4) ***#              (5) #***#                 (6) a***a
+      rDelimAst: /^[^_*]*?\_\_[^_*]*?\*[^_*]*?(?=\_\_)|[^*]+(?=[^*])|[punct_](\*+)(?=[\s]|$)|[^punct*_\s](\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|[^punct*_\s](\*+)(?=[^punct*_\s])/,
+      rDelimUnd: /^[^_*]*?\*\*[^_*]*?\_[^_*]*?(?=\*\*)|[^_]+(?=[^_])|[punct*](\_+)(?=[\s]|$)|[^punct*_\s](\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/ // ^- Not allowed for _
 
     },
     code: /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,
@@ -1372,6 +1410,7 @@
 
   /**
    * smartypants text replacement
+   * @param {string} text
    */
 
   function smartypants(text) {
@@ -1386,6 +1425,7 @@
   }
   /**
    * mangle email addresses
+   * @param {string} text
    */
 
 
@@ -1476,7 +1516,7 @@
     var _proto = Lexer.prototype;
 
     _proto.lex = function lex(src) {
-      src = src.replace(/\r\n|\r/g, '\n').replace(/\t/g, '    ');
+      src = src.replace(/\r\n|\r/g, '\n');
       this.blockTokens(src, this.tokens);
       var next;
 
@@ -1499,7 +1539,11 @@
       }
 
       if (this.options.pedantic) {
-        src = src.replace(/^ +$/gm, '');
+        src = src.replace(/\t/g, '    ').replace(/^ +$/gm, '');
+      } else {
+        src = src.replace(/^( *)(\t+)/gm, function (_, leading, tabs) {
+          return leading + '    '.repeat(tabs.length);
+        });
       }
 
       var token, lastToken, cutSrc, lastParagraphClipped;
@@ -1959,23 +2003,35 @@
       }
 
       return '<pre><code class="' + this.options.langPrefix + escape(lang, true) + '">' + (escaped ? _code : escape(_code, true)) + '</code></pre>\n';
-    };
+    }
+    /**
+     * @param {string} quote
+     */
+    ;
 
     _proto.blockquote = function blockquote(quote) {
-      return '<blockquote>\n' + quote + '</blockquote>\n';
+      return "<blockquote>\n" + quote + "</blockquote>\n";
     };
 
     _proto.html = function html(_html) {
       return _html;
-    };
+    }
+    /**
+     * @param {string} text
+     * @param {string} level
+     * @param {string} raw
+     * @param {any} slugger
+     */
+    ;
 
     _proto.heading = function heading(text, level, raw, slugger) {
       if (this.options.headerIds) {
-        return '<h' + level + ' id="' + this.options.headerPrefix + slugger.slug(raw) + '">' + text + '</h' + level + '>\n';
+        var id = this.options.headerPrefix + slugger.slug(raw);
+        return "<h" + level + " id=\"" + id + "\">" + text + "</h" + level + ">\n";
       } // ignore IDs
 
 
-      return '<h' + level + '>' + text + '</h' + level + '>\n';
+      return "<h" + level + ">" + text + "</h" + level + ">\n";
     };
 
     _proto.hr = function hr() {
@@ -1986,55 +2042,94 @@
       var type = ordered ? 'ol' : 'ul',
           startatt = ordered && start !== 1 ? ' start="' + start + '"' : '';
       return '<' + type + startatt + '>\n' + body + '</' + type + '>\n';
-    };
+    }
+    /**
+     * @param {string} text
+     */
+    ;
 
     _proto.listitem = function listitem(text) {
-      return '<li>' + text + '</li>\n';
+      return "<li>" + text + "</li>\n";
     };
 
     _proto.checkbox = function checkbox(checked) {
       return '<input ' + (checked ? 'checked="" ' : '') + 'disabled="" type="checkbox"' + (this.options.xhtml ? ' /' : '') + '> ';
-    };
+    }
+    /**
+     * @param {string} text
+     */
+    ;
 
     _proto.paragraph = function paragraph(text) {
-      return '<p>' + text + '</p>\n';
-    };
+      return "<p>" + text + "</p>\n";
+    }
+    /**
+     * @param {string} header
+     * @param {string} body
+     */
+    ;
 
     _proto.table = function table(header, body) {
-      if (body) body = '<tbody>' + body + '</tbody>';
+      if (body) body = "<tbody>" + body + "</tbody>";
       return '<table>\n' + '<thead>\n' + header + '</thead>\n' + body + '</table>\n';
-    };
+    }
+    /**
+     * @param {string} content
+     */
+    ;
 
     _proto.tablerow = function tablerow(content) {
-      return '<tr>\n' + content + '</tr>\n';
+      return "<tr>\n" + content + "</tr>\n";
     };
 
     _proto.tablecell = function tablecell(content, flags) {
       var type = flags.header ? 'th' : 'td';
-      var tag = flags.align ? '<' + type + ' align="' + flags.align + '">' : '<' + type + '>';
-      return tag + content + '</' + type + '>\n';
-    } // span level renderer
+      var tag = flags.align ? "<" + type + " align=\"" + flags.align + "\">" : "<" + type + ">";
+      return tag + content + ("</" + type + ">\n");
+    }
+    /**
+     * span level renderer
+     * @param {string} text
+     */
     ;
 
     _proto.strong = function strong(text) {
-      return '<strong>' + text + '</strong>';
-    };
+      return "<strong>" + text + "</strong>";
+    }
+    /**
+     * @param {string} text
+     */
+    ;
 
     _proto.em = function em(text) {
-      return '<em>' + text + '</em>';
-    };
+      return "<em>" + text + "</em>";
+    }
+    /**
+     * @param {string} text
+     */
+    ;
 
     _proto.codespan = function codespan(text) {
-      return '<code>' + text + '</code>';
+      return "<code>" + text + "</code>";
     };
 
     _proto.br = function br() {
       return this.options.xhtml ? '<br/>' : '<br>';
-    };
+    }
+    /**
+     * @param {string} text
+     */
+    ;
 
     _proto.del = function del(text) {
-      return '<del>' + text + '</del>';
-    };
+      return "<del>" + text + "</del>";
+    }
+    /**
+     * @param {string} href
+     * @param {string} title
+     * @param {string} text
+     */
+    ;
 
     _proto.link = function link(href, title, text) {
       href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
@@ -2051,7 +2146,13 @@
 
       out += '>' + text + '</a>';
       return out;
-    };
+    }
+    /**
+     * @param {string} href
+     * @param {string} title
+     * @param {string} text
+     */
+    ;
 
     _proto.image = function image(href, title, text) {
       href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
@@ -2060,10 +2161,10 @@
         return text;
       }
 
-      var out = '<img src="' + href + '" alt="' + text + '"';
+      var out = "<img src=\"" + href + "\" alt=\"" + text + "\"";
 
       if (title) {
-        out += ' title="' + title + '"';
+        out += " title=\"" + title + "\"";
       }
 
       out += this.options.xhtml ? '/>' : '>';
@@ -2133,6 +2234,10 @@
     function Slugger() {
       this.seen = {};
     }
+    /**
+     * @param {string} value
+     */
+
 
     var _proto = Slugger.prototype;
 
@@ -2143,6 +2248,8 @@
     }
     /**
      * Finds the next safe (unique) slug to use
+     * @param {string} originalSlug
+     * @param {boolean} isDryRun
      */
     ;
 
@@ -2168,8 +2275,9 @@
     }
     /**
      * Convert string to unique id
-     * @param {object} options
-     * @param {boolean} options.dryrun Generates the next unique slug without updating the internal accumulator.
+     * @param {object} [options]
+     * @param {boolean} [options.dryrun] Generates the next unique slug without
+     * updating the internal accumulator.
      */
     ;
 
@@ -2866,6 +2974,7 @@
   };
   /**
    * Parse Inline
+   * @param {string} src
    */
 
 
@@ -2941,6 +3050,7 @@
   exports.walkTokens = walkTokens;
 
   Object.defineProperty(exports, '__esModule', { value: true });
+
 }));
 
 // ESM-uncomment-begin