Support Xcode7.

MellongLau · Sep 22, 2015 · 8e37c89 · 8e37c89
1 parent 327dc91
commit 8e37c89
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/AMMethod2Implement/AMMethod2Implement.m b/AMMethod2Implement/AMMethod2Implement.m
@@ -100,7 +100,7 @@ - (NSArray *)escapeCharacterWithArray:(NSArray *)array
     return mutableArray;
 }
 
-- (void)implementMethod:selectString
+- (void)implementMethod:(NSString *)selectString
 {
     NSArray *currentClassName          = [AMIDEHelper getCurrentClassNameByCurrentSelectedRangeWithFileType:AMIDEFileTypeHFile];
     NSArray *methodList                = [selectString componentsSeparatedByString:@";"];
@@ -116,13 +116,20 @@ - (void)implementMethod:selectString
 
 
         NSInteger matchIndex = [methodItem getMatchIndexWithRegexList:_declareMap];
+
         if (matchIndex != -1)
         {
+            NSString *mfilePath = [AMIDEHelper getMFilePathOfCurrentEditFile];
             if (hasOpenMFile == NO) {
 
-                [AMIDEHelper openFile:[AMIDEHelper getMFilePathOfCurrentEditFile]];
+                [AMIDEHelper openFile:mfilePath];
                 hasOpenMFile = YES;
             }
+
+
+            while (![[AMIDEHelper getCurrentEditFilePath] isEqualToString:mfilePath]) {
+                [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
+            }
 
             NSTextView *textView = [AMXcodeHelper currentSourceCodeTextView];
             NSString *mFileText  = textView.textStorage.string;
@@ -196,7 +203,14 @@ - (void)declareMethod:(NSString *)selectString{
 
         if (matchIndex == AMImplementTypeMethod) {
             NSArray *currentClassName          = [AMIDEHelper getCurrentClassNameByCurrentSelectedRangeWithFileType:AMIDEFileTypeMFile];
-            [AMIDEHelper openFile:[AMIDEHelper getHFilePathOfCurrentEditFile]];
+            NSString *hfilePath = [AMIDEHelper getHFilePathOfCurrentEditFile];
+            [AMIDEHelper openFile:hfilePath];
+
+            while (![[AMIDEHelper getCurrentEditFilePath] isEqualToString:hfilePath]) {
+                [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
+            }
+
+
             NSTextView *textView               = [AMXcodeHelper currentSourceCodeTextView];
             NSString *hFileText                = textView.textStorage.string;
             NSRange trimStringRange = [selectString rangeOfString:@"{"];