Minor bug fixes.

Author: objecthub

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.4 (2021-05-12)
+- Minor bug fixes
+- Migrated project to Xcode 12.5
+
 ## 0.3.3 (2020-10-04)
 - Ported code to Swift 5.3
 - Migrated project to Xcode 12.0

Sources/CommandLineKit/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.3</string>
+	<string>0.3.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018-2020 Google LLC</string>
+	<string>Copyright © 2018-2021 Google LLC</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Sources/CommandLineKit/LineReader.swift

@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 07/04/2018.
-//  Copyright © 2018-2019 Google LLC
+//  Copyright © 2018-2021 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
@@ -95,6 +95,12 @@ public class LineReader {
   }
 
   public static func supportedBy(terminal: String) -> Bool {
+    #if os(macOS)
+    if let xpcServiceName = ProcessInfo.processInfo.environment["XPC_SERVICE_NAME"],
+       xpcServiceName.localizedCaseInsensitiveContains("com.apple.dt.xcode") {
+      return false
+    }
+    #endif
     switch terminal {
       case "", "xcode", "dumb", "cons25", "emacs":
         return false

Sources/CommandLineKit/LineReaderHistory.swift

@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 07/04/2018.
-//  Copyright © 2018-2019 Google LLC
+//  Copyright © 2018-2021 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
@@ -67,6 +67,7 @@ class LineReaderHistory {
     // Don't add a duplicate if the last item is equal to this one
     if let lastItem = history.last {
       if lastItem == item {
+        index = history.endIndex
         return
       }
     }

Tests/CommandLineKitTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.3</string>
+	<string>0.3.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>