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 incompatible chars pane message

Browse Source
This commit is contained in:
1024jp 2022-03-30 10:08:27 +09:00
parent 241e21a8ec
commit c33adc808e
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -2,6 +2,15 @@
Change Log
==========================
4.1.5 (unreleased)
--------------------------
### Fixes
- Fix an issue that the incompatible character pane did not show the message “No incompatible characters were found.” when all of the existing incompatible characters are cleared.
4.1.4 (485)
--------------------------

23
CotEditor/Sources/IncompatibleCharactersViewController.swift
View File

@ -9,7 +9,7 @@
// ---------------------------------------------------------------------------
//
// © 2004-2007 nakamuxu
// © 2014-2020 1024jp
// © 2014-2022 1024jp
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -104,14 +104,8 @@ final class IncompatibleCharactersViewController: NSViewController {
.sink { [weak self] in self?.didUpdateIncompatibleCharacters($0) }
.store(in: &self.scannerObservers)
scanner.$isScanning
.map { $0
? "Scanning incompatible characters…".localized
: scanner.incompatibleCharacters.isEmpty
? "No incompatible characters were found.".localized
: nil
}
.receive(on: DispatchQueue.main)
.sink { [weak self] in self?.message = $0 }
.sink { [weak self] in self?.updateMessage(isScanning: $0) }
.store(in: &self.scannerObservers)
}
}
@ -143,7 +137,7 @@ final class IncompatibleCharactersViewController: NSViewController {
// MARK: Private Methods
private func didUpdateIncompatibleCharacters(_ incompatibleCharacters: [IncompatibleCharacter]) {
@MainActor private func didUpdateIncompatibleCharacters(_ incompatibleCharacters: [IncompatibleCharacter]) {
guard let document = self.document else { return }
@ -153,10 +147,21 @@ final class IncompatibleCharactersViewController: NSViewController {
self.incompatibleCharacters = incompatibleCharacters
self.updateMessage(isScanning: false)
document.textStorage.markup(ranges: incompatibleCharacters.map(\.range),
lineEnding: document.lineEnding)
}
/// Update the state message on the table.
@MainActor private func updateMessage(isScanning: Bool) {
self.message = isScanning ? "Scanning incompatible characters…".localized
: (self.incompatibleCharacters.isEmpty
? "No incompatible characters were found.".localized
: nil)
}
}