Merge tag '0.21.1' into develop

Author: intitni

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -13,7 +13,7 @@ body:
     id: before-reporting
     attributes:
       label: Before Reporting
-      description: Before reporting the bug, we suggestion that you first refer to the [FAQ](https://github.com/intitni/CopilotForXcode/issues/65) to check if it may address your issue. And search for existing issues to avoid duplication.
+      description: Before reporting the bug, we suggestion that you first refer to the [FAQ](https://github.com/intitni/CopilotForXcode/wiki/Frequently-Asked-Questions) to check if it may address your issue. And search for existing issues to avoid duplication.
       options:
         - label: I have checked FAQ, and there is no solution to my issue
           required: true
@@ -57,4 +57,4 @@ body:
     id: node-version
     attributes:
       label: Node version
-    
+    

.github/ISSUE_TEMPLATE/help_wanted.yml

@@ -7,7 +7,7 @@ body:
     id: before-reporting
     attributes:
       label: Before Reporting
-      description: Before asking for help, we suggestion that you first refer to the [FAQ](https://github.com/intitni/CopilotForXcode/issues/65) to check if it may address your issue. And search for existing issues to avoid duplication.
+      description: Before asking for help, we suggestion that you first refer to the [FAQ](https://github.com/intitni/CopilotForXcode/wiki/Frequently-Asked-Questions) to check if it may address your issue. And search for existing issues to avoid duplication.
       options:
         - label: I have checked FAQ, and there is no solution to my issue
           required: true

.github/workflows/close_inactive_issues.yml

@@ -15,7 +15,7 @@ jobs:
           days-before-issue-stale: 30
           days-before-issue-close: 14
           stale-issue-label: "stale"
-          exempt-issue-labels: "low priority, help wanted"
+          exempt-issue-labels: "low priority, help wanted, planned"
           stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
           close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
           days-before-pr-stale: -1

Core/Package.swift

@@ -269,7 +269,7 @@ let package = Package(
             name: "PlusFeatureFlag",
             dependencies: [
             ].pro([
-                "LicenseManagement"
+                "LicenseManagement",
             ])
         ),
 
@@ -398,10 +398,18 @@ import Foundation
 
 func isProIncluded(file: StaticString = #file) -> Bool {
     let filePath = "\(file)"
-    let url = URL(fileURLWithPath: filePath)
+    let fileURL = URL(fileURLWithPath: filePath)
+    let rootURL = fileURL
         .deletingLastPathComponent()
         .deletingLastPathComponent()
-        .appendingPathComponent("Pro/Package.swift")
-    return FileManager.default.fileExists(atPath: url.path)
+    let folderURL = rootURL.appendingPathComponent("Pro")
+    if !FileManager.default.fileExists(atPath: folderURL.path) {
+        return false
+    }
+    let packageManifestURL = folderURL.appendingPathComponent("Package.swift")
+    if !FileManager.default.fileExists(atPath: packageManifestURL.path) {
+        return false
+    }
+    return true
 }
 

README.md

@@ -23,13 +23,13 @@ Copilot for Xcode is an Xcode Source Editor Extension that provides GitHub Copil
   - [Install](#install)
   - [Enable the Extension](#enable-the-extension)
   - [Granting Permissions to the App](#granting-permissions-to-the-app)
+  - [Setting Up Key Bindings](#setting-up-key-bindings)
   - [Setting Up GitHub Copilot](#setting-up-github-copilot)
   - [Setting Up Codeium](#setting-up-codeium)
   - [Setting Up OpenAI API Key](#setting-up-openai-api-key)
   - [Managing `CopilotForXcodeExtensionService.app`](#managing-copilotforxcodeextensionserviceapp)
 - [Update](#update)
 - [Feature](#feature)
-- [Key Bindings](#key-bindings)
 - [Plus Features](#plus-features)
 - [Limitations](#limitations)
 - [License](#license)
@@ -97,6 +97,27 @@ Alternatively, you may manually grant the required permissions by navigating to
 
 If you encounter an alert requesting permission that you have previously granted, please remove the permission from the list and add it again to re-grant the necessary permissions.
 
+### Setting Up Key Bindings
+
+The extension will work better if you use key bindings.
+
+It looks like there is no way to add default key bindings to commands, but you can set them up in `Xcode settings > Key Bindings`. You can filter the list by typing `copilot` in the search bar.
+
+A [recommended setup](https://github.com/intitni/CopilotForXcode/issues/14) that should cause no conflict is
+
+| Command             | Key Binding |
+| ------------------- | ----------- |
+| Accept Suggestions  | `⌥}`        |
+| Reject Suggestion   | `⌥{`        |
+| Next Suggestion     | `⌥>`        |
+| Previous Suggestion | `⌥<`        |
+| Open Chat           | `⌥"`        |
+| Explain Selection   | `⌥\|`       |
+
+Essentially using `⌥⇧` as the "access" key combination for all bindings.
+
+Another convenient method to access commands is by using the `⇧⌘/` shortcut to search for a command in the menu bar.
+
 ### Setting Up GitHub Copilot
 
 1. In the host app, switch to the service tab and click on GitHub Copilot to access your GitHub Copilot account settings.
@@ -281,26 +302,6 @@ For Send Message, Single Round Dialog and Custom Chat commands, you can use the
 | `{{active_editor_file_url}}`  | The URL of the active file in the editor.      |
 | `{{active_editor_file_name}}` | The name of the active file in the editor.     |
 
-## Key Bindings
-
-It looks like there is no way to add default key bindings to commands, but you can set them up in `Xcode settings > Key Bindings`. You can filter the list by typing `copilot` in the search bar.
-
-A [recommended setup](https://github.com/intitni/CopilotForXcode/issues/14) that should cause no conflict is
-
-| Command             | Key Binding |
-| ------------------- | ----------- |
-| Get Suggestions     | `⌥?`        |
-| Accept Suggestions  | `⌥}`        |
-| Reject Suggestion   | `⌥{`        |
-| Next Suggestion     | `⌥>`        |
-| Previous Suggestion | `⌥<`        |
-| Open Chat           | `⌥"`        |
-| Explain Selection   | `⌥\|`       |
-
-Essentially using `⌥⇧` as the "access" key combination for all bindings.
-
-Another convenient method to access commands is by using the `⇧⌘/` shortcut to search for a command in the menu bar.
-
 ## Plus Features
 
 The pre-built binary contains a set of exclusive features that can only be accessed with a Plus license key. To obtain a license key, please visit [this link](https://intii.lemonsqueezy.com/checkout/buy/298a8d4c-11fb-4ecd-b328-049589645449).

Version.xcconfig

@@ -1,2 +1,2 @@
-APP_VERSION = 0.21.0
-APP_BUILD = 220
+APP_VERSION = 0.21.1
+APP_BUILD = 221

appcast.xml

@@ -3,6 +3,18 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+    <item>
+      <title>0.21.1</title>
+      <pubDate>Sun, 13 Aug 2023 17:02:38 +0800</pubDate>
+      <sparkle:version>221</sparkle:version>
+      <sparkle:shortVersionString>0.21.1</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.21.1
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.21.1/Copilot.for.Xcode.app.zip" length="31114478" type="application/octet-stream" sparkle:edSignature="5sy6qTLc/NidIemMn2jftJKPMlXNJWbqhghXDzLvk2j9zsBI6xtoG6xIWBYBtBtwoQcZZtG4cwn2VDl5c5YGBw=="/>
+    </item>
+
     <item>
       <title>0.21.0</title>
       <pubDate>Wed, 09 Aug 2023 15:45:24 +0800</pubDate>