Rename flag to ‘module-interface-preserve-types-as-written’

Author: Harlan Haskins

include/swift/Frontend/ParseableInterfaceSupport.h

@@ -29,7 +29,7 @@ class ModuleDecl;
 struct ParseableInterfaceOptions {
   /// Should we prefer printing TypeReprs when writing out types in a module
   /// interface, or should we fully-qualify them?
-  bool PreserveTypesAsWrittenInModuleInterface = false;
+  bool PreserveTypesAsWritten = false;
 
   /// Copy of all the command-line flags passed at .swiftinterface
   /// generation time, re-applied to CompilerInvocation when reading

include/swift/Option/FrontendOptions.td

@@ -535,10 +535,10 @@ def build_module_from_parseable_interface :
   Alias<compile_module_from_interface>,
   ModeOpt;
 
-def preserve_types_as_written_in_module_interface :
-  Flag<["-"], "preserve-types-as-written-in-module-interface">,
-  HelpText<"When emitting a module interface, preserve the types as they were "
-           "written in the source, rather than fully-qualifying them.">;
+def module_interface_preserve_types_as_written :
+  Flag<["-"], "module-interface-preserve-types-as-written">,
+  HelpText<"When emitting a module interface, preserve types as they were "
+           "written in the source">;
 
 def prebuilt_module_cache_path :
   Separate<["-"], "prebuilt-module-cache-path">,

lib/Frontend/CompilerInvocation.cpp

@@ -201,8 +201,8 @@ static void ParseParseableInterfaceArgs(ParseableInterfaceOptions &Opts,
                                         ArgList &Args) {
   using namespace options;
 
-  Opts.PreserveTypesAsWrittenInModuleInterface |=
-    Args.hasArg(OPT_preserve_types_as_written_in_module_interface);
+  Opts.PreserveTypesAsWritten |=
+    Args.hasArg(OPT_module_interface_preserve_types_as_written);
 }
 
 /// Save a copy of any flags marked as ModuleInterfaceOption, if running

lib/Frontend/ParseableInterfaceSupport.cpp

@@ -412,7 +412,7 @@ bool swift::emitParseableInterface(raw_ostream &out,
   printImports(out, M);
 
   const PrintOptions printOptions = PrintOptions::printParseableInterfaceFile(
-      Opts.PreserveTypesAsWrittenInModuleInterface);
+      Opts.PreserveTypesAsWritten);
   InheritedProtocolCollector::PerTypeMap inheritedProtocolMap;
 
   SmallVector<Decl *, 16> topLevelDecls;

test/ParseableInterface/preserve-type-repr.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -typecheck -emit-module-interface-path - %s -enable-library-evolution -module-name PreferTypeRepr -preserve-types-as-written-in-module-interface | %FileCheck %s --check-prefix PREFER
+// RUN: %target-swift-frontend -typecheck -emit-module-interface-path - %s -enable-library-evolution -module-name PreferTypeRepr -module-interface-preserve-types-as-written | %FileCheck %s --check-prefix PREFER
 // RUN: %target-swift-frontend -typecheck -emit-module-interface-path - %s -enable-library-evolution -module-name PreferTypeRepr | %FileCheck %s --check-prefix DONTPREFER
 
 public protocol Pet {}