Renames ConsiderateLineNavigationLocationFactory to StatefulLineNavigationLocationFactory

simonbs · simonbs · commit 5f1c0a478925 · 2023-02-09T08:14:57.000+01:00
diff --git a/Sources/Runestone/TextView/Navigation/NavigationLocationFactories/StatefulLineNavigationLocationFactory.swift b/Sources/Runestone/TextView/Navigation/NavigationLocationFactories/StatefulLineNavigationLocationFactory.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-final class ConsiderateLineNavigationLocationFactory {
+final class StatefulLineNavigationLocationFactory {
     private struct MoveOperation {
         let location: Int
         let offset: DirectionedOffset
@@ -68,15 +68,15 @@ final class ConsiderateLineNavigationLocationFactory {
     }
 }
 
-private extension ConsiderateLineNavigationLocationFactory {
+private extension StatefulLineNavigationLocationFactory {
     private func operation(movingFrom location: Int, byLineCount offset: Int, inDirection direction: TextDirection) -> MoveOperation {
         let directionedOffset = DirectionedOffset(offset: offset, inDirection: direction)
         let destinationLocation = lineNavigationLocationFactory.location(movingFrom: location, byLineCount: offset, inDirection: direction)
         return MoveOperation(location: location, offset: directionedOffset, destinationLocation: destinationLocation)
     }
 }
 
-extension ConsiderateLineNavigationLocationFactory.DirectionedOffset {
+extension StatefulLineNavigationLocationFactory.DirectionedOffset {
     static func +(lhs: Self, rhs: Self) -> Self {
         Self(rawValue: lhs.rawValue + rhs.rawValue)
     }
diff --git a/Sources/Runestone/TextView/Navigation/NavigationService.swift b/Sources/Runestone/TextView/Navigation/NavigationService.swift
@@ -20,13 +20,13 @@ final class NavigationService {
     private var wordNavigationLocationService: WordNavigationLocationFactory {
         WordNavigationLocationFactory(stringTokenizer: stringTokenizer)
     }
-    private var lineNavigationLocationService: ConsiderateLineNavigationLocationFactory
+    private var lineNavigationLocationService: StatefulLineNavigationLocationFactory
 
     init(stringView: StringView, lineManager: LineManager, lineControllerStorage: LineControllerStorage) {
         self.stringView = stringView
         self.lineManager = lineManager
         self.lineControllerStorage = lineControllerStorage
-        self.lineNavigationLocationService = ConsiderateLineNavigationLocationFactory(
+        self.lineNavigationLocationService = StatefulLineNavigationLocationFactory(
             lineManager: lineManager,
             lineControllerStorage: lineControllerStorage
         )
diff --git a/Sources/Runestone/TextView/Navigation/SelectionService.swift b/Sources/Runestone/TextView/Navigation/SelectionService.swift
@@ -24,13 +24,13 @@ final class SelectionService {
     private var wordNavigationLocationService: WordNavigationLocationFactory {
         WordNavigationLocationFactory(stringTokenizer: stringTokenizer)
     }
-    private let lineNavigationLocationService: ConsiderateLineNavigationLocationFactory
+    private let lineNavigationLocationService: StatefulLineNavigationLocationFactory
 
     init(stringView: StringView, lineManager: LineManager, lineControllerStorage: LineControllerStorage) {
         self.stringView = stringView
         self.lineManager = lineManager
         self.lineControllerStorage = lineControllerStorage
-        self.lineNavigationLocationService = ConsiderateLineNavigationLocationFactory(
+        self.lineNavigationLocationService = StatefulLineNavigationLocationFactory(
             lineManager: lineManager,
             lineControllerStorage: lineControllerStorage
         )

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import Foundation`
`2`	`2`
`3`		`-final class ConsiderateLineNavigationLocationFactory {`
	`3`	`+final class StatefulLineNavigationLocationFactory {`
`4`	`4`	`private struct MoveOperation {`
`5`	`5`	`let location: Int`
`6`	`6`	`let offset: DirectionedOffset`
`@@ -68,15 +68,15 @@ final class ConsiderateLineNavigationLocationFactory {`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`-private extension ConsiderateLineNavigationLocationFactory {`
	`71`	`+private extension StatefulLineNavigationLocationFactory {`
`72`	`72`	`private func operation(movingFrom location: Int, byLineCount offset: Int, inDirection direction: TextDirection) -> MoveOperation {`
`73`	`73`	`let directionedOffset = DirectionedOffset(offset: offset, inDirection: direction)`
`74`	`74`	`let destinationLocation = lineNavigationLocationFactory.location(movingFrom: location, byLineCount: offset, inDirection: direction)`
`75`	`75`	`return MoveOperation(location: location, offset: directionedOffset, destinationLocation: destinationLocation)`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`-extension ConsiderateLineNavigationLocationFactory.DirectionedOffset {`
	`79`	`+extension StatefulLineNavigationLocationFactory.DirectionedOffset {`
`80`	`80`	`static func +(lhs: Self, rhs: Self) -> Self {`
`81`	`81`	`Self(rawValue: lhs.rawValue + rhs.rawValue)`
`82`	`82`	`}`