[PATCH] D22146: clang-format: [JS] Sort imports case insensitive.
Martin Probst via cfe-commits
cfe-commits at lists.llvm.org
Fri Jul 8 11:43:07 PDT 2016
mprobst updated this revision to Diff 63271.
mprobst added a comment.
- clang-format: [JS] support trailing commas in imports.
http://reviews.llvm.org/D22146
Files:
lib/Format/SortJavaScriptImports.cpp
unittests/Format/SortImportsTestJS.cpp
Index: unittests/Format/SortImportsTestJS.cpp
===================================================================
--- unittests/Format/SortImportsTestJS.cpp
+++ unittests/Format/SortImportsTestJS.cpp
@@ -236,6 +236,27 @@
"1;");
}
+TEST_F(SortImportsTestJS, SortCaseInsensitive) {
+ verifySort("import {A} from 'aa';\n"
+ "import {A} from 'Ab';\n"
+ "import {A} from 'b';\n"
+ "import {A} from 'Bc';\n"
+ "\n"
+ "1;",
+ "import {A} from 'b';\n"
+ "import {A} from 'Bc';\n"
+ "import {A} from 'Ab';\n"
+ "import {A} from 'aa';\n"
+ "\n"
+ "1;");
+ verifySort("import {aa, Ab, b, Bc} from 'x';\n"
+ "\n"
+ "1;",
+ "import {b, Bc, Ab, aa} from 'x';\n"
+ "\n"
+ "1;");
+}
+
} // end namespace
} // end namespace format
} // end namespace clang
Index: lib/Format/SortJavaScriptImports.cpp
===================================================================
--- lib/Format/SortJavaScriptImports.cpp
+++ lib/Format/SortJavaScriptImports.cpp
@@ -105,8 +105,8 @@
// Empty URLs sort *last* (for export {...};).
if (LHS.URL.empty() != RHS.URL.empty())
return LHS.URL.empty() < RHS.URL.empty();
- if (LHS.URL != RHS.URL)
- return LHS.URL < RHS.URL;
+ if (int Res = LHS.URL.compare_lower(RHS.URL))
+ return Res < 0;
// '*' imports (with prefix) sort before {a, b, ...} imports.
if (LHS.Prefix.empty() != RHS.Prefix.empty())
return LHS.Prefix.empty() < RHS.Prefix.empty();
@@ -245,7 +245,7 @@
std::stable_sort(
Symbols.begin(), Symbols.end(),
[&](const JsImportedSymbol &LHS, const JsImportedSymbol &RHS) {
- return LHS.Symbol < RHS.Symbol;
+ return LHS.Symbol.compare_lower(RHS.Symbol) < 0;
});
if (Symbols == Reference.Symbols) {
// No change in symbol order.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D22146.63271.patch
Type: text/x-patch
Size: 1953 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160708/11bc0ad8/attachment.bin>
More information about the cfe-commits
mailing list