Skip to content

Commit 7232f23

Browse files
intitniintitni
committed
Merge branch 'merging-codeium-chat' into develop
2 parents f2ee768 + cb61dc7 commit 7232f23

36 files changed

+1027
-314
lines changed

‎.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

‎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/ChatGPTChatTab.swift‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ public class ChatGPTChatTab: ChatTab {
7676
return (try? JSONEncoder().encode(state)) ?? Data()
7777
}
7878

79-
public static func restore(
80-
from data: Data,
81-
externalDependency: Void
82-
) async throws -> any ChatTabBuilder {
79+
public static func restore(from data: Data) async throws -> any ChatTabBuilder {
8380
let state = try JSONDecoder().decode(RestorableState.self, from: data)
8481
let builder = Builder(title: "Chat") { @MainActor tab in
8582
tab.service.configuration.overriding = state.configuration
@@ -96,7 +93,7 @@ public class ChatGPTChatTab: ChatTab {
9693
return builder
9794
}
9895

99-
public static func chatBuilders(externalDependency: Void) -> [ChatTabBuilder] {
96+
public static func chatBuilders() -> [ChatTabBuilder] {
10097
let customCommands = UserDefaults.shared.value(for: \.customCommands).compactMap {
10198
command in
10299
if case .customChat = command.feature {

‎Core/Sources/HostApp/FeatureSettings/Chat/ChatSettingsGeneralSectionView.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,16 @@ struct ChatSettingsGeneralSectionView: View {
6565
Text("Open chat panel").tag(mode)
6666
case .browser:
6767
Text("Open web page in browser").tag(mode)
68+
case .codeiumChat:
69+
Text("Open Codeium chat tab (beta)").tag(mode)
6870
}
6971
}
7072
}
7173

7274
if settings.openChatMode == .browser {
7375
TextField(
7476
"Chat web page URL",
75-
text: $settings.openChatInBrowserURL,
77+
text: $settings.openChatInBrowserURL,
7678
prompt: Text("https://")
7779
)
7880
.textFieldStyle(.roundedBorder)

0 commit comments

Comments
 (0)