Skip to content

Fixes shiftLineLeft(_:) and shiftLineRight(_:) reversed #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonbs merged 1 commit into from
Jun 27, 2022
Merged

Fixes shiftLineLeft(_:) and shiftLineRight(_:) reversed #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sources/Runestone/TextView/TextInput/IndentController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ final class IndentController {
let minimumLocation = lines[0].location
var newSelectedRange = range
for (lineIndex, line) in lines.enumerated() {
let changeInLength = shiftLineRight(line)
let changeInLength = shiftLineLeft(line)
if lineIndex == 0 {
// We don't want the selection to move to the previous line when we can't shift left anymore.
// Therefore we keep it to the minimum location, which is the location the line starts on.
Expand All @@ -78,7 +78,7 @@ final class IndentController {
let lines = lineManager.lines(in: range)
var newSelectedRange = range
for (lineIndex, line) in lines.enumerated() {
let changeInLength = shiftLineLeft(line)
let changeInLength = shiftLineRight(line)
if lineIndex == 0 {
newSelectedRange.location += changeInLength
} else {
Expand Down Expand Up @@ -142,7 +142,7 @@ final class IndentController {

extension IndentController {
@discardableResult
private func shiftLineLeft(_ line: DocumentLineNode) -> Int {
private func shiftLineRight(_ line: DocumentLineNode) -> Int {
let oldLength = line.data.totalLength
let indentString = indentStrategy.string(indentLevel: 1)
let startLocation = locationOfFirstNonWhitespaceCharacter(in: line)
Expand All @@ -152,7 +152,7 @@ extension IndentController {
}

@discardableResult
private func shiftLineRight(_ line: DocumentLineNode) -> Int {
private func shiftLineLeft(_ line: DocumentLineNode) -> Int {
let oldLength = line.data.totalLength
let indentString = indentStrategy.string(indentLevel: 1)
let indentUTF16Count = indentString.utf16.count
Expand Down