Skip to content

Commit a2c8ae3

Browse files
committed
Convert FilesCollector from a class to a namespace
- FilesCollector should be a namespace └── apps └── editor └── src ├── commands │ ├── code-at-cursor-command │ │ └── utils │ │ └── perform-code-at-cursor.ts │ ├── copy-markdown-command.ts │ └── generate-commit-message-commands │ └── actions │ └── get-prompt-data.ts ├── utils │ ├── files-collector.ts │ └── prompt-builder.ts └── views └── prompt └── backend └── message-handlers ├── handle-autofill.ts ├── handle-copy-prompt.ts ├── handle-make-api-call.ts └── handle-preview-web-configuration.ts
1 parent d55b283 commit a2c8ae3

8 files changed

Lines changed: 56 additions & 76 deletions

File tree

‎apps/editor/src/commands/code-at-cursor-command/utils/perform-code-at-cursor.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,11 @@ export const perform_code_at_cursor = async (params: {
126126
)
127127
)
128128

129-
const files_collector = new FilesCollector({
129+
const collected = await FilesCollector.collect_files({
130130
workspace_provider: params.workspace_provider,
131131
open_editors_provider: params.open_editors_provider
132132
})
133133

134-
const collected = await files_collector.collect_files()
135-
136134
const { part1, part2 } = PromptBuilder.build_prompt({
137135
other_files: collected.other_files,
138136
recent_files: collected.recent_files,

‎apps/editor/src/commands/copy-markdown-command.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,15 @@ export const copy_markdown_commands = (
1111
workspace_provider: WorkspaceProvider,
1212
open_editors_provider: OpenEditorsProvider
1313
) => {
14-
const files_collector = new FilesCollector({
15-
workspace_provider,
16-
open_editors_provider
17-
})
18-
1914
return [
2015
vscode.commands.registerCommand('codeWebChat.copyMarkdown', async () => {
2116
let context_text = ''
2217

2318
try {
24-
const collected = await files_collector.collect_files()
19+
const collected = await FilesCollector.collect_files({
20+
workspace_provider,
21+
open_editors_provider
22+
})
2523
context_text = collected.other_files + collected.recent_files
2624
} catch (error: any) {
2725
console.error('Error collecting files:', error)

‎apps/editor/src/commands/generate-commit-message-commands/actions/get-prompt-data.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,12 @@ export const get_prompt_data = async (params: {
9191

9292
const context_files = Array.from(context_files_set)
9393

94-
const files_collector = new FilesCollector({
95-
workspace_provider: params.workspace_provider
96-
})
97-
9894
const absolute_context_files = context_files.map((f) =>
9995
path.join(workspace_root, f)
10096
)
10197

102-
const sorted_files = files_collector.sort_context_files({
98+
const sorted_files = FilesCollector.sort_context_files({
99+
workspace_provider: params.workspace_provider,
103100
files: absolute_context_files
104101
})
105102

‎apps/editor/src/utils/files-collector.ts‎

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,30 @@ import { shrink_file } from '../context/utils/shrink-file/shrink-file'
77
import { is_binary_file } from './is-binary'
88
import { normalize_path } from './normalize-path'
99

10-
export class FilesCollector {
11-
private workspace_provider: WorkspaceProvider
12-
private open_editors_provider?: OpenEditorsProvider
13-
private workspace_roots: string[] = []
14-
15-
constructor(params: {
10+
export namespace FilesCollector {
11+
export const collect_files = async (params: {
1612
workspace_provider: WorkspaceProvider
1713
open_editors_provider?: OpenEditorsProvider
18-
}) {
19-
this.workspace_provider = params.workspace_provider
20-
this.open_editors_provider = params.open_editors_provider
21-
22-
this.workspace_roots = this.workspace_provider.get_workspace_roots()
23-
}
24-
25-
async collect_files(params?: {
2614
additional_paths?: string[]
2715
no_context?: boolean
2816
shrink?: boolean
29-
}): Promise<{ other_files: string; recent_files: string }> {
30-
const additional_paths = (params?.additional_paths ?? []).map((p) => {
31-
if (this.workspace_roots.length > 0) {
32-
return path.join(this.workspace_roots[0], p)
17+
}): Promise<{ other_files: string; recent_files: string }> => {
18+
const workspace_roots = params.workspace_provider.get_workspace_roots()
19+
const additional_paths = (params.additional_paths ?? []).map((p) => {
20+
if (workspace_roots.length > 0) {
21+
return path.join(workspace_roots[0], p)
3322
}
3423
return p
3524
})
3625

3726
const context_files_list: string[] = []
3827

39-
if (params?.no_context) {
28+
if (params.no_context) {
4029
context_files_list.push(...additional_paths)
4130
} else {
42-
const workspace_files = this.workspace_provider.get_checked_files()
31+
const workspace_files = params.workspace_provider.get_checked_files()
4332
const open_editor_files =
44-
this.open_editors_provider?.get_checked_files() || []
33+
params.open_editors_provider?.get_checked_files() || []
4534
context_files_list.push(
4635
...workspace_files,
4736
...open_editor_files,
@@ -53,7 +42,8 @@ export class FilesCollector {
5342

5443
// Sort context files based on modification time and selection timestamp
5544
const { other_files: other_paths, recent_files: recent_paths } =
56-
this.sort_context_files({
45+
sort_context_files({
46+
workspace_provider: params.workspace_provider,
5747
files: context_files
5848
})
5949

@@ -72,20 +62,21 @@ export class FilesCollector {
7262
let content = is_binary ? 'Binary file' : buffer.toString('utf8')
7363

7464
if (!is_binary) {
75-
const range = this.workspace_provider.get_range(file_path)
65+
const range = params.workspace_provider.get_range(file_path)
7666
if (range) {
77-
content = this.workspace_provider.apply_range_to_content(
67+
content = params.workspace_provider.apply_range_to_content(
7868
content,
7969
range
8070
)
8171
}
8272

83-
if (params?.shrink) {
73+
if (params.shrink) {
8474
content = shrink_file(content, path.extname(file_path))
8575
}
8676
}
8777

88-
const workspace_root = this._get_workspace_root_for_file(file_path)
78+
const workspace_root =
79+
params.workspace_provider.get_workspace_root_for_file(file_path)
8980

9081
let display_path = normalize_path(file_path)
9182
if (workspace_root) {
@@ -94,9 +85,9 @@ export class FilesCollector {
9485
)
9586

9687
display_path = relative_path
97-
if (this.workspace_roots.length > 1) {
88+
if (workspace_roots.length > 1) {
9889
const workspace_name =
99-
this.workspace_provider.get_workspace_name(workspace_root)
90+
params.workspace_provider.get_workspace_name(workspace_root)
10091
display_path = `${workspace_name}/${relative_path}`
10192
}
10293
}
@@ -120,14 +111,13 @@ export class FilesCollector {
120111
}
121112
}
122113

123-
private _get_workspace_root_for_file(file_path: string): string | undefined {
124-
return this.workspace_provider.get_workspace_root_for_file(file_path)
125-
}
126-
127-
public sort_context_files(params: { files: string[] }): {
114+
export const sort_context_files = (params: {
115+
workspace_provider: WorkspaceProvider
116+
files: string[]
117+
}): {
128118
other_files: string[]
129119
recent_files: string[]
130-
} {
120+
} => {
131121
const recently_modified: Array<{ path: string; mtime: number }> = []
132122
const older_files: Array<{ path: string; timestamp: number }> = []
133123
const now = Date.now()
@@ -141,7 +131,7 @@ export class FilesCollector {
141131

142132
const mtime = stats.mtimeMs
143133
const selection_timestamp =
144-
this.workspace_provider.get_selection_timestamp(file_path) ?? now
134+
params.workspace_provider.get_selection_timestamp(file_path) ?? now
145135

146136
if (now - mtime < ONE_AND_HALF_HOURS) {
147137
recently_modified.push({ path: file_path, mtime })

‎apps/editor/src/views/prompt/backend/message-handlers/handle-autofill.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ export const handle_autofill = async (params: {
7474

7575
await vscode.workspace.saveAll()
7676

77-
const files_collector = new FilesCollector({
78-
workspace_provider: params.prompt_view_provider.workspace_provider,
79-
open_editors_provider: params.prompt_view_provider.open_editors_provider
80-
})
81-
8277
let sent = false
8378

8479
if (is_in_code_at_cursor_mode) {
@@ -101,7 +96,10 @@ export const handle_autofill = async (params: {
10196
remove_images: true
10297
})
10398

104-
const collected = await files_collector.collect_files()
99+
const collected = await FilesCollector.collect_files({
100+
workspace_provider: params.prompt_view_provider.workspace_provider,
101+
open_editors_provider: params.prompt_view_provider.open_editors_provider
102+
})
105103
const context_text = collected.other_files + collected.recent_files
106104

107105
const relative_path = vscode.workspace.asRelativePath(document.uri)
@@ -145,7 +143,9 @@ export const handle_autofill = async (params: {
145143
false
146144
)
147145

148-
const collected = await files_collector.collect_files({
146+
const collected = await FilesCollector.collect_files({
147+
workspace_provider: params.prompt_view_provider.workspace_provider,
148+
open_editors_provider: params.prompt_view_provider.open_editors_provider,
149149
additional_paths,
150150
no_context:
151151
params.prompt_view_provider.web_prompt_type == 'without-files',

‎apps/editor/src/views/prompt/backend/message-handlers/handle-copy-prompt.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ export const handle_copy_prompt = async (params: {
2222
instructions: string
2323
web_configuration_name?: string
2424
}): Promise<void> => {
25-
const files_collector = new FilesCollector({
26-
workspace_provider: params.prompt_view_provider.workspace_provider,
27-
open_editors_provider: params.prompt_view_provider.open_editors_provider
28-
})
29-
3025
const active_editor = vscode.window.activeTextEditor
3126

3227
const is_in_code_at_cursor_prompt_type =
@@ -57,7 +52,10 @@ export const handle_copy_prompt = async (params: {
5752
new vscode.Range(position, document.positionAt(document.getText().length))
5853
)
5954

60-
const collected = await files_collector.collect_files()
55+
const collected = await FilesCollector.collect_files({
56+
workspace_provider: params.prompt_view_provider.workspace_provider,
57+
open_editors_provider: params.prompt_view_provider.open_editors_provider
58+
})
6159
const context_text = collected.other_files + collected.recent_files
6260

6361
const workspace_folder = vscode.workspace.workspaceFolders?.[0].uri.fsPath
@@ -104,7 +102,9 @@ export const handle_copy_prompt = async (params: {
104102
false
105103
)
106104

107-
const collected = await files_collector.collect_files({
105+
const collected = await FilesCollector.collect_files({
106+
workspace_provider: params.prompt_view_provider.workspace_provider,
107+
open_editors_provider: params.prompt_view_provider.open_editors_provider,
108108
no_context: params.prompt_view_provider.prompt_type == 'without-files',
109109
shrink: is_in_find_relevant_files_prompt_type && shrink_source_code
110110
})

‎apps/editor/src/views/prompt/backend/message-handlers/handle-make-api-call.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,6 @@ export const handle_make_api_call = async (
209209
workspace_provider: prompt_view_provider.workspace_provider
210210
})
211211

212-
const files_collector = new FilesCollector({
213-
workspace_provider: prompt_view_provider.workspace_provider,
214-
open_editors_provider: prompt_view_provider.open_editors_provider
215-
})
216-
217212
const shrink_source_code =
218213
prompt_type == 'find-relevant-files'
219214
? prompt_view_provider.extension_context.workspaceState.get<boolean>(
@@ -222,7 +217,9 @@ export const handle_make_api_call = async (
222217
)
223218
: false
224219

225-
const collected = await files_collector.collect_files({
220+
const collected = await FilesCollector.collect_files({
221+
workspace_provider: prompt_view_provider.workspace_provider,
222+
open_editors_provider: prompt_view_provider.open_editors_provider,
226223
shrink: shrink_source_code
227224
})
228225
const collected_files = collected.other_files + collected.recent_files

‎apps/editor/src/views/prompt/backend/message-handlers/handle-preview-web-configuration.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ export const handle_preview_web_configuration = async (
2525
): Promise<void> => {
2626
await vscode.workspace.saveAll()
2727

28-
const files_collector = new FilesCollector({
29-
workspace_provider: prompt_view_provider.workspace_provider,
30-
open_editors_provider: prompt_view_provider.open_editors_provider
31-
})
32-
3328
const active_editor = vscode.window.activeTextEditor
3429
const active_path = active_editor?.document.uri.fsPath
3530

@@ -50,7 +45,10 @@ export const handle_preview_web_configuration = async (
5045
new vscode.Range(position, document.positionAt(document.getText().length))
5146
)
5247

53-
const collected = await files_collector.collect_files()
48+
const collected = await FilesCollector.collect_files({
49+
workspace_provider: prompt_view_provider.workspace_provider,
50+
open_editors_provider: prompt_view_provider.open_editors_provider
51+
})
5452
const context_text = collected.other_files + collected.recent_files
5553

5654
const workspace_folder = vscode.workspace.workspaceFolders?.[0].uri.fsPath
@@ -95,7 +93,9 @@ export const handle_preview_web_configuration = async (
9593

9694
const collected =
9795
prompt_view_provider.web_prompt_type != 'without-files'
98-
? await files_collector.collect_files({
96+
? await FilesCollector.collect_files({
97+
workspace_provider: prompt_view_provider.workspace_provider,
98+
open_editors_provider: prompt_view_provider.open_editors_provider,
9999
shrink:
100100
prompt_view_provider.web_prompt_type == 'find-relevant-files' &&
101101
shrink_source_code

0 commit comments

Comments
 (0)