coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 11:25:57 +03:00
Code Issues Projects Releases Wiki Activity

Fix file encoding undoing

Browse Source
This commit is contained in:
1024jp 2023-02-19 07:55:08 +01:00
parent d3153ecb6b
commit 6e68094c2c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -25,7 +25,7 @@ Change Log
### Fixes
- Fix an issue that all URL links removed when the document was updated by an external process.
- Fix the redo action label for line endings conversion.
- Fix the redo action label for the line endings conversion and file encoding change.

13
CotEditor/Sources/Document.swift
View File

@ -851,7 +851,7 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingHolder {
/// - Parameters:
/// - fileEncoding: The file encoding to change with.
/// - lossy: Whether the change is lossy.
/// - Throws: `EncodingError` (Kind.lossyConversion) can be thrown but only if `lossy` flag is `true`.
/// - Throws: `EncodingError` (Kind.lossyConversion) can be thrown but only if `lossy` flag is `false`.
func changeEncoding(to fileEncoding: FileEncoding, lossy: Bool) throws {
assert(Thread.isMainThread)
@ -865,8 +865,13 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingHolder {
// register undo
if let undoManager = self.undoManager {
undoManager.registerUndo(withTarget: self) { [currentFileEncoding = self.fileEncoding] target in
try? target.changeEncoding(to: currentFileEncoding, lossy: lossy)
undoManager.registerUndo(withTarget: self) { [currentFileEncoding = self.fileEncoding, shouldSaveEncodingXattr = self.shouldSaveEncodingXattr] target in
target.fileEncoding = currentFileEncoding
target.shouldSaveEncodingXattr = shouldSaveEncodingXattr
target.incompatibleCharacterScanner.invalidate()
// register redo
target.undoManager?.registerUndo(withTarget: target) { try? $0.changeEncoding(to: fileEncoding, lossy: lossy) }
}
undoManager.setActionName(String(localized: "Encoding to “\(fileEncoding.localizedName)”"))
}
@ -896,6 +901,8 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingHolder {
undoManager.registerUndo(withTarget: self) { [currentLineEnding = self.lineEnding, string = self.textStorage.string] target in
target.replaceContent(with: string)
target.lineEnding = currentLineEnding
// register redo
target.undoManager?.registerUndo(withTarget: target) { $0.changeLineEnding(to: lineEnding)
}
}