[clang] f750c3d - Revert "clang-format: [JS] sort import aliases."

[Vitaly Buka via cfe-commits]

Author: Vitaly Buka
Date: 2022-01-27T21:16:53-08:00
New Revision: f750c3d95a0c8bf1d21380ae753fce12010a7561

URL: https://github.com/llvm/llvm-project/commit/f750c3d95a0c8bf1d21380ae753fce12010a7561
DIFF: https://github.com/llvm/llvm-project/commit/f750c3d95a0c8bf1d21380ae753fce12010a7561.diff

LOG: Revert "clang-format: [JS] sort import aliases."

Triggers MSAN report.

This reverts commit c6d5efb5d98093c4bd7578b2ea52c9032d20dea3.

Added: 
    

Modified: 
    clang/lib/Format/SortJavaScriptImports.cpp
    clang/unittests/Format/SortImportsTestJS.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Format/SortJavaScriptImports.cpp b/clang/lib/Format/SortJavaScriptImports.cpp
index e4107525a7fff..37e79bb15b58b 100644
--- a/clang/lib/Format/SortJavaScriptImports.cpp
+++ b/clang/lib/Format/SortJavaScriptImports.cpp
@@ -78,7 +78,6 @@ struct JsModuleReference {
     ABSOLUTE,        // from 'something'
     RELATIVE_PARENT, // from '../*'
     RELATIVE,        // from './*'
-    ALIAS,           // import X = A.B;
   };
   ReferenceCategory Category = ReferenceCategory::SIDE_EFFECT;
   // The URL imported, e.g. `import .. from 'url';`. Empty for `export {a, b};`.
@@ -106,12 +105,10 @@ bool operator<(const JsModuleReference &LHS, const JsModuleReference &RHS) {
     return LHS.IsExport < RHS.IsExport;
   if (LHS.Category != RHS.Category)
     return LHS.Category < RHS.Category;
-  if (LHS.Category == JsModuleReference::ReferenceCategory::SIDE_EFFECT ||
-      LHS.Category == JsModuleReference::ReferenceCategory::ALIAS)
-    // Side effect imports and aliases might be ordering sensitive. Consider
-    // them equal so that they maintain their relative order in the stable sort
-    // below. This retains transitivity because LHS.Category == RHS.Category
-    // here.
+  if (LHS.Category == JsModuleReference::ReferenceCategory::SIDE_EFFECT)
+    // Side effect imports might be ordering sensitive. Consider them equal so
+    // that they maintain their relative order in the stable sort below.
+    // This retains transitivity because LHS.Category == RHS.Category here.
     return false;
   // Empty URLs sort *last* (for export {...};).
   if (LHS.URL.empty() != RHS.URL.empty())
@@ -401,8 +398,6 @@ class JavaScriptImportSorter : public TokenAnalyzer {
       JsModuleReference Reference;
       Reference.FormattingOff = FormattingOff;
       Reference.Range.setBegin(Start);
-      // References w/o a URL, e.g. export {A}, groups with RELATIVE.
-      Reference.Category = JsModuleReference::ReferenceCategory::RELATIVE;
       if (!parseModuleReference(Keywords, Reference)) {
         if (!FirstNonImportLine)
           FirstNonImportLine = Line; // if no comment before.
@@ -468,6 +463,9 @@ class JavaScriptImportSorter : public TokenAnalyzer {
         Reference.Category = JsModuleReference::ReferenceCategory::RELATIVE;
       else
         Reference.Category = JsModuleReference::ReferenceCategory::ABSOLUTE;
+    } else {
+      // w/o URL groups with "empty".
+      Reference.Category = JsModuleReference::ReferenceCategory::RELATIVE;
     }
     return true;
   }
@@ -503,21 +501,6 @@ class JavaScriptImportSorter : public TokenAnalyzer {
       nextToken();
       if (Current->is(Keywords.kw_from))
         return true;
-      // import X = A.B.C;
-      if (Current->is(tok::equal)) {
-        Reference.Category = JsModuleReference::ReferenceCategory::ALIAS;
-        nextToken();
-        while (Current->is(tok::identifier)) {
-          nextToken();
-          if (Current->is(tok::semi)) {
-            nextToken();
-            return true;
-          }
-          if (!Current->is(tok::period))
-            return false;
-          nextToken();
-        }
-      }
       if (Current->isNot(tok::comma))
         return false;
       nextToken(); // eat comma.

diff  --git a/clang/unittests/Format/SortImportsTestJS.cpp b/clang/unittests/Format/SortImportsTestJS.cpp
index 1c7e508630360..6fe8bba53549b 100644
--- a/clang/unittests/Format/SortImportsTestJS.cpp
+++ b/clang/unittests/Format/SortImportsTestJS.cpp
@@ -446,25 +446,6 @@ TEST_F(SortImportsTestJS, RespectsClangFormatOffInNamedImports) {
              "const x =   1;");
 }
 
-TEST_F(SortImportsTestJS, ImportEqAliases) {
-  verifySort("import {B} from 'bar';\n"
-             "import {A} from 'foo';\n"
-             "\n"
-             "import Z = A.C;\n"
-             "import Y = B.C.Z;\n"
-             "\n"
-             "export {Z};\n"
-             "\n"
-             "console.log(Z);\n",
-             "import {A} from 'foo';\n"
-             "import Z = A.C;\n"
-             "export {Z};\n"
-             "import {B} from 'bar';\n"
-             "import Y = B.C.Z;\n"
-             "\n"
-             "console.log(Z);\n");
-}
-
 } // end namespace
 } // end namespace format
 } // end namespace clang