Skip to content

Terminal Emulator Task Output #2088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open

Terminal Emulator Task Output #2088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d6f5a4b
Add new mode & code sequences to shell integrations
thecoolwinter Jul 15, 2025
170af9a
Use Khan's Copy of SwiftTerm
thecoolwinter Jul 15, 2025
b5492ae
Move to `CELocalShellTerminalView` with cleaner shell setup
thecoolwinter Jul 15, 2025
ae9e7d4
Update Package.resolved
thecoolwinter Jul 15, 2025
f245eaa
Create `CEActiveTaskTerminalView`
thecoolwinter Jul 15, 2025
0cd4550
Remove Unnecessary Delegate Method
thecoolwinter Jul 15, 2025
d9e4a83
Correctly Manage Child Processes
thecoolwinter Jul 15, 2025
ecd1bca
Remove use of FileManager
thecoolwinter Jul 15, 2025
a1ef3b2
Add `waitForExit`
thecoolwinter Jul 15, 2025
b253cae
Unit Test Everything!
thecoolwinter Jul 15, 2025
2852c20
Merge branch 'CodeEditApp:main' into terminal-task-output
thecoolwinter Jul 15, 2025
ca7211c
Mark some things MainActor, Update Tests
thecoolwinter Jul 16, 2025
a692ffe
Adjust MainActor Marks Again
thecoolwinter Jul 16, 2025
5935dac
Clean Up
thecoolwinter Jul 16, 2025
d1e577f
Serialized The Tests
thecoolwinter Jul 16, 2025
4f08786
Ignore Specific Git Error, Clean Up Tests
thecoolwinter Jul 16, 2025
21f52d0
Use one-off Shells, Test with All Supported Shells
thecoolwinter Jul 17, 2025
1a65b86
fix:lint
thecoolwinter Jul 17, 2025
931afb2
Fix Flaky Test
thecoolwinter Jul 17, 2025
312c451
Fix Theming, Fix Copy
thecoolwinter Jul 17, 2025
e96b838
Group Commands?
thecoolwinter Jul 17, 2025
9a59612
Merge branch 'main' into terminal-task-output
thecoolwinter Jul 17, 2025
286d549
fix:lint
thecoolwinter Jul 17, 2025
c141401
ACTUALLY Final Test Fixes
thecoolwinter Jul 17, 2025
050d5cb
Merge branch 'main' into terminal-task-output
thecoolwinter Jul 18, 2025
27ca24e
Remove `fatalError()`, Remove Unused Method
thecoolwinter Jul 18, 2025
9e2ea97
Merge branch 'terminal-task-output' of https://github.com/thecoolwint…
thecoolwinter Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0824A02C5C0C9700A0751E /* SwiftTerm */; };
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 6C147C4429A329350089B630 /* OrderedCollections */; };
6C315FC82E05E33D0011BFC5 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C315FC72E05E33D0011BFC5 /* CodeEditSourceEditor */; };
6C4E37FC2C73E00700AEE7B5 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */; };
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = 6C66C31229D05CDC00DE9ED2 /* GRDB */; };
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C6BD6F329CD142C00235D17 /* CollectionConcurrencyKit */; };
6C6BD6F829CD14D100235D17 /* CodeEditKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C6BD6F729CD14D100235D17 /* CodeEditKit */; };
Expand All @@ -42,6 +41,8 @@
6CB94D032CA1205100E8651C /* AsyncAlgorithms in Frameworks */ = {isa = PBXBuildFile; productRef = 6CB94D022CA1205100E8651C /* AsyncAlgorithms */; };
6CC00A8B2CBEF150004E8134 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */; };
6CC17B4F2C432AE000834E2C /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CC17B4E2C432AE000834E2C /* CodeEditSourceEditor */; };
6CCF6DD32E26D48F00B94F75 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6CCF6DD22E26D48F00B94F75 /* SwiftTerm */; };
6CCF73D02E26DE3200B94F75 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6CCF73CF2E26DE3200B94F75 /* SwiftTerm */; };
6CD3CA552C8B508200D83DCD /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */; };
6CE21E872C650D2C0031B056 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6CE21E862C650D2C0031B056 /* SwiftTerm */; };
B6FF04782B6C08AC002C2C78 /* DefaultThemes in Resources */ = {isa = PBXBuildFile; fileRef = B6FF04772B6C08AC002C2C78 /* DefaultThemes */; };
Expand Down Expand Up @@ -176,14 +177,15 @@
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */,
6CE21E872C650D2C0031B056 /* SwiftTerm in Frameworks */,
6C76D6D42E15B91E00EF52C3 /* CodeEditSourceEditor in Frameworks */,
6CCF73D02E26DE3200B94F75 /* SwiftTerm in Frameworks */,
6C315FC82E05E33D0011BFC5 /* CodeEditSourceEditor in Frameworks */,
6CC00A8B2CBEF150004E8134 /* CodeEditSourceEditor in Frameworks */,
6CD3CA552C8B508200D83DCD /* CodeEditSourceEditor in Frameworks */,
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */,
6CC17B4F2C432AE000834E2C /* CodeEditSourceEditor in Frameworks */,
6CCF6DD32E26D48F00B94F75 /* SwiftTerm in Frameworks */,
30CB64912C16CA8100CC8A9E /* LanguageServerProtocol in Frameworks */,
5E4485612DF600D9008BBE69 /* AboutWindow in Frameworks */,
6C4E37FC2C73E00700AEE7B5 /* SwiftTerm in Frameworks */,
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */,
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */,
6CB446402B6DFF3A00539ED0 /* CodeEditSourceEditor in Frameworks */,
Expand Down Expand Up @@ -324,7 +326,6 @@
6CC17B4E2C432AE000834E2C /* CodeEditSourceEditor */,
6C0824A02C5C0C9700A0751E /* SwiftTerm */,
6CE21E862C650D2C0031B056 /* SwiftTerm */,
6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */,
6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */,
6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
Expand All @@ -334,6 +335,8 @@
5E4485602DF600D9008BBE69 /* AboutWindow */,
6C315FC72E05E33D0011BFC5 /* CodeEditSourceEditor */,
6C76D6D32E15B91E00EF52C3 /* CodeEditSourceEditor */,
6CCF6DD22E26D48F00B94F75 /* SwiftTerm */,
6CCF73CF2E26DE3200B94F75 /* SwiftTerm */,
);
productName = CodeEdit;
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
Expand Down Expand Up @@ -434,12 +437,12 @@
6C85BB422C210EFD00EB5DEF /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
303E88452C276FD100EEA8D9 /* XCRemoteSwiftPackageReference "LanguageClient" */,
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
30ED7B722DD299E600ACC922 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */,
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */,
6C76D6D22E15B91E00EF52C3 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
6CCF73CE2E26DE3200B94F75 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
);
preferredProjectObjectVersion = 55;
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
Expand Down Expand Up @@ -1759,14 +1762,6 @@
minimumVersion = 1.0.0;
};
};
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/migueldeicaza/SwiftTerm";
requirement = {
kind = revision;
revision = 384776a4e24d08833ac7c6b8c6f6c7490323c845;
};
};
6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/groue/GRDB.swift.git";
Expand Down Expand Up @@ -1823,6 +1818,14 @@
version = 1.0.1;
};
};
6CCF73CE2E26DE3200B94F75 /* XCRemoteSwiftPackageReference "SwiftTerm" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/thecoolwinter/SwiftTerm";
requirement = {
branch = codeedit;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -1884,11 +1887,6 @@
isa = XCSwiftPackageProductDependency;
productName = CodeEditSourceEditor;
};
6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */ = {
isa = XCSwiftPackageProductDependency;
package = 6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */;
productName = SwiftTerm;
};
6C66C31229D05CDC00DE9ED2 /* GRDB */ = {
isa = XCSwiftPackageProductDependency;
package = 6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */;
Expand Down Expand Up @@ -1954,6 +1952,15 @@
isa = XCSwiftPackageProductDependency;
productName = CodeEditSourceEditor;
};
6CCF6DD22E26D48F00B94F75 /* SwiftTerm */ = {
isa = XCSwiftPackageProductDependency;
productName = SwiftTerm;
};
6CCF73CF2E26DE3200B94F75 /* SwiftTerm */ = {
isa = XCSwiftPackageProductDependency;
package = 6CCF73CE2E26DE3200B94F75 /* XCRemoteSwiftPackageReference "SwiftTerm" */;
productName = SwiftTerm;
};
6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */ = {
isa = XCSwiftPackageProductDependency;
productName = CodeEditSourceEditor;
Expand Down
7 changes: 4 additions & 3 deletions CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions CodeEdit/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import CodeEditSymbols
import CodeEditSourceEditor
import OSLog

@MainActor
final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "", category: "AppDelegate")
private let updater = SoftwareUpdater()
Expand Down
2 changes: 2 additions & 0 deletions CodeEdit/Features/SourceControl/SourceControlManager+GitClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ extension SourceControlManager {

await setChangedFiles(status.changedFiles + status.untrackedFiles)
await refreshStatusInFileManager()
} catch GitClient.GitClientError.notGitRepository {
await setChangedFiles([])
} catch {
logger.error("Error fetching git status: \(error)")
await setChangedFiles([])
Expand Down
Loading
Loading