diff --git a/EditorExtension/Application/Base.lproj/Main.storyboard b/EditorExtension/Application/Base.lproj/Main.storyboard
index c50b894b..9e0d0589 100644
--- a/EditorExtension/Application/Base.lproj/Main.storyboard
+++ b/EditorExtension/Application/Base.lproj/Main.storyboard
@@ -417,21 +417,24 @@
-
+
+
+
+
-
-
+
+
-
+
-
+
-
+
@@ -444,12 +447,12 @@
-
+
-
+
@@ -477,11 +480,11 @@
-
+
-
+
@@ -506,11 +509,11 @@
-
+
-
+
@@ -527,11 +530,11 @@
-
+
-
+
@@ -557,6 +560,7 @@
+
@@ -584,10 +588,13 @@
+
+
+
diff --git a/EditorExtension/Application/Source/RulesViewController.swift b/EditorExtension/Application/Source/RulesViewController.swift
index 9c5c0930..aff90991 100644
--- a/EditorExtension/Application/Source/RulesViewController.swift
+++ b/EditorExtension/Application/Source/RulesViewController.swift
@@ -189,25 +189,40 @@ extension RulesViewController: NSTableViewDelegate {
func tableView(_ tableView: NSTableView, viewFor _: NSTableColumn?, row: Int) -> NSView? {
let model = self.model(forRow: row)
let id: NSUserInterfaceItemIdentifier
- let backgroundColor: NSColor
switch model {
case .binary:
id = .binarySelectionTableCellView
- let gray: CGFloat = 0.97
- backgroundColor = NSColor(calibratedRed: gray, green: gray, blue: gray, alpha: gray)
case .list:
id = .listSelectionTableCellView
- backgroundColor = NSColor.white
case .freeText:
id = .freeTextTableCellView
- backgroundColor = NSColor.white
}
- let cell = tableView.makeView(withIdentifier: id, owner: self)
- cell?.wantsLayer = true
+ return tableView.makeView(withIdentifier: id, owner: self)
+ }
- cell?.layer?.backgroundColor = backgroundColor.cgColor
+ func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? {
+ if let rowView = tableView.makeView(withIdentifier: .ruleRowView, owner: self) as? NSTableRowView {
+ return rowView
+ }
- return cell
+ let rowView = NSTableRowView(frame: .zero)
+ rowView.identifier = .ruleRowView
+ return rowView
+ }
+
+ func tableView(_ tableView: NSTableView, didAdd rowView: NSTableRowView, forRow row: Int) {
+ switch self.model(forRow: row) {
+ case .binary:
+ rowView.backgroundColor = NSColor.controlAlternatingRowBackgroundColors[1]
+ case .list, .freeText:
+ rowView.backgroundColor = NSColor.controlAlternatingRowBackgroundColors[0]
+ }
}
}
+
+private extension NSUserInterfaceItemIdentifier {
+ static let ruleRowView = NSUserInterfaceItemIdentifier(rawValue: "RuleRowView")
+}
+
+
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib
index a544fb47..0c6d9666 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib
index 0a90d91a..0b7e1c7e 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib
index ea163145..264add33 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib
index 95ff6df2..c0235a81 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib
index 8bc4ec15..ee146e14 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib
index 45e5ce1e..51e5aba8 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib
index c3cbc6df..a182a378 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib
index e07fe622..9de9577a 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib
index 24e15aa0..66a5acdc 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib
index f76e7749..4735444f 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib
index e79b0841..ee8f7b6e 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib
index 84915cc5..23513757 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib
index daded945..2b3f8926 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib
index 4a94c63a..92394407 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib
index c45b2971..cceff861 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
index 4d4a03f6..427629e9 100644
--- a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
+++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
@@ -3,7 +3,7 @@
BuildMachineOSBuild
- 18D109
+ 17G5019
CFBundleDevelopmentRegion
en
CFBundleDocumentTypes
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode b/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode
index 46ada55b..72d57566 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode and b/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist
index 51f4195a..416304fb 100644
--- a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist
+++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist
@@ -3,7 +3,7 @@
BuildMachineOSBuild
- 18D109
+ 17G5019
CFBundleDevelopmentRegion
en
CFBundleExecutable
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat
index d9ddbcfe..44bf11e8 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat and b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib
index 9fd1ff16..35d8dc1e 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist
index 1b1be873..7604c5d7 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib
index 3bb05bf1..29d2aebd 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib
index 640e3fc6..4639fe58 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib
index ef33fe97..d472fa8b 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib
index 59e473a1..2dd2a86d 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources
index 74db7ba0..9feb4d58 100644
--- a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources
+++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources
@@ -6,27 +6,27 @@
Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib
- 3q565H/pkgLf+QmdBd0b+r9SbLc=
+ u4vEDh8epEK5Xs9pO0IHXjkLo+0=
Resources/Base.lproj/Main.storyboardc/Info.plist
- J6aTA410qqG4Z/zeAOpt92gA+hs=
+ BLKpc5YKNxtfFAkk/yuEL+ef0VE=
Resources/Base.lproj/Main.storyboardc/MainMenu.nib
- fX8oHEFMCpSdmghXy9qtK1OIXUc=
+ V0q3O0kWQH5upcH14/N7oSEUiZQ=
Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib
- pamMPdzsWMcvczXyxMnQnMkU3Mw=
+ +NmGgDatmhXJgXeak4nibJgU47c=
Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib
- abf/Tby6xfd5BwR29r6hUoSc63w=
+ 5OXFQrYDgQAwBX7o+xnPoUXvkmE=
Resources/Base.lproj/Main.storyboardc/RulesViewController.nib
- zPUrr8qYNVs17vhpXBPsNu6XFdk=
+ qlqMKaVVOg12pBE9C5WYMIATkPU=
Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib
@@ -178,7 +178,7 @@
cdhash
- tGXckxeAS0PdMm9XJGcSJ+Z/ciM=
+ hIBVQKitdwGl5MLs0esbnsxGNtE=
requirement
anchor apple generic and identifier "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "8VQKF583ED")
@@ -187,66 +187,66 @@
hash
- 3q565H/pkgLf+QmdBd0b+r9SbLc=
+ u4vEDh8epEK5Xs9pO0IHXjkLo+0=
hash2
- TsrZ810bFAT7ZQwvswVAvvCduHaTXg+Ko6Y0EZ5n+VU=
+ 1iq3aVEzldlu58kNDzixl0wRFJvRUjFFI4NxKCfmCR4=
Resources/Base.lproj/Main.storyboardc/Info.plist
hash
- J6aTA410qqG4Z/zeAOpt92gA+hs=
+ BLKpc5YKNxtfFAkk/yuEL+ef0VE=
hash2
- y7VWDod2aXdam6rgaruX+ugBaKa4m6lxqsBF+Op/F/s=
+ nibw/0KY/znqe7c3sIodZM+9rJFTpTqDoW08l/ns+9g=
Resources/Base.lproj/Main.storyboardc/MainMenu.nib
hash
- fX8oHEFMCpSdmghXy9qtK1OIXUc=
+ V0q3O0kWQH5upcH14/N7oSEUiZQ=
hash2
- FVBAJlQchx93JI4rmMAT/2UUUHtfJgwivGo0AZicyRw=
+ Enjxn5KkmtVa6wZVjfVwXCxNMzefnNe0PHUyLDEsmRE=
Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib
hash
- pamMPdzsWMcvczXyxMnQnMkU3Mw=
+ +NmGgDatmhXJgXeak4nibJgU47c=
hash2
- YA4SALqi0RL3w1dBKl+TGSqBNnXJ4oUlrVqI0JK/VBE=
+ tkNu5WxL/lxV8POOtM8b2N5Y/KHkPfAiBSzhrEvwxeo=
Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib
hash
- abf/Tby6xfd5BwR29r6hUoSc63w=
+ 5OXFQrYDgQAwBX7o+xnPoUXvkmE=
hash2
- T/SboJxUI72KMjzwIMppL2cOdvDIUNuUrvJLjXUi3XY=
+ 2qmjvLuG86WycFbTrjfVTOZCu69SsljzOBJ6aFxyghA=
Resources/Base.lproj/Main.storyboardc/RulesViewController.nib
hash
- zPUrr8qYNVs17vhpXBPsNu6XFdk=
+ qlqMKaVVOg12pBE9C5WYMIATkPU=
hash2
- aLBWIkZ05hBjU8SPduXnGllbGaQBjk66/ohSMdgGtIE=
+ Z+/9r6a0y9DN3CXyBtPYB7Dloz9fYqayE/VbHvmpxQs=
Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib