Просмотр исходного кода

Merge pull request #19373 from overleaf/mj-comment-regex-fix

[web] Fix regex in comment matching

GitOrigin-RevId: e341f13a9ccbe2fbc1ec6c6c1d8a7a11c4dd4e37
Mathias Jakobsen 2 лет назад
Родитель
Сommit
1f0e346bbc

+ 1 - 6
services/web/app/src/Features/Metadata/MetaHandler.js

@@ -137,11 +137,6 @@ module.exports = MetaHandler = {
    * @returns {string}
    */
   _getNonCommentedContent(rawLine) {
-    const commentStart = /(?:^%)|(?:[^\\]%)/
-    const match = rawLine.match(commentStart)
-    if (match) {
-      return rawLine.slice(0, match.index)
-    }
-    return rawLine
+    return rawLine.replace(/(^|[^\\])%.*/, '$1')
   },
 }

+ 3 - 1
services/web/test/unit/src/Metadata/MetaHandlerTests.js

@@ -197,9 +197,11 @@ describe('MetaHandler', function () {
         'two',
         // bbb should not be in the returned labels
         'commented label % \\label{bbb}',
+        '\\label{ccc}%bar',
+        '\\label{ddd} % bar',
       ]
       this.fakeMeta = {
-        labels: ['aaa'],
+        labels: ['aaa', 'ccc', 'ddd'],
         packages: { abc: [] },
         packageNames: ['abc'],
       }