diff --git a/clang/lib/Format/SortJavaScriptImports.cpp b/clang/lib/Format/SortJavaScriptImports.cpp --- a/clang/lib/Format/SortJavaScriptImports.cpp +++ b/clang/lib/Format/SortJavaScriptImports.cpp @@ -317,6 +317,11 @@ // Appends ``Reference`` to ``Buffer``. void appendReference(std::string &Buffer, JsModuleReference &Reference) { + if (Reference.FormattingOff) { + Buffer += + getSourceText(Reference.Range.getBegin(), Reference.Range.getEnd()); + return; + } // Sort the individual symbols within the import. // E.g. `import {b, a} from 'x';` -> `import {a, b} from 'x';` SmallVector Symbols = Reference.Symbols; diff --git a/clang/unittests/Format/SortImportsTestJS.cpp b/clang/unittests/Format/SortImportsTestJS.cpp --- a/clang/unittests/Format/SortImportsTestJS.cpp +++ b/clang/unittests/Format/SortImportsTestJS.cpp @@ -431,6 +431,17 @@ "// clang-format off\n"); } +TEST_F(SortImportsTestJS, RespectsClangFormatOffInNamedImports) { + verifySort("// clang-format off\n" + "import {B, A} from './b';\n" + "// clang-format on\n" + "const x = 1;", + "// clang-format off\n" + "import {B, A} from './b';\n" + "// clang-format on\n" + "const x = 1;"); +} + } // end namespace } // end namespace format } // end namespace clang