fix: rebase error

toeverything · Jan 27, 2025 · e9a566c · e9a566c
1 parent 1ff782f
commit e9a566c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/oxlint.json b/oxlint.json
@@ -30,6 +30,7 @@
     "tools/cli/src/webpack/error-handler.js",
     "packages/backend/native/index.d.ts",
     "packages/backend/server/src/__tests__/__snapshots__",
+    "packages/common/native/fixtures/**",
     "packages/frontend/native/index.d.ts",
     "packages/frontend/native/index.js",
     "packages/frontend/graphql/src/graphql/index.ts",

diff --git a/packages/backend/server/src/plugins/copilot/context/resolver.ts b/packages/backend/server/src/plugins/copilot/context/resolver.ts
@@ -23,7 +23,7 @@ import {
   CopilotFailedToMatchContext,
   CopilotFailedToModifyContext,
   CopilotSessionNotFound,
-  EventEmitter,
+  EventBus,
   type FileUpload,
   RequestMutex,
   Throttle,
@@ -141,7 +141,7 @@ class ContextMatchedDocChunk implements DocChunkSimilarity {
 export class CopilotContextRootResolver {
   constructor(
     private readonly db: PrismaClient,
-    private readonly event: EventEmitter,
+    private readonly event: EventBus,
     private readonly mutex: RequestMutex,
     private readonly permissions: PermissionService,
     private readonly chatSession: ChatSessionService,