ObjectiveC migrator. In infering NS_ENUM/NS_OPTIONS

macros, prefer the typedef immediately following the
enum declaration to the one preceeding it.
// rdar://15200915

llvm-svn: 192927

1 files changed, 34 insertions, 12 deletions

diff --git a/clang/test/ARCMT/objcmt-ns-macros.m b/clang/test/ARCMT/objcmt-ns-macros.m
index a2f0707ed79..1bf55d8ed46 100644
--- a/clang/test/ARCMT/objcmt-ns-macros.m
+++ b/clang/test/ARCMT/objcmt-ns-macros.m
@@ -217,10 +217,10 @@ enum {
 typedef NSInteger NSModalResponse NS_AVAILABLE_MAC(10.9);
 
 // rdar://15201056
-typedef NSUInteger FarAwayNSUInteger;
+typedef NSUInteger FarFarAwayOptions;
 
 // rdar://15200915
-typedef NSUInteger NSWorkspaceLaunchOptions;
+typedef NSUInteger FarAwayOptions;
 enum {
      NSWorkspaceLaunchAndPrint =                 0x00000002,
      NSWorkspaceLaunchWithErrorPresentation    = 0x00000040,
@@ -234,20 +234,21 @@ enum {
      NSWorkspaceLaunchAndHide                  = 0x00100000,
      NSWorkspaceLaunchAndHideOthers            = 0x00200000,
      NSWorkspaceLaunchDefault = NSWorkspaceLaunchAsync | 
-NSWorkspaceLaunchAllowingClassicStartup
+     NSWorkspaceLaunchAllowingClassicStartup
 };
+typedef NSUInteger NSWorkspaceLaunchOptions;
 
-typedef NSUInteger NSWorkspaceIconCreationOptions;
 enum {
     NSExcludeQuickDrawElementsIconCreationOption    = 1 << 1,
     NSExclude10_4ElementsIconCreationOption         = 1 << 2
 };
+typedef NSUInteger NSExcludeOptions;
 
-typedef NSUInteger NSWorkspaceCreationOptions;
 enum {
     NSExcludeQuickDrawElementsCreationOption    = 1 << 1,
     NSExclude10_4ElementsCreationOption         = 1 << 2
 };
+typedef NSUInteger NSExcludeCreationOption;
 
 enum {
   FarAway1    = 1 << 1,
@@ -258,17 +259,38 @@ enum {
     NSExcludeQuickDrawElementsIconOption    = 1 << 1,
     NSExclude10_4ElementsIconOption         = 1 << 2
 };
-typedef NSUInteger NSWorkspaceIconOptions;
-
-typedef NSInteger NSCollectionViewDropOperation;
+typedef NSUInteger NSExcludeIconOptions;
 
 @interface INTF {
-  NSCollectionViewDropOperation I1;
-  NSCollectionViewDropOperation I2;
+  NSExcludeIconOptions I1;
+  NSExcludeIconOptions I2;
 }
 @end
 
 enum {
-  NotFarAway1    = 1 << 1,
-  NotFarAway2    = 1 << 2
+  FarFarAway1    = 1 << 1,
+  FarFarAway2    = 1 << 2
+};
+
+// rdar://15200915
+typedef NS_OPTIONS(NSUInteger, NSWindowOcclusionState) {
+    NSWindowOcclusionStateVisible = 1UL << 1,
+};
+
+typedef NSUInteger NSWindowNumberListOptions;
+
+enum {
+    NSDirectSelection = 0,
+    NSSelectingNext,
+    NSSelectingPrevious
+};
+typedef NSUInteger NSSelectionDirection;
+
+// standard window buttons
+enum {
+    NSWindowCloseButton,
+    NSWindowMiniaturizeButton,
+    NSWindowZoomButton,
+    NSWindowToolbarButton,
+    NSWindowDocumentIconButton
 };