Skip to content
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

Jump to bottom

Mark Autosave Changes Immediately #1865

Merged
merged 1 commit into from
Aug 31, 2024
Merged

Mark Autosave Changes Immediately #1865

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions CodeEdit/Features/Documents/CodeFileDocument/CodeFileDocument.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import CodeEditSourceEditor
import CodeEditTextView
import CodeEditLanguages
import Combine
import OSLog

enum CodeFileError: Error {
case failedToDecode
Expand All @@ -26,6 +27,8 @@ final class CodeFileDocument: NSDocument, ObservableObject {
let cursorPositions: [CursorPosition]
}

static let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "", category: "CodeFileDocument")

/// The text content of the document, stored as a text storage
///
/// This is intentionally not a `@Published` variable. If it were published, SwiftUI would do a string
Expand Down Expand Up @@ -121,6 +124,7 @@ final class CodeFileDocument: NSDocument, ObservableObject {

override func data(ofType _: String) throws -> Data {
guard let sourceEncoding, let data = (content?.string as NSString?)?.data(using: sourceEncoding.nsValue) else {
Self.logger.error("Failed to encode contents to \(self.sourceEncoding.debugDescription)")
throw CodeFileError.failedToEncode
}
return data
Expand All @@ -143,6 +147,8 @@ final class CodeFileDocument: NSDocument, ObservableObject {
if let validEncoding = FileEncoding(rawEncoding), let nsString {
self.sourceEncoding = validEncoding
self.content = NSTextStorage(string: nsString as String)
} else {
Self.logger.error("Failed to read file from data using encoding: \(rawEncoding)")
}
}

Expand Down
17 changes: 15 additions & 2 deletions CodeEdit/Features/Editor/Views/CodeFileView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,23 @@ struct CodeFileView: View {
codeFile
.contentCoordinator
.textUpdatePublisher
.debounce(for: 1.0, scheduler: DispatchQueue.main)
.sink { _ in
codeFile.updateChangeCount(.changeDone)
codeFile.autosave(withImplicitCancellability: false) { _ in }
}
.store(in: &cancellables)

codeFile
.contentCoordinator
.textUpdatePublisher
.debounce(for: 1.0, scheduler: DispatchQueue.main)
.sink { _ in
codeFile.autosave(withImplicitCancellability: false) { error in
if let error {
CodeFileDocument.logger.error("Failed to autosave document, error: \(error)")
} else {
codeFile.updateChangeCount(.changeCleared)
}
}
}
.store(in: &cancellables)

Expand Down
Loading