Merge commit 'c78b3e9605d1e50fed488f98214cbaff8e3808f9' into task/svgViewBox

.swiftlint.yml

@@ -14,6 +14,7 @@ disabled_rules:
   - strict_fileprivate
   - sorted_imports
   - identifier_name # Disabled due to a lot of one symbol identifiers
+  - let_var_whitespace
   # Temporary disabled
   - explicit_type_interface
   - line_length
@@ -66,7 +67,6 @@ opt_in_rules:
   - legacy_cggeometry_functions
   - legacy_constant
   - legacy_nsgeometry_functions
-  - let_var_whitespace
   - mark
   - multiline_parameters
   - multiple_closures_with_trailing_closure

Macaw.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Source/model/draw/LinearGradient.swift

@@ -32,11 +32,11 @@ open class LinearGradient: Gradient {
         let mmax = 1 / max(abs(v[2]), abs(v[3]))
         v[2] *= mmax
         v[3] *= mmax
-        if (v[2] < 0) {
+        if v[2] < 0 {
             v[0] = -v[2]
             v[2] = 0
         }
-        if (v[3] < 0) {
+        if v[3] < 0 {
             v[1] = -v[3]
             v[3] = 0
         }

Source/render/RenderUtils.swift

@@ -367,7 +367,7 @@ class RenderUtils {
 
                 // find arc center coordinates and points angles as per
                 // http://www.w3.org/TR/SVG/implnote.html#ArcConversionEndpointToCenter
-                if (_rx == 0 || _ry == 0) {
+                if _rx == 0 || _ry == 0 {
                     L(x, y: y)
                 } else {
                     var rx = abs(_rx)
@@ -376,7 +376,7 @@ class RenderUtils {
                     let y1_ = -1 * sin(angle) * (x1 - x) / 2 + cos(angle) * (y1 - y) / 2
 
                     let rCheck = (x1_ * x1_) / (rx * rx) + (y1_ * y1_) / (ry * ry)
-                    if (rCheck > 1) {
+                    if rCheck > 1 {
                         rx = sqrt(rCheck) * rx
                         ry = sqrt(rCheck) * ry
                     }
@@ -395,14 +395,14 @@ class RenderUtils {
                     let t1 = calcAngle(ux: 1, uy: 0, vx: (x1_ - cx_) / rx, vy: (y1_ - cy_) / ry)
                     var delta = calcAngle(ux: (x1_ - cx_) / rx, uy: (y1_ - cy_) / ry, vx: (-x1_ - cx_) / rx, vy: (-y1_ - cy_) / ry)
                     let pi2 = Double.pi * 2
-                    if (delta > 0) {
+                    if delta > 0 {
                         delta = delta.truncatingRemainder(dividingBy: pi2)
-                        if (!sweep) {
+                        if !sweep {
                             delta -= pi2
                         }
-                    } else if (delta < 0) {
+                    } else if delta < 0 {
                         delta = -1 * ((-1 * delta).truncatingRemainder(dividingBy: pi2))
-                        if (sweep) {
+                        if sweep {
                             delta += pi2
                         }
                     }
@@ -417,7 +417,7 @@ class RenderUtils {
             let end = extent + CGFloat(arcAngle)
             let cx = CGFloat(x + w / 2)
             let cy = CGFloat(y + h / 2)
-            if (w == h && rotation == 0) {
+            if w == h && rotation == 0 {
                 bezierPath.addArc(withCenter: CGPoint(x: cx, y: cy), radius: CGFloat(w / 2), startAngle: extent, endAngle: end, clockwise: arcAngle >= 0)
             } else {
                 let maxSize = CGFloat(max(w, h))

Source/render/ShapeRenderer.swift

@@ -36,7 +36,7 @@ class ShapeRenderer: NodeRenderer {
             return
         }
 
-        if (shape.fill != nil || shape.stroke != nil) {
+        if shape.fill != nil || shape.stroke != nil {
             setGeometry(shape.form, ctx: ctx.cgContext!)
             drawPath(shape.fill, stroke: shape.stroke, ctx: ctx.cgContext!, opacity: opacity)
         }

Source/svg/SVGParser.swift

@@ -1328,7 +1328,7 @@ private class PathDataReader {
     }
 
     public func read() -> [PathSegment] {
-        let _ = readNext()
+        _ = readNext()
         var segments = [PathSegment]()
         while let array = readSegments() {
             segments.append(contentsOf: array)
@@ -1420,7 +1420,7 @@ private class PathDataReader {
     private func readSegmentType() -> PathSegmentType? {
         while(true) {
             if let type = getPathSegmentType() {
-                let _ = readNext()
+                _ = readNext()
                 return type
             }
             if (readNext() == nil) {