Merge pull request #16 from luoxiu/simplify-optional.kj_value

CoderMJLee · web-flow · commit e39c04b27044 · 2019-08-23T23:29:35.000+08:00
simplify `optional.kj_value`
diff --git a/KakaJSON/Extension/Optional+KJ.swift b/KakaJSON/Extension/Optional+KJ.swift
@@ -14,11 +14,7 @@ protocol OptionalValue {
 
 extension Optional: OptionalValue {
     var kj_value: Any? {
-        guard self != nil else { return nil }
-        let value = self!
-        guard let ov = value as? OptionalValue else {
-            return value
-        }
-        return ov.kj_value
+        guard let v = self else { return nil }
+        return (v as? OptionalValue)?.kj_value ?? v
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,7 @@ protocol OptionalValue {`
`14`	`14`
`15`	`15`	`extension Optional: OptionalValue {`
`16`	`16`	`var kj_value: Any? {`
`17`		`- guard self != nil else { return nil }`
`18`		`- let value = self!`
`19`		`- guard let ov = value as? OptionalValue else {`
`20`		`- return value`
`21`		`- }`
`22`		`- return ov.kj_value`
	`17`	`+ guard let v = self else { return nil }`
	`18`	`+ return (v as? OptionalValue)?.kj_value ?? v`
`23`	`19`	`}`
`24`	`20`	`}`