Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions Core/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,11 @@ let package = Package(
"SuggestionService",
"GitHubCopilotService",
"XPCShared",
"DisplayLink",
"SuggestionWidget",
"ChatService",
"PromptToCodeService",
"ServiceUpdateMigration",
"ChatGPTChatTab",
.product(name: "CGEventObserver", package: "Tool"),
.product(name: "Workspace", package: "Tool"),
.product(name: "UserDefaultsObserver", package: "Tool"),
.product(name: "AppMonitoring", package: "Tool"),
Expand Down Expand Up @@ -248,7 +246,6 @@ let package = Package(

.target(name: "FileChangeChecker"),
.target(name: "LaunchAgentManager"),
.target(name: "DisplayLink"),
.target(
name: "UpdateChecker",
dependencies: [
Expand Down
64 changes: 0 additions & 64 deletions Core/Sources/DisplayLink/DisplayLink.swift

This file was deleted.

42 changes: 0 additions & 42 deletions Core/Sources/Service/RealtimeSuggestionController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import AppKit
import AsyncAlgorithms
import AXExtension
import AXNotificationStream
import CGEventObserver
import Environment
import Foundation
import Logger
Expand All @@ -13,7 +12,6 @@ import Workspace
import XcodeInspector

public actor RealtimeSuggestionController {
let eventObserver: CGEventObserverType = CGEventObserver(eventsOfInterest: [.keyDown])
private var task: Task<Void, Error>?
private var inflightPrefetchTask: Task<Void, Error>?
private var windowChangeObservationTask: Task<Void, Error>?
Expand All @@ -29,7 +27,6 @@ public actor RealtimeSuggestionController {
Task { [weak self] in
if let app = ActiveApplicationMonitor.shared.activeXcode {
await self?.handleXcodeChanged(app)
await self?.startHIDObservation()
}
var previousApp = ActiveApplicationMonitor.shared.activeXcode
for await app in ActiveApplicationMonitor.shared.createStream() {
Expand All @@ -40,32 +37,8 @@ public actor RealtimeSuggestionController {
if let app = ActiveApplicationMonitor.shared.activeXcode, app != previousApp {
await self.handleXcodeChanged(app)
}

if ActiveApplicationMonitor.shared.activeXcode != nil {
await startHIDObservation()
} else {
await stopHIDObservation()
}
}
}
}

private func startHIDObservation() {
if task == nil {
task = Task { [weak self, eventObserver] in
for await event in eventObserver.createStream() {
guard let self else { return }
await self.handleHIDEvent(event: event)
}
}
}
eventObserver.activateIfPossible()
}

private func stopHIDObservation() {
task?.cancel()
task = nil
eventObserver.deactivate()
}

private func handleXcodeChanged(_ app: NSRunningApplication) {
Expand Down Expand Up @@ -169,21 +142,6 @@ public actor RealtimeSuggestionController {
}
}

func handleHIDEvent(event: CGEvent) async {
guard await Environment.isXcodeActive() else { return }

let keycode = Int(event.getIntegerValueField(.keyboardEventKeycode))
let escape = 0x35

// Escape should cancel in-flight tasks.
// Except that when the completion panel is presented, it should trigger prefetch instead.
if keycode == escape {
if event.type == .keyDown {
await cancelInFlightTasks()
}
}
}

func triggerPrefetchDebounced(force: Bool = false) {
inflightPrefetchTask = Task { @WorkspaceActor in
try? await Task.sleep(nanoseconds: UInt64((
Expand Down
8 changes: 0 additions & 8 deletions Tool/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ let package = Package(
.library(name: "Keychain", targets: ["Keychain"]),
.library(name: "SharedUIComponents", targets: ["SharedUIComponents"]),
.library(name: "UserDefaultsObserver", targets: ["UserDefaultsObserver"]),
.library(name: "CGEventObserver", targets: ["CGEventObserver"]),
.library(name: "Workspace", targets: ["Workspace"]),
.library(
name: "AppMonitoring",
Expand Down Expand Up @@ -192,13 +191,6 @@ let package = Package(
]
),

.target(
name: "CGEventObserver",
dependencies: [
"Logger",
]
),

.target(
name: "FocusedCodeFinder",
dependencies: [
Expand Down
113 changes: 0 additions & 113 deletions Tool/Sources/CGEventObserver/CGEventObserver.swift

This file was deleted.

1 change: 0 additions & 1 deletion Tool/Sources/Logger/Logger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public final class Logger {
public static let gitHubCopilot = Logger(category: "GitHubCopilot")
public static let codeium = Logger(category: "Codeium")
public static let langchain = Logger(category: "LangChain")
public static let python = Logger(category: "Python")
#if DEBUG
public static let temp = Logger(category: "Temp")
#endif
Expand Down
37 changes: 0 additions & 37 deletions Tool/Sources/PythonHelper/InitializePython.swift

This file was deleted.

Loading