[clang-format] [PR41187] moves Java import statements to the wrong location if code contains statements that start with the word import

[MyDeveloperDay]

Summary

Import sorting of java file, incorrectly move import statement to after a function beginning with the word import.

Make 1 character change to regular expression to ensure there is always at least one space/tab after the word import

Previously clang-format --style="LLVM" would format

import X;

class C {
  void m() {
    importFile();
  }
}

as

class C {
  void m() {
    importFile();
import X;
  }
}

[klimek]

LG

clang/lib/Format/Format.cpp

if (Err) {
     llvm::errs() << llvm::toString(std::move(Err)) << "\n";
     assert(false);
   }
 }
 
 namespace {
 
 const char JavaImportRegexPattern[] =
-    "^[\t ]*import[\t ]*(static[\t ]*)?([^\t ]*)[\t ]*;";
+    "^[\t ]*import[\t ]+(static[\t ]*)?([^\t ]*)[\t ]*;";
 
 } // anonymous namespace
 
 tooling::Replacements sortJavaImports(const FormatStyle &Style, StringRef Code,
                                       ArrayRef<tooling::Range> Ranges,
                                       StringRef FileName,
                                       tooling::Replacements &Replaces) {
   unsigned Prev = 0;

clang/unittests/Format/SortImportsTestJava.cpp

 
 TEST_F(SortImportsTestJava, NoNewlineAtEnd) {
   EXPECT_EQ("import org.a;\n"
             "import org.b;",
             sort("import org.b;\n"
                  "import org.a;"));
 }
 
+TEST_F(SortImportsTestJava, ImportNamedFunction) {
+  EXPECT_EQ("import X;\n"
+            "class C {\n"
+            "  void m() {\n"
+            "    importFile();\n"
+            "  }\n"
+            "}\n",
+            sort("import X;\n"
+                 "class C {\n"
+                 "  void m() {\n"
+                 "    importFile();\n"
+                 "  }\n"
+                 "}\n"));
+}
+
 TEST_F(SortImportsTestJava, NoReplacementsForValidImports) {
   // Identical #includes have led to a failure with an unstable sort.
   std::string Code = "import org.a;\n"
                      "import org.b;\n";
   EXPECT_TRUE(
       sortIncludes(FmtStyle, Code, GetCodeRange(Code), "input.java").empty());
 }
 
 } // end namespace
 } // end namespace format
 } // end namespace clang