commit 99e4ab2a1e577ddb29030c09c308b67e16fd51c4
author Virginia Senioria <91khr@users.noreply.github.com> Fri Mar 24 19:25:06 2023 +0000
committer Bram Moolenaar <Bram@vim.org> Fri Mar 24 19:25:06 2023 +0000
tree 75fa4b40fe1e787efa79eb1b94dbba2a958fe4b2
parent 3ea62381c527395ae701715335776f427d22eb7b

patch 9.0.1426: indent wrong after "export namespace" in C++

Problem:    Indent wrong after "export namespace" in C++.
Solution:   Skip over "inline" and "export" in any order. (Virginia Senioria,
            closes #12134, closes #12133)

src/cindent.c

diff --git a/src/cindent.c b/src/cindent.c
index e8e255f..176bc05 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -769,7 +769,9 @@
 
     s = cin_skipcomment(s);
 
-    if (STRNCMP(s, "inline", 6) == 0 && (s[6] == NUL || !vim_iswordc(s[6])))
+    // skip over "inline" and "export" in any order
+    while ((STRNCMP(s, "inline", 6) == 0 || STRNCMP(s, "export", 6) == 0)
+					&& (s[6] == NUL || !vim_iswordc(s[6])))
 	s = cin_skipcomment(skipwhite(s + 6));
 
     if (STRNCMP(s, "namespace", 9) == 0 && (s[9] == NUL || !vim_iswordc(s[9])))

src/testdir/test_cindent.vim

diff --git a/src/testdir/test_cindent.vim b/src/testdir/test_cindent.vim
index 96e99ac..d27adbc 100644
--- a/src/testdir/test_cindent.vim
+++ b/src/testdir/test_cindent.vim
@@ -4406,6 +4406,18 @@
   inline/* test */namespace {
     111111111111111111;
   }
+  export namespace {
+    111111111111111111;
+  }
+  export inline namespace {
+    111111111111111111;
+  }
+  export/* test */inline namespace {
+    111111111111111111;
+  }
+  inline export namespace {
+    111111111111111111;
+  }
 
   /* invalid namespaces use block indent */
   namespace test test2 {
@@ -4509,6 +4521,18 @@
   inline/* test */namespace {
   111111111111111111;
   }
+  export namespace {
+  111111111111111111;
+  }
+  export inline namespace {
+  111111111111111111;
+  }
+  export/* test */inline namespace {
+  111111111111111111;
+  }
+  inline export namespace {
+  111111111111111111;
+  }
 
   /* invalid namespaces use block indent */
   namespace test test2 {

src/version.c

diff --git a/src/version.c b/src/version.c
index 63428d3..f44e29c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1426,
+/**/
     1425,
 /**/
     1424,