Addresses one of the problems from #19

Author: stefanceriu

SCXcodeSwitchExpander.xcodeproj/project.pbxproj

@@ -155,7 +155,7 @@
 		18990B1718D25239007A8756 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Stefan Ceriu";
 			};
 			buildConfigurationList = 18990B1A18D25239007A8756 /* Build configuration list for PBXProject "SCXcodeSwitchExpander" */;
@@ -215,6 +215,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -285,6 +286,7 @@
 				GCC_PREFIX_HEADER = "SCXcodeSwitchExpander/SCXcodeSwitchExpander-Prefix.pch";
 				INFOPLIST_FILE = "SCXcodeSwitchExpander/SCXcodeSwitchExpander-Info.plist";
 				INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.stefanceriu.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = xcplugin;
 			};
@@ -307,6 +309,7 @@
 				GCC_PREFIX_HEADER = "SCXcodeSwitchExpander/SCXcodeSwitchExpander-Prefix.pch";
 				INFOPLIST_FILE = "SCXcodeSwitchExpander/SCXcodeSwitchExpander-Info.plist";
 				INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.stefanceriu.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = xcplugin;
 			};

SCXcodeSwitchExpander/DVTTextCompletionController+SCXcodeSwitchExpander.m

@@ -109,6 +109,12 @@ - (BOOL)tryExpandingSwitchStatement
                 return NO;
             }
 
+			// Check if it's the opening bracket for the switch statement or something else
+			NSString *remainingText = [textView.string substringWithRange:NSMakeRange(switchRange.location + switchRange.length, openingBracketLocation - switchRange.location - switchRange.length)];
+			if([remainingText rangeOfString:@"}"].location != NSNotFound) {
+				return NO;
+			}
+			
 			// Insert the selected autocomplete item
 			[self.session insertCurrentCompletion];
 

SCXcodeSwitchExpander/SCXcodeSwitchExpander-Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.stefanceriu.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -39,7 +39,7 @@
 		<string>8DC44374-2B35-4C57-A6FE-2AD66A36AAD9</string>
 		<string>7FDF5C7A-131F-4ABB-9EDC-8C5F8F0B8A90</string>
 		<string>AABB7188-E14E-4433-AD3B-5CD791EAD9A3</string>
-	 	<string>0420B86A-AA43-4792-9ED0-6FE0F2B16A13</string>
+		<string>0420B86A-AA43-4792-9ED0-6FE0F2B16A13</string>
 		<string>CC0D0F4F-05B3-431A-8F33-F84AFCB2C651</string>
 	</array>
 	<key>NSHumanReadableCopyright</key>