Merge branch 'main' into extensions-api

.github/pull_request_template.md

@@ -4,14 +4,16 @@
 
 # Related Issue
 
-<!--- REQUIRED: Tag all related issues (e.g. #23) -->
+<!--- REQUIRED: Tag all related issues (e.g. * #23) -->
+* #ISSUE_NUMBER
 
 # Checklist
 
 <!--- Add things that are not yet implemented above -->
 - [ ] I read and understood the [contributing guide](https://github.com/CodeEditApp/CodeEdit/blob/main/CONTRIBUTING.md) as well as the [code of conduct](https://github.com/CodeEditApp/CodeEdit/blob/main/CODE_OF_CONDUCT.md)
 - [ ] My changes generate no new warnings
 - [ ] My code builds and runs on my machine
+- [ ] I documented my code
 - [ ] Review requested
 
 # Screenshots

CodeEdit/Info.plist

@@ -45,6 +45,6 @@
 		</dict>
 	</array>
 	<key>GitHash</key>
-	<string>38a39459dd5d4aa44dd5b5379d7e3485c418f0d2</string>
+  <string>38a39459dd5d4aa44dd5b5379d7e3485c418f0d2</string>
 </dict>
 </plist>

CodeEdit/NavigatorSidebar/ProjectNavigator/OutlineView/OutlineTableViewCell.swift

@@ -16,39 +16,37 @@ class OutlineTableViewCell: NSTableCellView {
     override init(frame frameRect: NSRect) {
         super.init(frame: frameRect)
 
-        let iconHeight = frameRect.height - 2
-
         // Create the label
 
         self.label = NSTextField(frame: .zero)
         self.label.translatesAutoresizingMaskIntoConstraints = false
         self.label.drawsBackground = false
         self.label.isBordered = false
         self.label.isEditable = false
+        self.label.font = .preferredFont(forTextStyle: .subheadline)
 
         self.addSubview(label)
         self.textField = label
 
         // Create the icon
 
-        self.icon = NSImageView(frame: .init(origin: .zero, size: .zero))
+        self.icon = NSImageView(frame: .zero)
         self.icon.translatesAutoresizingMaskIntoConstraints = false
-        self.icon.symbolConfiguration = .init(pointSize: 13, weight: .regular, scale: .medium)
-        self.icon.imageScaling = .scaleProportionallyDown
+        self.icon.symbolConfiguration = .init(textStyle: .callout, scale: .medium)
 
         self.addSubview(icon)
         self.imageView = icon
 
         // Icon constraints
 
-        self.icon.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 2).isActive = true
+        self.icon.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 0).isActive = true
         self.icon.centerYAnchor.constraint(equalTo: self.centerYAnchor).isActive = true
-        self.icon.widthAnchor.constraint(equalToConstant: iconHeight).isActive = true
-        self.icon.heightAnchor.constraint(equalToConstant: iconHeight).isActive = true
+        self.icon.widthAnchor.constraint(equalToConstant: 21).isActive = true
+        self.icon.heightAnchor.constraint(equalToConstant: frameRect.height).isActive = true
 
         // Label constraints
 
-        self.label.leadingAnchor.constraint(equalTo: icon.trailingAnchor, constant: 5).isActive = true
+        self.label.leadingAnchor.constraint(equalTo: icon.trailingAnchor, constant: 2).isActive = true
         self.label.centerYAnchor.constraint(equalTo: self.centerYAnchor).isActive = true
     }
 

CodeEditModules/Modules/GitClient/Tests/GitClientTests.swift

@@ -10,6 +10,8 @@ import ShellClient
 import XCTest
 
 final class GitClientTests: XCTestCase {
+    // FIXME: Update GitClient.getCommitHistory implementation on date or this test case
+    // Currently this will fail on some non en_US locale like zh_CN
     func testHistory() throws {
         let shellClient: ShellClient = .always(
             "e5fe4bf¦Merge pull request #260 from lukepistrol/terminal-color-fix¦Luke¦Sat, 26 Mar 2022 03:28:12 +0100¦"

README.md

@@ -38,36 +38,6 @@ It might sound crazy, but it is our hope that at some point Apple adopts this pr
 
 Join our growing community of amazing contributors on [Discord](https://discord.gg/vChUXVf9Em).
 
-## To do
-
-- [x] Initial concept design
-- [x] Put starter app on GitHub
-- [x] Start a [Discord server](https://discord.gg/vChUXVf9Em) for community collaboration
-- [x] UI Framework - Navigator and Inspector Sidebars, Toolbar, Tabs, Breadcrumbs, Drawer, Statusbar
-- [x] Welcome screen
-- [x] Project navigator - Manage and edit files within a project
-- [x] Source control navigator
-- [x] Find navigator (find in project)
-- [ ] Issue navigator
-- [ ] Code symbols navigator
-- [ ] Debug navigator
-- [ ] Extension navigator
-- [ ] Extensions API
-- [ ] Extensions Store
-- [x] Text editor
-- [ ] Split editors
-- [x] Syntax highlighting
-- [ ] Find in document
-- [x] Integrated terminal
-- [x] Open quickly overlay
-- [ ] Commands overlay
-- [ ] Application Preferences
-- [ ] Project Preferences
-- [ ] File inspector
-
-...more to come!
-
-
 ## Contributing
 
 Read the [Contribution Guide](https://github.com/CodeEditApp/CodeEdit/blob/main/CONTRIBUTING.md)