loplugin:stringview add check for getToken().toInt32

where we can convert that to
o3tl::toInt32(o3tl::getToken(
and avoid the heap allocation of a temporary string

Change-Id: Ib11c19c6e6cdc0de3e551affd3578d181e292de4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132810
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 36 insertions, 19 deletions

diff --git a/compilerplugins/clang/stringview.cxx b/compilerplugins/clang/stringview.cxx
index d7b48a43a4b8..e706f4b397da 100644
--- a/compilerplugins/clang/stringview.cxx
+++ b/compilerplugins/clang/stringview.cxx
@@ -46,7 +46,8 @@ public:
         return !(
             loplugin::isSamePathname(fn, SRCDIR "/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx")
             || loplugin::isSamePathname(fn, SRCDIR "/sal/qa/rtl/strings/test_ostring_concat.cxx")
-            || loplugin::isSamePathname(fn, SRCDIR "/sal/qa/rtl/strings/test_oustring_concat.cxx"));
+            || loplugin::isSamePathname(fn, SRCDIR "/sal/qa/rtl/strings/test_oustring_concat.cxx")
+            || loplugin::isSamePathname(fn, SRCDIR "/sal/qa/rtl/oustring/rtl_OUString2.cxx"));
     }
 
     virtual void run() override
@@ -336,33 +337,44 @@ void StringView::handleCXXMemberCallExpr(CXXMemberCallExpr const* expr)
     }
 }
 
-/** check for calls to O[U]StringBuffer::append that could be passed as a
-    std::u16string_view */
 bool StringView::VisitCXXMemberCallExpr(CXXMemberCallExpr const* expr)
 {
     if (ignoreLocation(expr))
     {
         return true;
     }
-    if (!loplugin::TypeCheck(expr->getType())
-             .Class("OUStringBuffer")
-             .Namespace("rtl")
-             .GlobalNamespace()
-        && !loplugin::TypeCheck(expr->getType())
-                .Class("OStringBuffer")
-                .Namespace("rtl")
-                .GlobalNamespace())
-    {
-        return true;
-    }
-    auto const dc = loplugin::DeclCheck(expr->getMethodDecl());
-    if (dc.Function("append") || dc.Function("indexOf") || dc.Function("lastIndexOf"))
+    /** check for calls to O[U]StringBuffer::append that could be passed as a
+        std::u16string_view */
+    if (loplugin::TypeCheck(expr->getType())
+            .Class("OUStringBuffer")
+            .Namespace("rtl")
+            .GlobalNamespace()
+        || loplugin::TypeCheck(expr->getType())
+               .Class("OStringBuffer")
+               .Namespace("rtl")
+               .GlobalNamespace())
     {
-        handleSubExprThatCouldBeView(expr->getArg(0));
+        auto const dc = loplugin::DeclCheck(expr->getMethodDecl());
+        if (dc.Function("append") || dc.Function("indexOf") || dc.Function("lastIndexOf"))
+        {
+            handleSubExprThatCouldBeView(expr->getArg(0));
+        }
+        else if (dc.Function("insert"))
+        {
+            handleSubExprThatCouldBeView(expr->getArg(1));
+        }
     }
-    else if (dc.Function("insert"))
+
+    // rather than getToken...toInt32, use o3tl::toInt(o3tl::getToken(...)
+    auto tc = loplugin::TypeCheck(expr->getImplicitObjectArgument()->getType());
+    if (tc.Class("OUString").Namespace("rtl").GlobalNamespace()
+        || tc.Class("OString").Namespace("rtl").GlobalNamespace())
     {
-        handleSubExprThatCouldBeView(expr->getArg(1));
+        auto const dc = loplugin::DeclCheck(expr->getMethodDecl());
+        if (dc.Function("toInt32") || dc.Function("toInt64"))
+        {
+            handleSubExprThatCouldBeView(expr->getImplicitObjectArgument());
+        }
     }
     return true;
 }
diff --git a/compilerplugins/clang/test/stringview.cxx b/compilerplugins/clang/test/stringview.cxx
index 7e637175e259..398f14b3dd12 100644
--- a/compilerplugins/clang/test/stringview.cxx
+++ b/compilerplugins/clang/test/stringview.cxx
@@ -213,4 +213,9 @@ void f5(OUString s)
     s += OUString(std::u16string_view(u"foo"));
 }
 
+void f6(OUString s)
+{
+    // expected-error@+1 {{rather than getToken, pass with a view using o3tl::getToken() [loplugin:stringview]}}
+    s.getToken(1, ' ').toInt32();
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */