Skip to content

Commit 4cb1182

Browse files
thecoolwinterthecoolwinter
committed
Merge branch 'main' into itembox
2 parents 3d3bf1d + 688dc84 commit 4cb1182

28 files changed

+868
-859
lines changed

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0824A02C5C0C9700A0751E /* SwiftTerm */; };
2424
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 6C147C4429A329350089B630 /* OrderedCollections */; };
2525
6C315FC82E05E33D0011BFC5 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C315FC72E05E33D0011BFC5 /* CodeEditSourceEditor */; };
26-
6C4E37FC2C73E00700AEE7B5 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */; };
2726
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = 6C66C31229D05CDC00DE9ED2 /* GRDB */; };
2827
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C6BD6F329CD142C00235D17 /* CollectionConcurrencyKit */; };
2928
6C6BD6F829CD14D100235D17 /* CodeEditKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C6BD6F729CD14D100235D17 /* CodeEditKit */; };
@@ -42,6 +41,8 @@
4241
6CB94D032CA1205100E8651C /* AsyncAlgorithms in Frameworks */ = {isa = PBXBuildFile; productRef = 6CB94D022CA1205100E8651C /* AsyncAlgorithms */; };
4342
6CC00A8B2CBEF150004E8134 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */; };
4443
6CC17B4F2C432AE000834E2C /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CC17B4E2C432AE000834E2C /* CodeEditSourceEditor */; };
44+
6CCF6DD32E26D48F00B94F75 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6CCF6DD22E26D48F00B94F75 /* SwiftTerm */; };
45+
6CCF73D02E26DE3200B94F75 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6CCF73CF2E26DE3200B94F75 /* SwiftTerm */; };
4546
6CD3CA552C8B508200D83DCD /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */; };
4647
6CE21E872C650D2C0031B056 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6CE21E862C650D2C0031B056 /* SwiftTerm */; };
4748
B6FF04782B6C08AC002C2C78 /* DefaultThemes in Resources */ = {isa = PBXBuildFile; fileRef = B6FF04772B6C08AC002C2C78 /* DefaultThemes */; };
@@ -176,14 +177,15 @@
176177
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */,
177178
6CE21E872C650D2C0031B056 /* SwiftTerm in Frameworks */,
178179
6C76D6D42E15B91E00EF52C3 /* CodeEditSourceEditor in Frameworks */,
180+
6CCF73D02E26DE3200B94F75 /* SwiftTerm in Frameworks */,
179181
6C315FC82E05E33D0011BFC5 /* CodeEditSourceEditor in Frameworks */,
180182
6CC00A8B2CBEF150004E8134 /* CodeEditSourceEditor in Frameworks */,
181183
6CD3CA552C8B508200D83DCD /* CodeEditSourceEditor in Frameworks */,
182184
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */,
183-
6CC17B4F2C432AE000834E2C /* (null) in Frameworks */,
185+
6CC17B4F2C432AE000834E2C /* CodeEditSourceEditor in Frameworks */,
186+
6CCF6DD32E26D48F00B94F75 /* SwiftTerm in Frameworks */,
184187
30CB64912C16CA8100CC8A9E /* LanguageServerProtocol in Frameworks */,
185188
5E4485612DF600D9008BBE69 /* AboutWindow in Frameworks */,
186-
6C4E37FC2C73E00700AEE7B5 /* SwiftTerm in Frameworks */,
187189
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */,
188190
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */,
189191
6CB446402B6DFF3A00539ED0 /* CodeEditSourceEditor in Frameworks */,
@@ -323,7 +325,7 @@
323325
6C85BB432C210EFD00EB5DEF /* SwiftUIIntrospect */,
324326
6C0824A02C5C0C9700A0751E /* SwiftTerm */,
325327
6CE21E862C650D2C0031B056 /* SwiftTerm */,
326-
6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */,
328+
6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */,
327329
6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
328330
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
329331
30818CB42D4E563900967860 /* ZIPFoundation */,
@@ -332,6 +334,8 @@
332334
5E4485602DF600D9008BBE69 /* AboutWindow */,
333335
6C315FC72E05E33D0011BFC5 /* CodeEditSourceEditor */,
334336
6C76D6D32E15B91E00EF52C3 /* CodeEditSourceEditor */,
337+
6CCF6DD22E26D48F00B94F75 /* SwiftTerm */,
338+
6CCF73CF2E26DE3200B94F75 /* SwiftTerm */,
335339
);
336340
productName = CodeEdit;
337341
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -432,12 +436,12 @@
432436
6C85BB422C210EFD00EB5DEF /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
433437
303E88452C276FD100EEA8D9 /* XCRemoteSwiftPackageReference "LanguageClient" */,
434438
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
435-
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
436439
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
437440
30ED7B722DD299E600ACC922 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
438441
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */,
439442
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */,
440443
6C76D6D22E15B91E00EF52C3 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
444+
6CCF73CE2E26DE3200B94F75 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
441445
);
442446
preferredProjectObjectVersion = 55;
443447
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -1764,14 +1768,6 @@
17641768
minimumVersion = 1.0.0;
17651769
};
17661770
};
1767-
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */ = {
1768-
isa = XCRemoteSwiftPackageReference;
1769-
repositoryURL = "https://github.com/migueldeicaza/SwiftTerm";
1770-
requirement = {
1771-
kind = revision;
1772-
revision = 384776a4e24d08833ac7c6b8c6f6c7490323c845;
1773-
};
1774-
};
17751771
6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */ = {
17761772
isa = XCRemoteSwiftPackageReference;
17771773
repositoryURL = "https://github.com/groue/GRDB.swift.git";
@@ -1828,6 +1824,14 @@
18281824
version = 1.0.1;
18291825
};
18301826
};
1827+
6CCF73CE2E26DE3200B94F75 /* XCRemoteSwiftPackageReference "SwiftTerm" */ = {
1828+
isa = XCRemoteSwiftPackageReference;
1829+
repositoryURL = "https://github.com/thecoolwinter/SwiftTerm";
1830+
requirement = {
1831+
branch = codeedit;
1832+
kind = branch;
1833+
};
1834+
};
18311835
/* End XCRemoteSwiftPackageReference section */
18321836

18331837
/* Begin XCSwiftPackageProductDependency section */
@@ -1889,11 +1893,6 @@
18891893
isa = XCSwiftPackageProductDependency;
18901894
productName = CodeEditSourceEditor;
18911895
};
1892-
6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */ = {
1893-
isa = XCSwiftPackageProductDependency;
1894-
package = 6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */;
1895-
productName = SwiftTerm;
1896-
};
18971896
6C66C31229D05CDC00DE9ED2 /* GRDB */ = {
18981897
isa = XCSwiftPackageProductDependency;
18991898
package = 6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */;
@@ -1955,6 +1954,23 @@
19551954
isa = XCSwiftPackageProductDependency;
19561955
productName = CodeEditSourceEditor;
19571956
};
1957+
6CC17B4E2C432AE000834E2C /* CodeEditSourceEditor */ = {
1958+
isa = XCSwiftPackageProductDependency;
1959+
productName = CodeEditSourceEditor;
1960+
};
1961+
6CCF6DD22E26D48F00B94F75 /* SwiftTerm */ = {
1962+
isa = XCSwiftPackageProductDependency;
1963+
productName = SwiftTerm;
1964+
};
1965+
6CCF73CF2E26DE3200B94F75 /* SwiftTerm */ = {
1966+
isa = XCSwiftPackageProductDependency;
1967+
package = 6CCF73CE2E26DE3200B94F75 /* XCRemoteSwiftPackageReference "SwiftTerm" */;
1968+
productName = SwiftTerm;
1969+
};
1970+
6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */ = {
1971+
isa = XCSwiftPackageProductDependency;
1972+
productName = CodeEditSourceEditor;
1973+
};
19581974
6CE21E862C650D2C0031B056 /* SwiftTerm */ = {
19591975
isa = XCSwiftPackageProductDependency;
19601976
productName = SwiftTerm;

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

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

‎CodeEdit/AppDelegate.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import CodeEditSymbols
1010
import CodeEditSourceEditor
1111
import OSLog
1212

13+
@MainActor
1314
final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
1415
private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "", category: "AppDelegate")
1516
private let updater = SoftwareUpdater()

‎CodeEdit/Features/SourceControl/SourceControlManager+GitClient.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ extension SourceControlManager {
170170

171171
await setChangedFiles(status.changedFiles + status.untrackedFiles)
172172
await refreshStatusInFileManager()
173+
} catch GitClient.GitClientError.notGitRepository {
174+
await setChangedFiles([])
173175
} catch {
174176
logger.error("Error fetching git status: \(error)")
175177
await setChangedFiles([])

0 commit comments

Comments
 (0)