Skip to content

Commit 4d83f2b

Browse files
intitniintitni
committed
Merge branch 'release/0.33.3'
2 parents b006fa8 + de452b5 commit 4d83f2b

60 files changed

Lines changed: 1550 additions & 473 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# IDE
2+
.idea
3+
14
# Created by
25
https://www.toptal.com/developers/gitignore/api/xcode,macos,swift,swiftpackagemanager
36
# Edit at

‎CommunicationBridge/main.swift‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1+
import AppKit
12
import Foundation
23

4+
class AppDelegate: NSObject, NSApplicationDelegate {}
5+
36
let bundleIdentifierBase = Bundle(url: Bundle.main.bundleURL.appendingPathComponent(
47
"CopilotForXcodeExtensionService.app"
58
))?.object(forInfoDictionaryKey: "BUNDLE_IDENTIFIER_BASE") as? String ?? "com.intii.CopilotForXcode"
69

710
let serviceIdentifier = bundleIdentifierBase + ".CommunicationBridge"
8-
11+
let appDelegate = AppDelegate()
912
let delegate = ServiceDelegate()
1013
let listener = NSXPCListener(machServiceName: serviceIdentifier)
1114
listener.delegate = delegate
1215
listener.resume()
13-
RunLoop.main.run()
16+
let app = NSApplication.shared
17+
app.delegate = appDelegate
18+
app.run()
1419

‎Copilot for Xcode.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,7 @@
773773
CODE_SIGN_STYLE = Automatic;
774774
COMBINE_HIDPI_IMAGES = YES;
775775
CURRENT_PROJECT_VERSION = "$(APP_BUILD)";
776+
DEAD_CODE_STRIPPING = YES;
776777
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
777778
ENABLE_HARDENED_RUNTIME = YES;
778779
INFOPLIST_FILE = EditorExtension/Info.plist;
@@ -800,6 +801,7 @@
800801
CODE_SIGN_STYLE = Automatic;
801802
COMBINE_HIDPI_IMAGES = YES;
802803
CURRENT_PROJECT_VERSION = "$(APP_BUILD)";
804+
DEAD_CODE_STRIPPING = YES;
803805
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
804806
ENABLE_HARDENED_RUNTIME = YES;
805807
INFOPLIST_FILE = EditorExtension/Info.plist;
@@ -854,9 +856,11 @@
854856
CLANG_WARN_UNREACHABLE_CODE = YES;
855857
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
856858
COPY_PHASE_STRIP = NO;
859+
DEAD_CODE_STRIPPING = YES;
857860
DEBUG_INFORMATION_FORMAT = dwarf;
858861
ENABLE_STRICT_OBJC_MSGSEND = YES;
859862
ENABLE_TESTABILITY = YES;
863+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
860864
GCC_C_LANGUAGE_STANDARD = gnu11;
861865
GCC_DYNAMIC_NO_PIC = NO;
862866
GCC_NO_COMMON_BLOCKS = YES;
@@ -915,9 +919,11 @@
915919
CLANG_WARN_UNREACHABLE_CODE = YES;
916920
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
917921
COPY_PHASE_STRIP = NO;
922+
DEAD_CODE_STRIPPING = YES;
918923
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
919924
ENABLE_NS_ASSERTIONS = NO;
920925
ENABLE_STRICT_OBJC_MSGSEND = YES;
926+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
921927
GCC_C_LANGUAGE_STANDARD = gnu11;
922928
GCC_NO_COMMON_BLOCKS = YES;
923929
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -945,6 +951,7 @@
945951
CODE_SIGN_STYLE = Automatic;
946952
COMBINE_HIDPI_IMAGES = YES;
947953
CURRENT_PROJECT_VERSION = "$(APP_BUILD)";
954+
DEAD_CODE_STRIPPING = YES;
948955
DEVELOPMENT_ASSET_PATHS = "\"Copilot for Xcode/Preview Content\"";
949956
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
950957
ENABLE_HARDENED_RUNTIME = YES;
@@ -977,6 +984,7 @@
977984
CODE_SIGN_STYLE = Automatic;
978985
COMBINE_HIDPI_IMAGES = YES;
979986
CURRENT_PROJECT_VERSION = "$(APP_BUILD)";
987+
DEAD_CODE_STRIPPING = YES;
980988
DEVELOPMENT_ASSET_PATHS = "\"Copilot for Xcode/Preview Content\"";
981989
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
982990
ENABLE_HARDENED_RUNTIME = YES;
@@ -1002,6 +1010,7 @@
10021010
isa = XCBuildConfiguration;
10031011
buildSettings = {
10041012
CODE_SIGN_STYLE = Automatic;
1013+
DEAD_CODE_STRIPPING = YES;
10051014
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
10061015
ENABLE_HARDENED_RUNTIME = YES;
10071016
MACOSX_DEPLOYMENT_TARGET = 12.0;
@@ -1015,6 +1024,7 @@
10151024
isa = XCBuildConfiguration;
10161025
buildSettings = {
10171026
CODE_SIGN_STYLE = Automatic;
1027+
DEAD_CODE_STRIPPING = YES;
10181028
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
10191029
ENABLE_HARDENED_RUNTIME = YES;
10201030
MACOSX_DEPLOYMENT_TARGET = 12.0;
@@ -1033,6 +1043,7 @@
10331043
CODE_SIGN_STYLE = Automatic;
10341044
COMBINE_HIDPI_IMAGES = YES;
10351045
CURRENT_PROJECT_VERSION = "$(APP_BUILD)";
1046+
DEAD_CODE_STRIPPING = YES;
10361047
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
10371048
ENABLE_HARDENED_RUNTIME = YES;
10381049
ENABLE_PREVIEWS = YES;
@@ -1065,6 +1076,7 @@
10651076
CODE_SIGN_STYLE = Automatic;
10661077
COMBINE_HIDPI_IMAGES = YES;
10671078
CURRENT_PROJECT_VERSION = "$(APP_BUILD)";
1079+
DEAD_CODE_STRIPPING = YES;
10681080
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
10691081
ENABLE_HARDENED_RUNTIME = YES;
10701082
ENABLE_PREVIEWS = YES;

‎Copilot for Xcode.xcodeproj/xcshareddata/xcschemes/Copilot for Xcode.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1410"
3+
LastUpgradeVersion = "1520"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Copilot for Xcode.xcodeproj/xcshareddata/xcschemes/EditorExtension.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1410"
3+
LastUpgradeVersion = "1520"
44
wasCreatedForAppExtension = "YES"
55
version = "2.0">
66
<BuildAction

‎Copilot for Xcode.xcodeproj/xcshareddata/xcschemes/ExtensionService.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1420"
3+
LastUpgradeVersion = "1520"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 41 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Core/.swiftpm/xcode/xcshareddata/xcschemes/Service.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1410"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Core/.swiftpm/xcode/xcshareddata/xcschemes/SuggestionInjector.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1410"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Core/Sources/ChatGPTChatTab/Chat.swift‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ struct Chat {
6666
var isReceivingMessage = false
6767
var chatMenu = ChatMenu.State()
6868
var focusedField: Field?
69+
var isEnabled = true
70+
var isPinnedToBottom = true
6971

7072
enum Field: String, Hashable {
7173
case textField
@@ -77,13 +79,16 @@ struct Chat {
7779

7880
case appear
7981
case refresh
82+
case setIsEnabled(Bool)
8083
case sendButtonTapped
8184
case returnButtonTapped
8285
case stopRespondingButtonTapped
8386
case clearButtonTap
8487
case deleteMessageButtonTapped(MessageID)
8588
case resendMessageButtonTapped(MessageID)
8689
case setAsExtraPromptButtonTapped(MessageID)
90+
case manuallyScrolledUp
91+
case scrollToBottomButtonTapped
8792
case focusOnTextField
8893
case referenceClicked(DisplayedChatMessage.Reference)
8994

@@ -143,6 +148,10 @@ struct Chat {
143148
await send(.chatMenu(.refresh))
144149
}
145150

151+
case let .setIsEnabled(isEnabled):
152+
state.isEnabled = isEnabled
153+
return .none
154+
146155
case .sendButtonTapped:
147156
guard !state.typedMessage.isEmpty else { return .none }
148157
let message = state.typedMessage
@@ -204,6 +213,14 @@ struct Chat {
204213
await openURL(url)
205214
}
206215
}
216+
217+
case .manuallyScrolledUp:
218+
state.isPinnedToBottom = false
219+
return .none
220+
221+
case .scrollToBottomButtonTapped:
222+
state.isPinnedToBottom = true
223+
return .none
207224

208225
case .focusOnTextField:
209226
state.focusedField = .textField
@@ -365,6 +382,9 @@ struct Chat {
365382

366383
case .isReceivingMessageChanged:
367384
state.isReceivingMessage = service.isReceivingMessage
385+
if service.isReceivingMessage {
386+
state.isPinnedToBottom = true
387+
}
368388
return .none
369389

370390
case .systemPromptChanged:

0 commit comments

Comments
 (0)