Merge pull request #32507 from nkcsgexi/swift-name-convention

ExplicitModules: use key names conforming to Swift naming convention in explicit Swift module maps. NFC

Author: nkcsgexi

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -1460,13 +1460,13 @@ struct ExplicitSwiftModuleLoader::Implementation {
     for (auto &entry: *mapNode) {
       auto key = getScalaNodeText(entry.getKey());
       auto val = getScalaNodeText(entry.getValue());
-      if (key == "SwiftModule") {
+      if (key == "moduleName") {
         moduleName = val;
-      } else if (key == "SwiftModulePath") {
+      } else if (key == "modulePath") {
         result.modulePath = val;
-      } else if (key == "SwiftDocPath") {
+      } else if (key == "docPath") {
         result.moduleDocPath = val;
-      } else if (key == "SwiftSourceInfoPath") {
+      } else if (key == "sourceInfoPath") {
         result.moduleSourceInfoPath = val;
       } else {
         // Being forgiving for future fields.
@@ -1480,16 +1480,16 @@ struct ExplicitSwiftModuleLoader::Implementation {
   }
   //  [
   //    {
-  //      "SwiftModule": "A",
-  //      "SwiftModulePath": "A.swiftmodule",
-  //      "SwiftDocPath": "A.swiftdoc",
-  //      "SwiftSourceInfoPath": "A.swiftsourceinfo"
+  //      "moduleName": "A",
+  //      "modulePath": "A.swiftmodule",
+  //      "docPath": "A.swiftdoc",
+  //      "sourceInfoPath": "A.swiftsourceinfo"
   //    },
   //    {
-  //      "SwiftModule": "B",
-  //      "SwiftModulePath": "B.swiftmodule",
-  //      "SwiftDocPath": "B.swiftdoc",
-  //      "SwiftSourceInfoPath": "B.swiftsourceinfo"
+  //      "moduleName": "B",
+  //      "modulePath": "B.swiftmodule",
+  //      "docPath": "B.swiftdoc",
+  //      "sourceInfoPath": "B.swiftsourceinfo"
   //    }
   //  ]
   void parseSwiftExplicitModuleMap(StringRef fileName) {

test/ScanDependencies/explicit-module-map.swift

@@ -6,10 +6,10 @@
 // RUN: %target-swift-frontend -emit-module -emit-module-path %t/inputs/Foo.swiftmodule -emit-module-doc-path %t/inputs/Foo.swiftdoc -emit-module-source-info -emit-module-source-info-path %t/inputs/Foo.swiftsourceinfo -module-cache-path %t.module-cache %t/foo.swift -module-name Foo
 
 // RUN: echo "[{" > %/t/inputs/map.json
-// RUN: echo "\"SwiftModule\": \"Foo\"," >> %/t/inputs/map.json
-// RUN: echo "\"SwiftModulePath\": \"%/t/inputs/Foo.swiftmodule\"," >> %/t/inputs/map.json
-// RUN: echo "\"SwiftDocPath\": \"%/t/inputs/Foo.swiftdoc\"," >> %/t/inputs/map.json
-// RUN: echo "\"SwiftSourceInfoPath\": \"%/t/inputs/Foo.swiftsourceinfo\"" >> %/t/inputs/map.json
+// RUN: echo "\"moduleName\": \"Foo\"," >> %/t/inputs/map.json
+// RUN: echo "\"modulePath\": \"%/t/inputs/Foo.swiftmodule\"," >> %/t/inputs/map.json
+// RUN: echo "\"docPath\": \"%/t/inputs/Foo.swiftdoc\"," >> %/t/inputs/map.json
+// RUN: echo "\"sourceInfoPath\": \"%/t/inputs/Foo.swiftsourceinfo\"" >> %/t/inputs/map.json
 // RUN: echo "}]" >> %/t/inputs/map.json
 
 // RUN: %target-swift-ide-test -print-module-comments -module-to-print=Foo -enable-swiftsourceinfo -source-filename %s -explicit-swift-module-map-file %t/inputs/map.json | %FileCheck %s