[Update] filter basic type

MrPans · Jun 8, 2017 · 807ab24 · 807ab24
1 parent 7a5b8f9
commit 807ab24
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/CodeGenerator.xcodeproj/xcuserdata/pan.xcuserdatad/xcschemes/Generate Code.xcscheme b/CodeGenerator.xcodeproj/xcuserdata/pan.xcuserdatad/xcschemes/Generate Code.xcscheme
@@ -67,16 +67,20 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "0"
+         BundleIdentifier = "com.apple.dt.Xcode"
+         RemotePath = "/Applications/Xcode.app">
+      </RemoteRunnable>
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "3B11E93E1EC9DA28001F4782"
             BuildableName = "CodeGenerator.app"
             BlueprintName = "CodeGenerator"
             ReferencedContainer = "container:CodeGenerator.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

diff --git a/CodeGenerator/Info.plist b/CodeGenerator/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Source/AccessCodeGenerator.m b/Source/AccessCodeGenerator.m
@@ -104,12 +104,16 @@ + (NSMutableArray *)propertyTypeAndNameWithProperty:(NSString *)propertyStr;
             }
             else
             {
+                // 不带 * ，要么是 id 要么是基础类型，要么是宏定义的类型。
                 result =  [resultString componentsSeparatedByString:@" "].mutableCopy;
                 [result enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
                     if ([obj isEqualToString:@""]) {
                         [result removeObject:obj];
                     }
                 }];
+                if (![result containsObject:ID]) {
+                    [result removeAllObjects];
+                }
             }
             return result;
         }

diff --git a/Source/PSProperty.h b/Source/PSProperty.h
@@ -11,7 +11,7 @@
 static NSString *const ASSIGN = @"assign";
 static NSString *const WEAK = @"weak";
 
-static NSString *const ID = @"weak";
+static NSString *const ID = @"id";
 
 static NSString *const IB_OUTLET = @"IBOutlet";
 

diff --git a/Source/PSProperty.m b/Source/PSProperty.m
@@ -14,7 +14,6 @@ @interface PSProperty ()
 @property (nonatomic, strong) NSArray *array;
 @property (nonatomic, strong) PSProperty *node;
 
-
 @end
 
 @implementation PSProperty

diff --git a/SourceEditorPlugin/Info.plist b/SourceEditorPlugin/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>3</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>

diff --git a/SourceEditorPlugin/SourceEditorCommand.h b/SourceEditorPlugin/SourceEditorCommand.h
@@ -10,4 +10,5 @@
 
 @interface SourceEditorCommand : NSObject <XCSourceEditorCommand>
 
+
 @end
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @interface PSProperty () @@
     @property (nonatomic, strong) NSArray *array;
     @property (nonatomic, strong) PSProperty *node;
     @end
     @implementation PSProperty
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,5 @@

		@interface SourceEditorCommand : NSObject <XCSourceEditorCommand>


		@end