Skip to content

Commit db8e0a9

Browse files
thecoolwinterthecoolwinter
committed
Merge branch 'main' into feat/lsp-semantic-highlighter
2 parents e70149f + 0e12166 commit db8e0a9

File tree

3 files changed

+115
-28
lines changed

3 files changed

+115
-28
lines changed

‎CodeEdit.xcodeproj/project.pbxproj

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
6C6BD70129CD172700235D17 /* ExtensionsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C6BD70029CD172700235D17 /* ExtensionsListView.swift */; };
432432
6C6BD70429CD17B600235D17 /* ExtensionsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C6BD70329CD17B600235D17 /* ExtensionsManager.swift */; };
433433
6C7256D729A3D7D000C2D3E0 /* SplitViewControllerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7256D629A3D7D000C2D3E0 /* SplitViewControllerView.swift */; };
434+
6C73A6D32D4F1E550012D95C /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */; };
434435
6C7D6D462C9092EC00B69EE0 /* BufferingServerConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7D6D452C9092EC00B69EE0 /* BufferingServerConnection.swift */; };
435436
6C7F37FE2A3EA6FA00217B83 /* View+focusedValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7F37FD2A3EA6FA00217B83 /* View+focusedValue.swift */; };
436437
6C81916729B3E80700B75C92 /* ModifierKeysObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C81916629B3E80700B75C92 /* ModifierKeysObserver.swift */; };
@@ -451,9 +452,9 @@
451452
6C9AE66F2D148DD200FAE8D2 /* URL+FindWorkspace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AE66E2D148DD200FAE8D2 /* URL+FindWorkspace.swift */; };
452453
6C9AE6712D14A9F700FAE8D2 /* LazyServiceWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AE6702D14A9F700FAE8D2 /* LazyServiceWrapper.swift */; };
453454
6C9AE6962D1DD71500FAE8D2 /* SemanticTokenHighlightProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AE6952D1DD71500FAE8D2 /* SemanticTokenHighlightProvider.swift */; };
454-
6C9AE6992D1DD84600FAE8D2 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C9AE6982D1DD84600FAE8D2 /* CodeEditSourceEditor */; };
455455
6C9AE69B2D1DF80300FAE8D2 /* GenericSemanticTokenStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AE69A2D1DF80300FAE8D2 /* GenericSemanticTokenStorage.swift */; };
456456
6C9AE69D2D1DF84300FAE8D2 /* SemanticTokenStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AE69C2D1DF84300FAE8D2 /* SemanticTokenStorage.swift */; };
457+
6C9DB9E42D55656300ACD86E /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */; };
457458
6CA1AE952B46950000378EAB /* EditorInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA1AE942B46950000378EAB /* EditorInstance.swift */; };
458459
6CAAF68A29BC9C2300A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
459460
6CAAF69229BCC71C00A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
@@ -1385,7 +1386,7 @@
13851386
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */,
13861387
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */,
13871388
6CB94D032CA1205100E8651C /* AsyncAlgorithms in Frameworks */,
1388-
6C5246742D1E612700F57F11 /* CodeEditSourceEditor in Frameworks */,
1389+
6C9DB9E42D55656300ACD86E /* CodeEditSourceEditor in Frameworks */,
13891390
);
13901391
runOnlyForDeploymentPostprocessing = 0;
13911392
};
@@ -3976,6 +3977,7 @@
39763977
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
39773978
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
39783979
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
3980+
6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
39793981
);
39803982
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
39813983
projectDirPath = "";
@@ -5900,6 +5902,14 @@
59005902
minimumVersion = 1.2.0;
59015903
};
59025904
};
5905+
6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */ = {
5906+
isa = XCRemoteSwiftPackageReference;
5907+
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
5908+
requirement = {
5909+
kind = upToNextMajorVersion;
5910+
minimumVersion = 0.10.0;
5911+
};
5912+
};
59035913
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */ = {
59045914
isa = XCRemoteSwiftPackageReference;
59055915
repositoryURL = "https://github.com/apple/swift-async-algorithms.git";
@@ -5973,6 +5983,10 @@
59735983
isa = XCSwiftPackageProductDependency;
59745984
productName = CodeEditKit;
59755985
};
5986+
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */ = {
5987+
isa = XCSwiftPackageProductDependency;
5988+
productName = CodeEditSourceEditor;
5989+
};
59765990
6C7B1C752A1D57CE005CBBFC /* SwiftLint */ = {
59775991
isa = XCSwiftPackageProductDependency;
59785992
package = 287136B1292A407E00E9F5F4 /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */;
@@ -5993,8 +6007,9 @@
59936007
package = 6C85BB422C210EFD00EB5DEF /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
59946008
productName = SwiftUIIntrospect;
59956009
};
5996-
6C9AE6982D1DD84600FAE8D2 /* CodeEditSourceEditor */ = {
6010+
6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */ = {
59976011
isa = XCSwiftPackageProductDependency;
6012+
package = 6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */;
59986013
productName = CodeEditSourceEditor;
59996014
};
60006015
6CB4463F2B6DFF3A00539ED0 /* CodeEditSourceEditor */ = {

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

Lines changed: 73 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 24 additions & 24 deletions
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)