Merge pull request #13 in UPCMC/ftctextentryformatting from tech/nullabilityfull to master

Морозов Денис Сергеевич · Морозов Денис Сергеевич · commit eb43935903ac · 2017-09-01T17:06:27.000+07:00
* commit '87f6b10ae42d43b3060024874d5a2e11fc5f6366':
  Nullability full [NOISSUE]
diff --git a/Src/Core/FTCTextEntryFormatCoordinator.h b/Src/Core/FTCTextEntryFormatCoordinator.h
@@ -5,9 +5,11 @@
 
 @class FTCTextEntryFormattingConfig;
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCTextEntryFormatCoordinator : NSObject
 
-@property (nonatomic, strong) NSString *rawValue;
+@property (nonatomic, strong, nullable) NSString *rawValue;
 @property (nonatomic, readonly) NSString *formattedValue;
 
 @property (nonatomic, assign) NSRange currentSelectionRangeInFormattedValue;
@@ -24,3 +26,5 @@
 - (void)applyConfig:(FTCTextEntryFormattingConfig *)config;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Core/FTCTextEntryFormatCoordinator.m b/Src/Core/FTCTextEntryFormatCoordinator.m
@@ -137,15 +137,15 @@ - (void)applyConfig:(FTCTextEntryFormattingConfig *)config
 	[self doSetRawValue:_rawValue];
 }
 
-- (void)doSetRawValue:(NSString *)rawValue
+- (void)doSetRawValue:(nullable NSString *)rawValue
 {
 	_rawValue = [self filterValue:rawValue];
 
 	[self doFormatValue];
 	[self moveCaretToTheEndOfRawValue];
 }
 
-- (NSString *)filterValue:(NSString *)value
+- (nullable NSString *)filterValue:(nullable NSString *)value
 {
 	assert( (nil != notEditingInputFilter) && @"'notEditingInputFilter' must not be nil here." );
 
diff --git a/Src/Core/FTCTextEntryFormatCoordinatorHelper.h b/Src/Core/FTCTextEntryFormatCoordinatorHelper.h
@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, nullable, copy) NSString *rawValue;
 
-@property (nonatomic, nullable, readonly) NSString *formattedValue;
+@property (nonatomic, readonly) NSString *formattedValue;
 
 - (instancetype)initWithUI:(id<FTCTextEntry>)textEntryUI;
 
diff --git a/Src/Core/Formatting/FTCNoFormattingFormatter.h b/Src/Core/Formatting/FTCNoFormattingFormatter.h
@@ -5,8 +5,12 @@
 
 #import "FTCTextEntryFormatter.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCNoFormattingFormatter : NSObject<FTCTextEntryFormatter>
 
 - (instancetype)init;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Core/Formatting/FTCTextEntryFormatter.h b/Src/Core/Formatting/FTCTextEntryFormatter.h
@@ -3,12 +3,16 @@
 // Copyright (c) 2015 FTC. All rights reserved.
 //
 
+NS_ASSUME_NONNULL_BEGIN
+
 @protocol FTCTextEntryFormatter<NSObject>
 
-- (NSString *)rawFromFormatted:(NSString *)formattedValue;
-- (NSString *)formattedFromRaw:(NSString *)rawValue;
+- (NSString *)rawFromFormatted:(nullable NSString *)formattedValue;
+- (NSString *)formattedFromRaw:(nullable NSString *)rawValue;
 
-- (NSRange)rangeInFormattedValueForRange:(NSRange)rangeInRawValue inRawValue:(NSString *)rawValue;
-- (NSRange)rangeInRawValueForRange:(NSRange)rangeInFormattedValue inFormattedValue:(NSString *)formattedValue;
+- (NSRange)rangeInFormattedValueForRange:(NSRange)rangeInRawValue inRawValue:(nullable NSString *)rawValue;
+- (NSRange)rangeInRawValueForRange:(NSRange)rangeInFormattedValue inFormattedValue:(nullable NSString *)formattedValue;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Core/Formatting/MaskFormatter/FTCMaskFormatter.m b/Src/Core/Formatting/MaskFormatter/FTCMaskFormatter.m
@@ -127,8 +127,8 @@ - (NSUInteger)positionOfRawSymbolInFormattedValue:(const NSUInteger)rawNumber
 	return position;
 }
 
-- (NSString *)rawValueStringFromFormattedString:(NSString *const)formattedString
-							   inFormattedRange:(const NSRange)range
+- (nonnull NSString *)rawValueStringFromFormattedString:(nullable NSString *const)formattedString
+                                       inFormattedRange:(const NSRange)range
 {
 	NSString * const format = config.format;
 
@@ -146,7 +146,7 @@ - (NSString *)rawValueStringFromFormattedString:(NSString *const)formattedString
 	return [rawString copy];
 }
 
-- (NSUInteger)countOfRawSymbolsInFormattedString:(NSString *const)formattedString
+- (NSUInteger)countOfRawSymbolsInFormattedString:(nullable NSString *const)formattedString
 										 inRange:(const NSRange)range
 {
 	NSString *rawString = [self rawValueStringFromFormattedString:formattedString
diff --git a/Src/Core/Formatting/PostfixFormatter/FTCPostfixFormatter.h b/Src/Core/Formatting/PostfixFormatter/FTCPostfixFormatter.h
@@ -5,12 +5,16 @@
 
 #import "FTCTextEntryFormatter.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCPostfixFormatter : NSObject<FTCTextEntryFormatter>
 
-@property (nonatomic, readonly) NSString *postfix;
+@property (nonatomic, nullable, readonly) NSString *postfix;
 
-- (instancetype)init NS_UNAVAILABLE;
+- (instancetype)initWithPostfix:(nullable NSString *)postfix;
 
-- (instancetype)initWithPostfix:(NSString *)postfix;
+- (instancetype)init NS_UNAVAILABLE;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Core/Formatting/PostfixFormatter/FTCPostfixFormatter.m b/Src/Core/Formatting/PostfixFormatter/FTCPostfixFormatter.m
@@ -46,14 +46,14 @@ - (NSString *)rawFromFormatted:(NSString *)formattedValue
 
 - (NSString *)formattedFromRaw:(NSString *)rawValue
 {
-	assert( nil != rawValue );
+	NSString *result = (rawValue != nil ? rawValue : @"");
 
 	if( NO == [self canShowPostfix] )
 	{
-		return rawValue;
+		return result;
 	}
 
-	return [rawValue stringByAppendingString:_postfix];
+	return [result stringByAppendingString:_postfix];
 }
 
 - (NSRange)rangeInFormattedValueForRange:(NSRange)rangeInRawValue inRawValue:(NSString *)rawValue
diff --git a/Src/Core/InputFiltering/FTCFilteredString.h b/Src/Core/InputFiltering/FTCFilteredString.h
@@ -3,6 +3,8 @@
 // Copyright (c) 2015 FTC. All rights reserved.
 //
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCFilteredString : NSObject
 
 @property (nonatomic, readonly) NSString *string;
@@ -11,3 +13,5 @@
 - (instancetype)initWithString:(NSString *)string range:(NSRange)range;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Core/InputFiltering/FTCNoFilteringFilter.h b/Src/Core/InputFiltering/FTCNoFilteringFilter.h
@@ -6,8 +6,12 @@
 #import "FTCTextEntryEditingInputFilter.h"
 #import "FTCTextEntryNotEditingInputFilter.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCNoFilteringFilter : NSObject<FTCTextEntryEditingInputFilter, FTCTextEntryNotEditingInputFilter>
 
 - (instancetype)init;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Core/InputFiltering/FTCTextEntryEditingInputFilter.h b/Src/Core/InputFiltering/FTCTextEntryEditingInputFilter.h
@@ -5,10 +5,14 @@
 
 @class FTCFilteredString;
 
+NS_ASSUME_NONNULL_BEGIN
+
 @protocol FTCTextEntryEditingInputFilter<NSObject>
 
 - (FTCFilteredString *)replaceSubstringInString:(NSString *)originalString
                                         atRange:(NSRange)range
                                      withString:(NSString *)replacement;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Core/InputFiltering/FTCTextEntryNotEditingInputFilter.h b/Src/Core/InputFiltering/FTCTextEntryNotEditingInputFilter.h
@@ -5,8 +5,12 @@
 
 @import Foundation;
 
+NS_ASSUME_NONNULL_BEGIN
+
 @protocol FTCTextEntryNotEditingInputFilter<NSObject>
 
 - (NSString *)filterString:(NSString *)string;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Core/InputFiltering/LimitedLengthInputFilter/FTCLimitedLengthInputFilter.h b/Src/Core/InputFiltering/LimitedLengthInputFilter/FTCLimitedLengthInputFilter.h
@@ -8,9 +8,13 @@
 #import "FTCTextEntryEditingInputFilter.h"
 #import "FTCTextEntryNotEditingInputFilter.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCLimitedLengthInputFilter : NSObject<FTCTextEntryEditingInputFilter, FTCTextEntryNotEditingInputFilter>
 
 - (instancetype)initWithMaximumLength:(NSUInteger)maximumLength NS_DESIGNATED_INITIALIZER;
 - (instancetype)init NS_UNAVAILABLE;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Core/InputFiltering/ToUpperCaseInputFilter/FTCToUpperCaseInputFilter.h b/Src/Core/InputFiltering/ToUpperCaseInputFilter/FTCToUpperCaseInputFilter.h
@@ -6,8 +6,12 @@
 #import "FTCTextEntryEditingInputFilter.h"
 #import "FTCTextEntryNotEditingInputFilter.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCToUpperCaseInputFilter : NSObject<FTCTextEntryEditingInputFilter, FTCTextEntryNotEditingInputFilter>
 
 - (instancetype)init;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/FTCTextFieldFormatCoordinator.h b/Src/FTCTextFieldFormatCoordinator.h
@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, nullable, copy) void (^didChangeValueHandler)();
 @property (nonatomic, nullable, copy) NSString *rawValue;
-@property (nonatomic, nullable, readonly) NSString *formattedValue;
+@property (nonatomic, readonly) NSString *formattedValue;
 
 /*!
  * Устанавливает delegate у textField. Используйте поле textFieldDelegate если необходим delegate.
diff --git a/Src/FTCTextInputUtils.h b/Src/FTCTextInputUtils.h
@@ -4,6 +4,8 @@
 
 @import UIKit;
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCTextInputUtils : NSObject
 
 + (void)selectTextInTextInput:(id<UITextInput>)textInput atRange:(NSRange)selectionRange NS_SWIFT_NAME( selectText(in:at:) );
@@ -16,3 +18,5 @@
 - (instancetype)init NS_UNAVAILABLE;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Money/FTCIntegralMoneyAmountEntryEditingInputFilter.h b/Src/Money/FTCIntegralMoneyAmountEntryEditingInputFilter.h
@@ -5,8 +5,12 @@
 
 #import "FTCTextEntryEditingInputFilter.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCIntegralMoneyAmountEntryEditingInputFilter : NSObject<FTCTextEntryEditingInputFilter>
 
 - (instancetype)init;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Money/FTCIntegralMoneyAmountEntryNotEditingInputFilter.h b/Src/Money/FTCIntegralMoneyAmountEntryNotEditingInputFilter.h
@@ -5,8 +5,12 @@
 
 #import "FTCTextEntryNotEditingInputFilter.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCIntegralMoneyAmountEntryNotEditingInputFilter : NSObject<FTCTextEntryNotEditingInputFilter>
 
 - (instancetype)init;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Money/FTCMoneyEntryEditingInputFilter.m b/Src/Money/FTCMoneyEntryEditingInputFilter.m
@@ -50,7 +50,7 @@ - (FTCFilteredString *)replaceSubstringInString:(NSString *)originalString atRan
 	return [[FTCFilteredString alloc] initWithString:originalString range:NSMakeRange(filteredReplacementRange.location, 0)];
 }
 
-- (BOOL)shouldUseReplacementResult:(NSString *)replacementResult
+- (BOOL)shouldUseReplacementResult:(nonnull NSString *)replacementResult
 {
 	const NSUInteger separatorLocation = [replacementResult rangeOfCharacterFromSet:[FTCMoneyEntryFormatUtils decimalSeparatorsCharacterSet]].location;
 
diff --git a/Src/Money/FTCMoneyEntryFormatUtils.h b/Src/Money/FTCMoneyEntryFormatUtils.h
@@ -3,6 +3,8 @@
 // Copyright (c) 2015 FTC. All rights reserved.
 //
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FTCMoneyEntryFormatUtils : NSObject
 
 + (NSString *)trimZeroHeadFromString:(NSString *const)string;
@@ -19,3 +21,5 @@
 - (instancetype)init NS_UNAVAILABLE;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Src/Money/FTCMoneyEntryFormatUtils.m b/Src/Money/FTCMoneyEntryFormatUtils.m
@@ -19,7 +19,7 @@ + (NSString *)trimZeroHeadFromString:(NSString * const)string
 	return [string substringFromIndex:zeroHeadLength];
 }
 
-+ (NSRange)zeroHeadRangeForString:(NSString * const)string
++ (NSRange)zeroHeadRangeForString:(nonnull NSString * const)string
 {
 	NSRange zeroHeadRange = NSMakeRange(NSNotFound, 0);
 
@@ -64,7 +64,7 @@ + (NSString *)removeNonMoneyEntryCharactersFromString:(NSString * const)string
 	return [FTCTextEntryFormattingStringUtils removeCharactersOfSet:[FTCMoneyEntryFormatUtils nonMoneyEntryCharacters] fromString:string];
 }
 
-+ (NSCharacterSet *)nonMoneyEntryCharacters
++ (nonnull NSCharacterSet *)nonMoneyEntryCharacters
 {
 	static NSCharacterSet *notAllowedCharacters;
 
diff --git a/Src/Money/FTCMoneyEntryNotEditingFormatter.m b/Src/Money/FTCMoneyEntryNotEditingFormatter.m
@@ -47,11 +47,9 @@ - (NSString *)rawFromFormatted:(NSString *)formattedValue
 
 - (NSString *)formattedFromRaw:(NSString *)rawValue
 {
-	assert( nil != rawValue );
-
 	if( NO == [self canShowPostfixForString:rawValue] )
 	{
-		return rawValue;
+		return (rawValue != nil ? rawValue : @"");
 	}
 
 	return [postfixFormatter formattedFromRaw:rawValue];
@@ -72,7 +70,7 @@ - (NSRange)rangeInRawValueForRange:(NSRange)rangeInFormattedValue inFormattedVal
 	return rangeInFormattedValue;
 }
 
-- (BOOL)canShowPostfixForString:(NSString *)string
+- (BOOL)canShowPostfixForString:(nullable NSString *)string
 {
 	if(0 == string.length)
 	{

Original file line number	Diff line number	Diff line change
`@@ -137,15 +137,15 @@ - (void)applyConfig:(FTCTextEntryFormattingConfig *)config`
`137`	`137`	`[self doSetRawValue:_rawValue];`
`138`	`138`	`}`
`139`	`139`
`140`		`-- (void)doSetRawValue:(NSString *)rawValue`
	`140`	`+- (void)doSetRawValue:(nullable NSString *)rawValue`
`141`	`141`	`{`
`142`	`142`	`_rawValue = [self filterValue:rawValue];`
`143`	`143`
`144`	`144`	`[self doFormatValue];`
`145`	`145`	`[self moveCaretToTheEndOfRawValue];`
`146`	`146`	`}`
`147`	`147`
`148`		`-- (NSString )filterValue:(NSString )value`
	`148`	`+- (nullable NSString )filterValue:(nullable NSString )value`
`149`	`149`	`{`
`150`	`150`	`assert( (nil != notEditingInputFilter) && @"'notEditingInputFilter' must not be nil here." );`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,8 @@ - (NSUInteger)positionOfRawSymbolInFormattedValue:(const NSUInteger)rawNumber`
`127`	`127`	`return position;`
`128`	`128`	`}`
`129`	`129`
`130`		`-- (NSString )rawValueStringFromFormattedString:(NSString const)formattedString`
`131`		`- inFormattedRange:(const NSRange)range`
	`130`	`+- (nonnull NSString )rawValueStringFromFormattedString:(nullable NSString const)formattedString`
	`131`	`+ inFormattedRange:(const NSRange)range`
`132`	`132`	`{`
`133`	`133`	`NSString * const format = config.format;`
`134`	`134`
`@@ -146,7 +146,7 @@ - (NSString )rawValueStringFromFormattedString:(NSString const)formattedString`
`146`	`146`	`return [rawString copy];`
`147`	`147`	`}`
`148`	`148`
`149`		`-- (NSUInteger)countOfRawSymbolsInFormattedString:(NSString *const)formattedString`
	`149`	`+- (NSUInteger)countOfRawSymbolsInFormattedString:(nullable NSString *const)formattedString`
`150`	`150`	`inRange:(const NSRange)range`
`151`	`151`	`{`
`152`	`152`	`NSString *rawString = [self rawValueStringFromFormattedString:formattedString`
Original file line number	Diff line number	Diff line change
`@@ -46,14 +46,14 @@ - (NSString )rawFromFormatted:(NSString )formattedValue`
`46`	`46`
`47`	`47`	`- (NSString )formattedFromRaw:(NSString )rawValue`
`48`	`48`	`{`
`49`		`- assert( nil != rawValue );`
	`49`	`+ NSString *result = (rawValue != nil ? rawValue : @"");`
`50`	`50`
`51`	`51`	`if( NO == [self canShowPostfix] )`
`52`	`52`	`{`
`53`		`- return rawValue;`
	`53`	`+ return result;`
`54`	`54`	`}`
`55`	`55`
`56`		`- return [rawValue stringByAppendingString:_postfix];`
	`56`	`+ return [result stringByAppendingString:_postfix];`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`- (NSRange)rangeInFormattedValueForRange:(NSRange)rangeInRawValue inRawValue:(NSString *)rawValue`