From e897baee48b507b57dc7b6da2bb076cd7bd817ee Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Thu, 11 Jul 2024 11:39:11 +0100
Subject: [PATCH] Merge pull request #19373 from overleaf/mj-comment-regex-fix

[web] Fix regex in comment matching

GitOrigin-RevId: e341f13a9ccbe2fbc1ec6c6c1d8a7a11c4dd4e37
---
 services/web/app/src/Features/Metadata/MetaHandler.js   | 7 +------
 services/web/test/unit/src/Metadata/MetaHandlerTests.js | 4 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/services/web/app/src/Features/Metadata/MetaHandler.js b/services/web/app/src/Features/Metadata/MetaHandler.js
index 009606fb3b..1c0c604031 100644
--- a/services/web/app/src/Features/Metadata/MetaHandler.js
+++ b/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')
   },
 }
diff --git a/services/web/test/unit/src/Metadata/MetaHandlerTests.js b/services/web/test/unit/src/Metadata/MetaHandlerTests.js
index 8c1f4bab8a..91d551baa4 100644
--- a/services/web/test/unit/src/Metadata/MetaHandlerTests.js
+++ b/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'],
       }