Skip to content

Commit 2e8680e

Browse files
cyanzhongcyanzhong
committed
nit-picking
1 parent 60e5a85 commit 2e8680e

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

‎MarkEdit.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
84FB00F02C6C4AED00850E94 /* MarkEditWritingTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84FB00EF2C6C4AED00850E94 /* MarkEditWritingTools.swift */; };
10+
84FB00F02C6C4AED00850E94 /* AppWritingTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84FB00EF2C6C4AED00850E94 /* AppWritingTools.swift */; };
1111
8701D0A42CC12321006AF8C2 /* FileVersion in Frameworks */ = {isa = PBXBuildFile; productRef = 8701D0A32CC12321006AF8C2 /* FileVersion */; };
1212
87067E2729755D5C0052E795 /* EditorStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87067E2629755D5C0052E795 /* EditorStatusView.swift */; };
1313
87091B9A2A963C6B00F5EF0D /* EditorTextInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87091B992A963C6B00F5EF0D /* EditorTextInput.swift */; };
@@ -145,7 +145,7 @@
145145
/* End PBXCopyFilesBuildPhase section */
146146

147147
/* Begin PBXFileReference section */
148-
84FB00EF2C6C4AED00850E94 /* MarkEditWritingTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkEditWritingTools.swift; sourceTree = "<group>"; };
148+
84FB00EF2C6C4AED00850E94 /* AppWritingTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppWritingTools.swift; sourceTree = "<group>"; };
149149
87067E2629755D5C0052E795 /* EditorStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorStatusView.swift; sourceTree = "<group>"; };
150150
87091B992A963C6B00F5EF0D /* EditorTextInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorTextInput.swift; sourceTree = "<group>"; };
151151
8709C69D29B4412F009EABB5 /* AssistantSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssistantSettingsView.swift; sourceTree = "<group>"; };
@@ -456,7 +456,7 @@
456456
87BEF30029A88F6800596E17 /* AppCustomization.swift */,
457457
8769BABD2C65F9D400EDA0A6 /* AppRuntimeConfig.swift */,
458458
87BB5A292E929BA700A17C14 /* AppExceptionCatcher.swift */,
459-
84FB00EF2C6C4AED00850E94 /* MarkEditWritingTools.swift */,
459+
84FB00EF2C6C4AED00850E94 /* AppWritingTools.swift */,
460460
);
461461
path = Main;
462462
sourceTree = "<group>";
@@ -805,7 +805,7 @@
805805
87AAEE0229585ADC00C8E61C /* AppPreferences.swift in Sources */,
806806
8723B46929C0A6EA0013D5D5 /* EvaluateJavaScriptIntent.swift in Sources */,
807807
873126E4297BAC9C001521A0 /* EditorViewController+Pandoc.swift in Sources */,
808-
84FB00F02C6C4AED00850E94 /* MarkEditWritingTools.swift in Sources */,
808+
84FB00F02C6C4AED00850E94 /* AppWritingTools.swift in Sources */,
809809
87D9322E2A925C6700B20D84 /* EditorReplaceTextField.swift in Sources */,
810810
877B965D2C63815000186414 /* AppHotKeys.swift in Sources */,
811811
87091B9A2A963C6B00F5EF0D /* EditorTextInput.swift in Sources */,

‎MarkEditMac/Sources/Editor/Controllers/EditorViewController+UI.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ extension EditorViewController {
209209
// Work around undo stack and selection range issues
210210
self.bridge.writingTools.setActive(
211211
isActive: isActive,
212-
reselect: MarkEditWritingTools.shouldReselect(with: MarkEditWritingTools.requestedTool)
212+
reselect: AppWritingTools.shouldReselect(with: AppWritingTools.requestedTool)
213213
)
214214

215215
// Invisible rendering doesn't work well with Writing Tools, temporarily disable it for now

‎MarkEditMac/Sources/Editor/Models/EditorToolbarItems.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extension NSToolbarItem {
1616

1717
// Special icon for Writing Tools
1818
if #available(macOS 15.1, *), identifier == .writingTools {
19-
item.image = MarkEditWritingTools.affordanceIcon ?? item.image
19+
item.image = AppWritingTools.affordanceIcon ?? item.image
2020
}
2121

2222
if let menu {

MarkEditMac/Sources/Main/MarkEditWritingTools.swift renamed to MarkEditMac/Sources/Main/AppWritingTools.swift

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// MarkEditWritingTools.swift
2+
// AppWritingTools.swift
33
// MarkEditMac
44
//
55
// Created by cyan on 8/14/24.
@@ -23,11 +23,10 @@ enum WritingTool: Int {
2323
}
2424

2525
@available(macOS 15.1, *)
26-
enum MarkEditWritingTools {
26+
enum AppWritingTools {
2727
static var requestedTool: WritingTool {
2828
for window in NSApp.windows {
29-
guard let controller = window.contentViewController,
30-
controller.className == "WTWritingToolsViewController" else {
29+
guard let controller = window.contentViewController, controller.className == "WTWritingToolsViewController" else {
3130
continue
3231
}
3332

@@ -39,11 +38,12 @@ enum MarkEditWritingTools {
3938
return controller
4039
}
4140

42-
let impl = unsafeBitCast(
41+
let invocation = unsafeBitCast(
4342
controller.method(for: configSelector),
4443
to: (@convention(c) (NSObject, Selector) -> NSObject?).self
4544
)
46-
return impl(controller, configSelector) ?? controller
45+
46+
return invocation(controller, configSelector) ?? controller
4747
}()
4848

4949
let toolSelector = sel_getUid("requestedTool")
@@ -52,24 +52,27 @@ enum MarkEditWritingTools {
5252
return .panel
5353
}
5454

55-
let impl = unsafeBitCast(
55+
let invocation = unsafeBitCast(
5656
target.method(for: toolSelector),
5757
to: (@convention(c) (NSObject, Selector) -> Int).self
5858
)
5959

60-
return WritingTool(rawValue: impl(target, toolSelector)) ?? .panel
60+
return WritingTool(rawValue: invocation(target, toolSelector)) ?? .panel
6161
}
6262

6363
return .panel
6464
}
6565

6666
static var affordanceIcon: NSImage? {
67-
let configuration = NSImage.SymbolConfiguration(pointSize: 12.5, weight: .medium)
68-
let symbolImage = NSImage(systemSymbolName: "apple.writing.tools", accessibilityDescription: nil)
69-
?? NSImage(systemSymbolName: "_gm", accessibilityDescription: nil)
67+
let configuration = NSImage.SymbolConfiguration(
68+
pointSize: 12.5,
69+
weight: .medium
70+
)
7071

71-
if let symbolImage {
72-
return symbolImage.withSymbolConfiguration(configuration)
72+
for symbolName in ["apple.writing.tools", "_gm"] {
73+
if let symbolImage = NSImage(systemSymbolName: symbolName, accessibilityDescription: nil) {
74+
return symbolImage.withSymbolConfiguration(configuration)
75+
}
7376
}
7477

7578
guard let affordanceClass = NSClassFromString("WTAffordanceView") as? NSView.Type else {
@@ -103,7 +106,7 @@ enum MarkEditWritingTools {
103106
// MARK: - Private
104107

105108
@available(macOS 15.1, *)
106-
private extension MarkEditWritingTools {
109+
private extension AppWritingTools {
107110
static var writingToolsInstance: NSObject? {
108111
guard let cls = NSClassFromString("WTWritingTools") else {
109112
assertionFailure("Failed to get WTWritingTools class")
@@ -116,12 +119,12 @@ private extension MarkEditWritingTools {
116119
return nil
117120
}
118121

119-
let impl = unsafeBitCast(
122+
let invocation = unsafeBitCast(
120123
method_getImplementation(classMethod),
121124
to: (@convention(c) (AnyObject, Selector) -> NSObject?).self
122125
)
123-
let instance = impl(cls as AnyObject, selector)
124126

127+
let instance = invocation(cls as AnyObject, selector)
125128
assert(instance != nil, "Failed to get WTWritingTools instance")
126129
return instance
127130
}

‎MarkEditMac/Sources/Main/Application/Application.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ final class Application: NSApplication {
4646
Logger.assert(sender is NSMenuItem, "Invalid sender was found")
4747
Logger.assert(target == nil || (target as? AnyObject)?.className == "WKMenuTarget", "Invalid target was found")
4848

49-
if MarkEditWritingTools.shouldReselect(withItem: sender) {
49+
if AppWritingTools.shouldReselect(withItem: sender) {
5050
ensureWritingToolsSelectionRect()
5151
}
5252

0 commit comments

Comments
 (0)