Fix swiftlint issues

Catrobat · Oct 16, 2024 · d43d6f0 · d43d6f0
1 parent af6fbcf
commit d43d6f0
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 48 deletions.
diff --git a/src/Catty/DataModel/Bricks/Plot/StartPlotBrick.swift b/src/Catty/DataModel/Bricks/Plot/StartPlotBrick.swift
@@ -45,7 +45,7 @@ import Foundation
     override func brickCell() -> BrickCellProtocol.Type! {
         StartPlotBrickCell.self as BrickCellProtocol.Type //TODO
     }
-    
+
     override func isDisabledForBackground() -> Bool {
         true
     }

diff --git a/src/Catty/DataModel/Configuration/PenConfiguration.swift b/src/Catty/DataModel/Configuration/PenConfiguration.swift
@@ -23,7 +23,7 @@
 struct PenConfiguration {
     var penDown = false
     var isCut = false
-    
+
     static let sizeConversionFactor = CGFloat(0.634)
 
     private(set) var size: CGFloat
@@ -41,9 +41,9 @@ struct PenConfiguration {
     var color = SpriteKitDefines.defaultPenColor
     var previousPositions = SynchronizedArray<CGPoint>()
     var previousPositionLines = SynchronizedArray<SynchronizedArray<CGPoint>>()
-    
+
     var previousCutPositions = SynchronizedArray<CGPoint>()
-    var drawnCutPoints = 0;
+    var drawnCutPoints = 0
     var previousCutPositionLines = SynchronizedArray<SynchronizedArray<CGPoint>>()
 
     init(projectWidth: CGFloat?, projectHeight: CGFloat?) {

diff --git a/src/Catty/Extension&Delegate&Protocol/Extensions/SpriteNode/CBSpriteNodePenExtension.swift b/src/Catty/Extension&Delegate&Protocol/Extensions/SpriteNode/CBSpriteNodePenExtension.swift
@@ -23,24 +23,24 @@
 extension CBSpriteNode {
 
     @objc func drawPenLine() {
-        for (_, positionLine) in self.penConfiguration.previousPositionLines.enumerated()
-        {
+        //swiftlint:disable:next unused_enumerated
+        for (_, positionLine) in self.penConfiguration.previousPositionLines.enumerated() {
             drawLineFromConfiguration(with: positionLine, mode: false)
         }
         self.penConfiguration.previousPositionLines.removeAll()
         if self.penConfiguration.previousPositions.last != self.position && penConfiguration.penDown {
             self.penConfiguration.previousPositions.append(self.position)
         }
         let positions = self.penConfiguration.previousPositions
-        drawLineFromConfiguration(with: positions , mode: false)
+        drawLineFromConfiguration(with: positions, mode: false)
         if positions.count > 1 {
             self.penConfiguration.previousPositions.removeSubrange(0..<positions.count - 1)
         }
     }
-    
+
     @objc func drawPlotLine() {
-        for (_, cutPositionLine) in self.penConfiguration.previousCutPositionLines.enumerated()
-        {
+        //swiftlint:disable:next unused_enumerated
+        for (_, cutPositionLine) in self.penConfiguration.previousCutPositionLines.enumerated() {
             drawLineFromConfiguration(with: cutPositionLine, mode: false)
         }
         if self.penConfiguration.previousCutPositions.last != self.position && penConfiguration.isCut {
@@ -49,17 +49,16 @@ extension CBSpriteNode {
         drawLineFromConfiguration(with: self.penConfiguration.previousCutPositions, mode: false, start: self.penConfiguration.drawnCutPoints - 1)
         self.penConfiguration.drawnCutPoints = self.penConfiguration.previousCutPositions.count
     }
-
-    private func drawLineFromConfiguration(with positions:SynchronizedArray<CGPoint>, mode dashed:Bool, start startIndex : Int = 0){
-
+
+    private func drawLineFromConfiguration(with positions: SynchronizedArray<CGPoint>, mode dashed: Bool, start startIndex: Int = 0) {
         let positionCount = positions.count
         if positionCount > 1 {
             for (index, point) in positions.enumerated() where index > startIndex && index > 0 {
                 guard let lineFrom = positions[index - 1] else {
                     fatalError("This should never happen")
                 }
                 let lineTo = point
-                if dashed{
+                if dashed {
                     self.addDashedLine(from: lineFrom, to: lineTo, withColor: penConfiguration.color, withSize: penConfiguration.size)
                 } else {
                     self.addLine(from: lineFrom, to: lineTo, withColor: penConfiguration.color, withSize: penConfiguration.size)
@@ -74,9 +73,10 @@ extension CBSpriteNode {
         line.strokeColor = color
         line.lineWidth = size
         line.zPosition = SpriteKitDefines.defaultPenZPosition
-        
+
         self.scene?.addChild(line)
     }
+
     private func addDashedLine(from startPoint: CGPoint, to endPoint: CGPoint, withColor color: UIColor, withSize size: CGFloat) {
         let line = DashedLineShapeNode(pathStartPoint: startPoint, pathEndPoint: endPoint)
         line.name = SpriteKitDefines.penShapeNodeName

diff --git a/src/Catty/Extension&Delegate&Protocol/Extensions/UIColorExtension.swift b/src/Catty/Extension&Delegate&Protocol/Extensions/UIColorExtension.swift
@@ -302,11 +302,11 @@ extension UIColor {
     static var eventBrickStroke: UIColor {
         UIColor(red: 241.0 / 255.0, green: 167.0 / 255.0, blue: 126.0 / 255.0, alpha: 1.0)
     }
-    
+
     static var plotBrick: UIColor {
         UIColor(red: 145.0 / 255.0, green: 13.0 / 255.0, blue: 6.0 / 255.0, alpha: 1.0)
     }
-    
+
     static var plotBrickStroke: UIColor {
         UIColor(red: 117.0 / 255.0, green: 7.0 / 255.0, blue: 1.0 / 255.0, alpha: 1.0)
     }

diff --git a/src/Catty/PlayerEngine/DataModel/DashedLineShapeNode.swift b/src/Catty/PlayerEngine/DataModel/DashedLineShapeNode.swift
@@ -29,13 +29,13 @@ class DashedLineShapeNode: SKShapeNode {
         self.pathEndPoint = pathEndPoint
 
         super.init()
-        let pattern : [CGFloat] = [10.0, 10.0]
+        let pattern: [CGFloat] = [10.0, 10.0]
 
         let path = CGMutablePath()
         path.move(to: pathStartPoint)
         path.addLine(to: pathEndPoint)
         let dashed = path.copy(dashingWithPhase: 1, lengths: pattern)
-        
+
         self.path = dashed
     }
 

diff --git a/src/Catty/PlayerEngine/Instructions/Pen/PenUpBrick+Instruction.swift b/src/Catty/PlayerEngine/Instructions/Pen/PenUpBrick+Instruction.swift
@@ -33,7 +33,7 @@ extension PenUpBrick: CBInstructionProtocol {
 
         return {
             spriteNode.penConfiguration.previousPositionLines.append(spriteNode.penConfiguration.previousPositions)
-            spriteNode.penConfiguration.previousPositions = SynchronizedArray<CGPoint>();
+            spriteNode.penConfiguration.previousPositions = SynchronizedArray<CGPoint>()
             spriteNode.penConfiguration.penDown = false
         }
     }

diff --git a/src/Catty/SavePlotSVGBrick+Instructions.swift b/src/Catty/SavePlotSVGBrick+Instructions.swift
@@ -36,53 +36,54 @@ extension SavePlotSVGBrick: CBInstructionProtocol {
             if let number = Double(filename) {
                 filename = number.displayString
             }
+
             var paths = ""
-            for i in 0..<spriteNode.penConfiguration.previousCutPositionLines.count
-            {
-                paths = paths + self.getLinePath(with: spriteNode.penConfiguration.previousCutPositionLines[i]!) + "\n"
+            //swiftlint:disable:next unused_enumerated
+            for (_, previousCutPositionLine) in spriteNode.penConfiguration.previousCutPositionLines.enumerated() {
+                paths += self.getLinePath(with: previousCutPositionLine) + "\n"
             }
-            paths = paths + self.getLinePath(with: spriteNode.penConfiguration.previousCutPositions)
-        
+            paths += self.getLinePath(with: spriteNode.penConfiguration.previousCutPositions)
+
             self.saveSVGPlot(with: paths, to: filename, width: Int(object.scene.width() ?? "0") ?? 0, height: Int(object.scene.height() ?? "0") ?? 0)
         }
     }
-    
+
     private func getDocumentsDirectory() -> URL {
         let paths = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
         return paths[0]
     }
-    
-    private func saveSVGPlot(with paths: String, to filename:String, width : Int, height : Int){
+
+    private func saveSVGPlot(with paths: String, to filename: String, width: Int, height: Int) {
         var filecontent = "<?xml version=\"1.0\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"
-        filecontent += "<svg width=\"" + String(width) + "\" height=\"" + String(height) + "\" viewBox=\"0 0 " + String(width) + " " + String(height) + "\" style=\"background-color:#ffffff\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n"
+        filecontent += "<svg width=\"" + String(width) + "\" height=\"" + String(height) + "\" viewBox=\"0 0 " + String(width) + " " + String(height) + "\""
+        filecontent += " style=\"background-color:#ffffff\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n"
         filecontent += "<title>Plotter export</title>\n"
         var filename = filename
-        
+
         filecontent += paths
         filecontent += "\n</svg>"
-
-
-        if(!filename.hasSuffix(".svg")){
-            filename = filename + ".svg"
+
+        if !filename.hasSuffix(".svg") {
+            filename += ".svg"
         }
         let file = self.getDocumentsDirectory().appendingPathComponent(filename)
         try? filecontent.write(to: file, atomically: true, encoding: String.Encoding.utf8)
     }
-    
-    private func getLinePath(with positions:SynchronizedArray<CGPoint>) -> String{
+
+    private func getLinePath(with positions: SynchronizedArray<CGPoint>) -> String {
         var path = ""
-        
+
         let positionCount = positions.count
         if positionCount > 1 {
             path = "<path fill=\"none\" style=\"stroke:rgb(0,0,0);stroke-width:1;stroke-linecap:round;stroke-opacity:1;\" d=\"M"
             let startpoint = String(format: "%.2f", positions[0]?.x ?? 0) + " " + String(format: "%.2f", positions[0]?.y ?? 0)
-            
+
             path += startpoint
             for (index, point) in positions.enumerated() where index > 0 {
                 guard positions[index - 1] != nil else {
                     fatalError("This should never happen")
                 }
-                path = path + " L" + String(format: "%.2f", point.x) + " " + String(format: "%.2f", point.y) 
+                path = path + " L" + String(format: "%.2f", point.x) + " " + String(format: "%.2f", point.y)
             }
             path += "\" />"
         }

diff --git a/src/Catty/Setup/CatrobatSetup+Bricks.swift b/src/Catty/Setup/CatrobatSetup+Bricks.swift
@@ -131,8 +131,7 @@
             // plot brick
             StartPlotBrick(),
             StopPlotBrick(),
-            SavePlotSVGBrick(),
-            //SetWidth()
+            SavePlotSVGBrick()
         ]
 
         if isPhiroEnabled() {
@@ -170,7 +169,7 @@
                           color: UIColor.eventBrick,
                           strokeColor: UIColor.eventBrickStroke,
                           enabled: true),
-            
+
             BrickCategory(type: kBrickCategoryType.plotBrick,
                           name: kLocalizedCategoryPlot,
                           color: UIColor.plotBrick,

diff --git a/src/Catty/StopPlotBrick+Instructions.swift b/src/Catty/StopPlotBrick+Instructions.swift
@@ -33,7 +33,7 @@ extension StopPlotBrick: CBInstructionProtocol {
 
         return {
             spriteNode.penConfiguration.previousCutPositionLines.append(spriteNode.penConfiguration.previousCutPositions)
-            spriteNode.penConfiguration.previousCutPositions = SynchronizedArray<CGPoint>();
+            spriteNode.penConfiguration.previousCutPositions = SynchronizedArray<CGPoint>()
             spriteNode.penConfiguration.isCut = false
             spriteNode.penConfiguration.drawnCutPoints = 0
         }

diff --git a/src/CattyTests/Bricks/StopPlotBrickTests.swift b/src/CattyTests/Bricks/StopPlotBrickTests.swift
@@ -33,7 +33,7 @@ final class StopPlotBrickTests: XCTestCase {
         let spriteNode = CBSpriteNode(spriteObject: object)
         object.spriteNode = spriteNode
         spriteNode.penConfiguration.isCut = true
-        
+
         let script = Script()
         script.object = object
 

diff --git a/src/CattyTests/Stage/CBSpriteNodePenExtensionTests.swift b/src/CattyTests/Stage/CBSpriteNodePenExtensionTests.swift
@@ -96,8 +96,8 @@ final class CBSpriteNodePenExtensionTests: XCTestCase {
         XCTAssertEqual(allShapeNodes.count, 2)
         XCTAssertEqual(allShapeNodes[1].pathStartPoint, CGPoint(x: 1, y: 1))
         XCTAssertEqual(allShapeNodes[1].pathEndPoint, spriteNode.position)
-    }    
-    
+    }
+
     func testWhenSpritePositionChangedStartPlot() {
         spriteNode.penConfiguration.isCut = true
         spriteNode.penConfiguration.previousCutPositions.append(initialPosition)
@@ -127,7 +127,7 @@ final class CBSpriteNodePenExtensionTests: XCTestCase {
         XCTAssertEqual(allShapeNodes[1].pathStartPoint, CGPoint(x: 1, y: 1))
         XCTAssertEqual(allShapeNodes[1].pathEndPoint, spriteNode.position)
     }
-    
+
     func testWhenSpritePositionChangedStopPlot() {
         spriteNode.penConfiguration.isCut = false
         spriteNode.position = CGPoint(x: 1, y: 1)
@@ -170,7 +170,7 @@ final class CBSpriteNodePenExtensionTests: XCTestCase {
 
         XCTAssertEqual(stage.children.count, 1)
     }
-    
+
     func testWhenSpritePositionNotChangedStopPlot() {
         spriteNode.penConfiguration.isCut = false
         spriteNode.position = initialPosition