floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formats Swift code.

This commit is contained in:
zonble 2022-01-18 21:16:07 +08:00
parent 1e7d4fe2b0
commit 0d80d28e0e
14 changed files with 79 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
McBopomofoTests/PreferencesTests.swift
View File

@ -144,9 +144,9 @@ class PreferencesTests: XCTestCase {
}
func testChineneConversionEngine() {
XCTAssert(Preferences.chineneConversionEngine == 0)
Preferences.chineneConversionEngine = 1
XCTAssert(Preferences.chineneConversionEngine == 1)
XCTAssert(Preferences.chineseConversionEngine == 0)
Preferences.chineseConversionEngine = 1
XCTAssert(Preferences.chineseConversionEngine == 1)
}
func testChineseConversionStyle() {

1
Packages/CandidateUI/Tests/CandidateUITests/HorizontalCandidateControllerTests.swift
View File

@ -6,6 +6,7 @@ class HorizontalCandidateControllerTests: XCTestCase {
class Mock: CandidateControllerDelegate {
let candidates = ["A", "B", "C", "D", "E", "F", "G", "H"]
var selected: String?
func candidateCountForController(_ controller: CandidateController) -> UInt {
UInt(candidates.count)
}

1
Packages/CandidateUI/Tests/CandidateUITests/VerticalCandidateControllerTests.swift
View File

@ -6,6 +6,7 @@ class VerticalCandidateControllerTests: XCTestCase {
class Mock: CandidateControllerDelegate {
let candidates = ["A", "B", "C", "D", "E", "F", "G", "H"]
var selected: String?
func candidateCountForController(_ controller: CandidateController) -> UInt {
UInt(candidates.count)
}

3
Source/AppDelegate.swift
View File

@ -51,8 +51,7 @@ struct VersionUpdateReport {
var versionDescription: String = ""
}
enum VersionUpdateApiResult
{
enum VersionUpdateApiResult {
case shouldUpdate(report: VersionUpdateReport)
case noNeedToUpdate
case ignored

2
Source/InputMethodController.mm
View File

@ -326,7 +326,7 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
return text;
}
if (Preferences.chineneConversionEngine == 1) {
if (Preferences.chineseConversionEngine == 1) {
return [VXHanConvert convertToSimplifiedFrom:text];
}
return [OpenCCBridge convertToSimplified:text];

2
Source/LanguageModelManager.mm
View File

@ -59,7 +59,7 @@ static void LTLoadLanguageModelFile(NSString *filenameWithoutExtension, McBopomo
}
NSString *text = [NSString stringWithUTF8String:input.c_str()];
if (Preferences.chineneConversionEngine == 1) {
if (Preferences.chineseConversionEngine == 1) {
text = [VXHanConvert convertToSimplifiedFrom:text];
}
else {

28
Source/Preferences.swift
View File

@ -35,9 +35,9 @@
import Cocoa
private let kKeyboardLayoutPreferenceKey = "KeyboardLayout"
private let kBasisKeyboardLayoutPreferenceKey = "BasisKeyboardLayout"; // alphanumeric ("ASCII") input basi
private let kFunctionKeyKeyboardLayoutPreferenceKey = "FunctionKeyKeyboardLayout"; // alphanumeric ("ASCII") input basi
private let kFunctionKeyKeyboardLayoutOverrideIncludeShiftKey = "FunctionKeyKeyboardLayoutOverrideIncludeShift"; // whether include shif
private let kBasisKeyboardLayoutPreferenceKey = "BasisKeyboardLayout" // alphanumeric ("ASCII") input basi
private let kFunctionKeyKeyboardLayoutPreferenceKey = "FunctionKeyKeyboardLayout" // alphanumeric ("ASCII") input basi
private let kFunctionKeyKeyboardLayoutOverrideIncludeShiftKey = "FunctionKeyKeyboardLayoutOverrideIncludeShift" // whether include shif
private let kCandidateListTextSizeKey = "CandidateListTextSize"
private let kSelectPhraseAfterCursorAsCandidatePreferenceKey = "SelectPhraseAfterCursorAsCandidate"
private let kUseHorizontalCandidateListPreferenceKey = "UseHorizontalCandidateList"
@ -79,7 +79,7 @@ struct UserDefault<Value> {
var wrappedValue: Value {
get {
return container.object(forKey: key) as? Value ?? defaultValue
container.object(forKey: key) as? Value ?? defaultValue
}
set {
container.set(newValue, forKey: key)
@ -92,7 +92,8 @@ struct CandidateListTextSize {
let key: String
let defaultValue: CGFloat = kDefaultCandidateListTextSize
lazy var container: UserDefault = {
UserDefault(key: key, defaultValue: defaultValue) }()
UserDefault(key: key, defaultValue: defaultValue)
}()
var wrappedValue: CGFloat {
mutating get {
@ -121,7 +122,8 @@ struct ComposingBufferSize {
let key: String
let defaultValue: Int = kDefaultComposingBufferSize
lazy var container: UserDefault = {
UserDefault(key: key, defaultValue: defaultValue) }()
UserDefault(key: key, defaultValue: defaultValue)
}()
var wrappedValue: Int {
mutating get {
@ -230,7 +232,7 @@ class Preferences: NSObject {
@objc static var keyboardLayout: Int
@objc static var keyboardLayoutName: String {
(KeyboardLayout(rawValue: self.keyboardLayout) ?? KeyboardLayout.standard).name
(KeyboardLayout(rawValue: keyboardLayout) ?? KeyboardLayout.standard).name
}
@UserDefault(key: kBasisKeyboardLayoutPreferenceKey, defaultValue: "com.apple.keylayout.US")
@ -270,7 +272,7 @@ class Preferences: NSObject {
@objc static func toggleHalfWidthPunctuationEnabled() -> Bool {
halfWidthPunctuationEnabled = !halfWidthPunctuationEnabled
return halfWidthPunctuationEnabled;
return halfWidthPunctuationEnabled
}
@UserDefault(key: kEscToCleanInputBufferKey, defaultValue: false)
@ -349,7 +351,7 @@ class Preferences: NSObject {
@objc static func togglePhraseReplacementEnabled() -> Bool {
phraseReplacementEnabled = !phraseReplacementEnabled
return phraseReplacementEnabled;
return phraseReplacementEnabled
}
/// The conversion engine.
@ -357,10 +359,10 @@ class Preferences: NSObject {
/// - 0: OpenCC
/// - 1: VXHanConvert
@UserDefault(key: kChineseConversionEngineKey, defaultValue: 0)
@objc static var chineneConversionEngine: Int
@objc static var chineseConversionEngine: Int
@objc static var chineneConversionEngineName: String? {
return ChineseConversionEngine(rawValue: chineneConversionEngine)?.name
@objc static var chineseConversionEngineName: String? {
ChineseConversionEngine(rawValue: chineseConversionEngine)?.name
}
/// The conversion style.
@ -371,7 +373,7 @@ class Preferences: NSObject {
@objc static var chineseConversionStyle: Int
@objc static var chineseConversionStyleName: String? {
return ChineseConversionStyle(rawValue: chineseConversionStyle)?.name
ChineseConversionStyle(rawValue: chineseConversionStyle)?.name
}
}

7
Source/PreferencesWindowController.swift
View File

@ -111,6 +111,7 @@ import Carbon
newImage.unlockFocus()
return newImage
}
menuItem.image = resize(image)
}
@ -149,11 +150,9 @@ import Carbon
do {
try Preferences.validate(candidateKeys: keys)
Preferences.candidateKeys = keys
}
catch Preferences.CandidateKeyError.empty {
} catch Preferences.CandidateKeyError.empty {
selectionKeyComboBox.stringValue = Preferences.candidateKeys
}
catch {
} catch {
if let window = window {
let alert = NSAlert(error: error)
alert.beginSheetModal(for: window) { response in