Skip to content

Commit 0e12166

Browse files
thecoolwinterthecoolwinter
authored
[chore]: Update CodeEditSourceEditor to 0.10.0 (#1980)
1 parent f24981a commit 0e12166

File tree

3 files changed

+53
-46
lines changed

3 files changed

+53
-46
lines changed

‎CodeEdit.xcodeproj/project.pbxproj

+24-17
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@
355355
66F370342BEE537B00D3B823 /* NonTextFileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66F370332BEE537B00D3B823 /* NonTextFileView.swift */; };
356356
6C049A372A49E2DB00D42923 /* DirectoryEventStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C049A362A49E2DB00D42923 /* DirectoryEventStream.swift */; };
357357
6C05A8AF284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C05A8AE284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift */; };
358-
6C05CF9E2CDE8699006AAECD /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C05CF9D2CDE8699006AAECD /* CodeEditSourceEditor */; };
359358
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0617D52BDB4432008C9C42 /* LogStream */; };
360359
6C07383B2D284ECA0025CBE3 /* TasksMenuUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C07383A2D284ECA0025CBE3 /* TasksMenuUITests.swift */; };
361360
6C08249C2C556F7400A0751E /* TerminalCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C08249B2C556F7400A0751E /* TerminalCache.swift */; };
@@ -428,6 +427,7 @@
428427
6C6BD70129CD172700235D17 /* ExtensionsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C6BD70029CD172700235D17 /* ExtensionsListView.swift */; };
429428
6C6BD70429CD17B600235D17 /* ExtensionsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C6BD70329CD17B600235D17 /* ExtensionsManager.swift */; };
430429
6C7256D729A3D7D000C2D3E0 /* SplitViewControllerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7256D629A3D7D000C2D3E0 /* SplitViewControllerView.swift */; };
430+
6C73A6D32D4F1E550012D95C /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */; };
431431
6C7D6D462C9092EC00B69EE0 /* BufferingServerConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7D6D452C9092EC00B69EE0 /* BufferingServerConnection.swift */; };
432432
6C7F37FE2A3EA6FA00217B83 /* View+focusedValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7F37FD2A3EA6FA00217B83 /* View+focusedValue.swift */; };
433433
6C81916729B3E80700B75C92 /* ModifierKeysObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C81916629B3E80700B75C92 /* ModifierKeysObserver.swift */; };
@@ -447,6 +447,7 @@
447447
6C97EBCC2978760400302F95 /* AcknowledgementsWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C97EBCB2978760400302F95 /* AcknowledgementsWindowController.swift */; };
448448
6C9AE66F2D148DD200FAE8D2 /* URL+FindWorkspace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AE66E2D148DD200FAE8D2 /* URL+FindWorkspace.swift */; };
449449
6C9AE6712D14A9F700FAE8D2 /* LazyServiceWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AE6702D14A9F700FAE8D2 /* LazyServiceWrapper.swift */; };
450+
6C9DB9E42D55656300ACD86E /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */; };
450451
6CA1AE952B46950000378EAB /* EditorInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA1AE942B46950000378EAB /* EditorInstance.swift */; };
451452
6CAAF68A29BC9C2300A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
452453
6CAAF69229BCC71C00A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
@@ -1365,13 +1366,14 @@
13651366
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */,
13661367
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */,
13671368
6CB446402B6DFF3A00539ED0 /* CodeEditSourceEditor in Frameworks */,
1368-
6C05CF9E2CDE8699006AAECD /* CodeEditSourceEditor in Frameworks */,
1369+
6C73A6D32D4F1E550012D95C /* CodeEditSourceEditor in Frameworks */,
13691370
2816F594280CF50500DD548B /* CodeEditSymbols in Frameworks */,
13701371
30CB64942C16CA9100CC8A9E /* LanguageClient in Frameworks */,
13711372
6C6BD6F829CD14D100235D17 /* CodeEditKit in Frameworks */,
13721373
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */,
13731374
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */,
13741375
6CB94D032CA1205100E8651C /* AsyncAlgorithms in Frameworks */,
1376+
6C9DB9E42D55656300ACD86E /* CodeEditSourceEditor in Frameworks */,
13751377
);
13761378
runOnlyForDeploymentPostprocessing = 0;
13771379
};
@@ -3825,7 +3827,8 @@
38253827
6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */,
38263828
6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
38273829
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
3828-
6C05CF9D2CDE8699006AAECD /* CodeEditSourceEditor */,
3830+
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */,
3831+
6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */,
38293832
);
38303833
productName = CodeEdit;
38313834
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -3923,7 +3926,7 @@
39233926
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
39243927
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
39253928
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
3926-
6C05CF9C2CDE8699006AAECD /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
3929+
6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
39273930
);
39283931
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
39293932
projectDirPath = "";
@@ -5786,14 +5789,6 @@
57865789
version = 2.3.0;
57875790
};
57885791
};
5789-
6C05CF9C2CDE8699006AAECD /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */ = {
5790-
isa = XCRemoteSwiftPackageReference;
5791-
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
5792-
requirement = {
5793-
kind = upToNextMajorVersion;
5794-
minimumVersion = 0.9.1;
5795-
};
5796-
};
57975792
6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */ = {
57985793
isa = XCRemoteSwiftPackageReference;
57995794
repositoryURL = "https://github.com/Wouter01/LogStream";
@@ -5850,6 +5845,14 @@
58505845
minimumVersion = 1.2.0;
58515846
};
58525847
};
5848+
6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */ = {
5849+
isa = XCRemoteSwiftPackageReference;
5850+
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
5851+
requirement = {
5852+
kind = upToNextMajorVersion;
5853+
minimumVersion = 0.10.0;
5854+
};
5855+
};
58535856
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */ = {
58545857
isa = XCRemoteSwiftPackageReference;
58555858
repositoryURL = "https://github.com/apple/swift-async-algorithms.git";
@@ -5886,11 +5889,6 @@
58865889
package = 58F2EB1C292FB954004A9BDE /* XCRemoteSwiftPackageReference "Sparkle" */;
58875890
productName = Sparkle;
58885891
};
5889-
6C05CF9D2CDE8699006AAECD /* CodeEditSourceEditor */ = {
5890-
isa = XCSwiftPackageProductDependency;
5891-
package = 6C05CF9C2CDE8699006AAECD /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */;
5892-
productName = CodeEditSourceEditor;
5893-
};
58945892
6C0617D52BDB4432008C9C42 /* LogStream */ = {
58955893
isa = XCSwiftPackageProductDependency;
58965894
package = 6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */;
@@ -5924,6 +5922,10 @@
59245922
isa = XCSwiftPackageProductDependency;
59255923
productName = CodeEditKit;
59265924
};
5925+
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */ = {
5926+
isa = XCSwiftPackageProductDependency;
5927+
productName = CodeEditSourceEditor;
5928+
};
59275929
6C7B1C752A1D57CE005CBBFC /* SwiftLint */ = {
59285930
isa = XCSwiftPackageProductDependency;
59295931
package = 287136B1292A407E00E9F5F4 /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */;
@@ -5944,6 +5946,11 @@
59445946
package = 6C85BB422C210EFD00EB5DEF /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
59455947
productName = SwiftUIIntrospect;
59465948
};
5949+
6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */ = {
5950+
isa = XCSwiftPackageProductDependency;
5951+
package = 6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */;
5952+
productName = CodeEditSourceEditor;
5953+
};
59475954
6CB4463F2B6DFF3A00539ED0 /* CodeEditSourceEditor */ = {
59485955
isa = XCSwiftPackageProductDependency;
59495956
productName = CodeEditSourceEditor;

‎CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "ac57a6899925c3e4ac6d43aed791c845c6fc24a4441b6a10297a207d951b7836",
2+
"originHash" : "aef43d6aa0c467418565c574c33495a50d6e24057eb350c17704ab4ae2aead6c",
33
"pins" : [
44
{
55
"identity" : "anycodable",
@@ -33,8 +33,8 @@
3333
"kind" : "remoteSourceControl",
3434
"location" : "https://github.com/CodeEditApp/CodeEditSourceEditor",
3535
"state" : {
36-
"revision" : "b0688fa59fb8060840fb013afb4d6e6a96000f14",
37-
"version" : "0.9.1"
36+
"revision" : "6b2c945501f0a5c15d8aa6d159fb2550c391bdd0",
37+
"version" : "0.10.0"
3838
}
3939
},
4040
{
@@ -51,8 +51,8 @@
5151
"kind" : "remoteSourceControl",
5252
"location" : "https://github.com/CodeEditApp/CodeEditTextView.git",
5353
"state" : {
54-
"revision" : "509d7b2e86460e8ec15b0dd5410cbc8e8c05940f",
55-
"version" : "0.7.7"
54+
"revision" : "1792167c751b6668b4743600d2cf73d2829dd18a",
55+
"version" : "0.7.9"
5656
}
5757
},
5858
{

‎CodeEdit/Features/Settings/Pages/ThemeSettings/Models/Theme.swift

+24-24
Original file line numberDiff line numberDiff line change
@@ -176,41 +176,41 @@ extension Theme {
176176
var editorTheme: EditorTheme {
177177
get {
178178
.init(
179-
text: text.nsColor,
179+
text: .init(color: text.nsColor),
180180
insertionPoint: insertionPoint.nsColor,
181-
invisibles: invisibles.nsColor,
181+
invisibles: .init(color: invisibles.nsColor),
182182
background: background.nsColor,
183183
lineHighlight: lineHighlight.nsColor,
184184
selection: selection.nsColor,
185-
keywords: keywords.nsColor,
186-
commands: commands.nsColor,
187-
types: types.nsColor,
188-
attributes: attributes.nsColor,
189-
variables: variables.nsColor,
190-
values: values.nsColor,
191-
numbers: numbers.nsColor,
192-
strings: strings.nsColor,
193-
characters: characters.nsColor,
194-
comments: comments.nsColor
185+
keywords: .init(color: keywords.nsColor),
186+
commands: .init(color: commands.nsColor),
187+
types: .init(color: types.nsColor),
188+
attributes: .init(color: attributes.nsColor),
189+
variables: .init(color: variables.nsColor),
190+
values: .init(color: values.nsColor),
191+
numbers: .init(color: numbers.nsColor),
192+
strings: .init(color: strings.nsColor),
193+
characters: .init(color: characters.nsColor),
194+
comments: .init(color: comments.nsColor)
195195
)
196196
}
197197
set {
198-
self.text.nsColor = newValue.text
198+
self.text.nsColor = newValue.text.color
199199
self.insertionPoint.nsColor = newValue.insertionPoint
200-
self.invisibles.nsColor = newValue.invisibles
200+
self.invisibles.nsColor = newValue.invisibles.color
201201
self.background.nsColor = newValue.background
202202
self.lineHighlight.nsColor = newValue.lineHighlight
203203
self.selection.nsColor = newValue.selection
204-
self.keywords.nsColor = newValue.keywords
205-
self.commands.nsColor = newValue.commands
206-
self.types.nsColor = newValue.types
207-
self.attributes.nsColor = newValue.attributes
208-
self.variables.nsColor = newValue.variables
209-
self.values.nsColor = newValue.values
210-
self.numbers.nsColor = newValue.numbers
211-
self.strings.nsColor = newValue.strings
212-
self.characters.nsColor = newValue.characters
213-
self.comments.nsColor = newValue.comments
204+
self.keywords.nsColor = newValue.keywords.color
205+
self.commands.nsColor = newValue.commands.color
206+
self.types.nsColor = newValue.types.color
207+
self.attributes.nsColor = newValue.attributes.color
208+
self.variables.nsColor = newValue.variables.color
209+
self.values.nsColor = newValue.values.color
210+
self.numbers.nsColor = newValue.numbers.color
211+
self.strings.nsColor = newValue.strings.color
212+
self.characters.nsColor = newValue.characters.color
213+
self.comments.nsColor = newValue.comments.color
214214
}
215215
}
216216

0 commit comments

Comments
 (0)