[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - basic/qa basic/source

[Andreas Heinisch (via logerrit)]

 basic/qa/cppunit/test_compiler_checks.cxx |   40 ++++++++++++++++++++++++++++++
 basic/source/comp/scanner.cxx             |    2 +
 2 files changed, 42 insertions(+)

New commits:
commit 73e46d86335e60f1b11a91b23522402cd34466a8
Author:     Andreas Heinisch <andreas.heini...@yahoo.de>
AuthorDate: Wed May 25 12:42:23 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue May 31 19:55:38 2022 +0200

    tdf#149157 - Break multiline continuation in a comment after a new line
    
    Change-Id: I3dd875152a6f2cfafb67f13f597c36f01a4759b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135018
    Tested-by: Jenkins
    Reviewed-by: Andreas Heinisch <andreas.heini...@yahoo.de>
    (cherry picked from commit b94275f6d2cb4dc28d1563fd7994251042b6d51a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135164
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/basic/qa/cppunit/test_compiler_checks.cxx 
b/basic/qa/cppunit/test_compiler_checks.cxx
index 24b380ed2a9a..e2882f3f694c 100644
--- a/basic/qa/cppunit/test_compiler_checks.cxx
+++ b/basic/qa/cppunit/test_compiler_checks.cxx
@@ -33,4 +33,44 @@ CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, 
testDoubleArgument)
     CPPUNIT_ASSERT_EQUAL(ERRCODE_BASIC_VAR_DEFINED, 
aMacro.getError().StripDynamic());
 }
 
+CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157)
+{
+    MacroSnippet aMacro("Function extentComment() As Integer\n"
+                        "  ' _\n"
+                        "  If Not extentComment Then\n"
+                        "     extentComment = 1\n"
+                        "  End If\n"
+                        "End Function\n");
+    aMacro.Compile();
+    CPPUNIT_ASSERT(!aMacro.HasError());
+}
+
+CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157_compatible)
+{
+    MacroSnippet aMacro("Option Compatible\n"
+                        "Function extentComment() As Integer\n"
+                        "  ' _\n"
+                        "\n"
+                        "  If Not extentComment Then\n"
+                        "     extentComment = 1\n"
+                        "  End If\n"
+                        "End Function\n");
+    aMacro.Compile();
+    CPPUNIT_ASSERT(!aMacro.HasError());
+}
+
+CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157_vba)
+{
+    MacroSnippet aMacro("Option VBASupport 1\n"
+                        "Function extentComment() As Integer\n"
+                        "  ' _\n"
+                        "\n"
+                        "  If Not extentComment Then\n"
+                        "     extentComment = 1\n"
+                        "  End If\n"
+                        "End Function\n");
+    aMacro.Compile();
+    CPPUNIT_ASSERT(!aMacro.HasError());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index a0d9b9ab6c76..d391e7b6dff2 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -701,6 +701,8 @@ eoln:
         aSym = "\n";
         nColLock = 0;
         bClosingUnderscore = false;
+        // tdf#149157 - break multiline continuation in a comment after a new 
line
+        bPrevLineExtentsComment = false;
         return true;
     }
 }