[clang] [clang-format] Don't sort includes for C# (PR #129369)
via cfe-commits
cfe-commits at lists.llvm.org
Fri Feb 28 23:52:48 PST 2025
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang-format
Author: Owen Pan (owenca)
<details>
<summary>Changes</summary>
Fixes #<!-- -->106194
---
Full diff: https://github.com/llvm/llvm-project/pull/129369.diff
2 Files Affected:
- (modified) clang/lib/Format/Format.cpp (+2-1)
- (modified) clang/unittests/Format/SortIncludesTest.cpp (+9)
``````````diff
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 92678a031178a..c699a96d3f45e 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -3547,7 +3547,8 @@ tooling::Replacements sortIncludes(const FormatStyle &Style, StringRef Code,
return sortJavaScriptImports(Style, Code, Ranges, FileName);
if (Style.Language == FormatStyle::LanguageKind::LK_Java)
return sortJavaImports(Style, Code, Ranges, FileName, Replaces);
- sortCppIncludes(Style, Code, Ranges, FileName, Replaces, Cursor);
+ if (Style.isCpp())
+ sortCppIncludes(Style, Code, Ranges, FileName, Replaces, Cursor);
return Replaces;
}
diff --git a/clang/unittests/Format/SortIncludesTest.cpp b/clang/unittests/Format/SortIncludesTest.cpp
index cb3f8c73a0487..f20862f5f7461 100644
--- a/clang/unittests/Format/SortIncludesTest.cpp
+++ b/clang/unittests/Format/SortIncludesTest.cpp
@@ -1085,6 +1085,15 @@ TEST_F(SortIncludesTest, DoNotSortLikelyXml) {
"input.h", 0));
}
+TEST_F(SortIncludesTest, DoNotSortCSharp) {
+ constexpr StringRef Code{"const string expectedDataStruct = @\"\n"
+ " #include <b.h>\n"
+ " #include <a.h>\n"
+ " \";"};
+ FmtStyle.Language = FormatStyle::LK_CSharp;
+ EXPECT_TRUE(sortIncludes(FmtStyle, Code, GetCodeRange(Code), "a.cs").empty());
+}
+
TEST_F(SortIncludesTest, DoNotOutputReplacementsForSortedBlocksWithRegrouping) {
Style.IncludeBlocks = Style.IBS_Regroup;
StringRef Code = "#include \"b.h\"\n"
``````````
</details>
https://github.com/llvm/llvm-project/pull/129369
More information about the cfe-commits
mailing list