Skip to content

Commit 99743c1

Browse files
committed
Refactor constructors to use object parameter pattern for better maintainability
1 parent 3dc2337 commit 99743c1

18 files changed

Lines changed: 104 additions & 90 deletions

File tree

‎apps/editor/src/commands/apply-context-command/sources/json-file-source.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export const handle_json_file_source = async (
130130
items.push({
131131
label: context.name,
132132
description,
133-
context: context,
133+
context,
134134
buttons: [sync_button, edit_button, delete_button]
135135
})
136136
}

‎apps/editor/src/commands/apply-context-command/sources/unstaged-files-source.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const handle_unstaged_files_source = async (
8383
label: path.basename(file_path),
8484
description: `${formatted_token_count} · ${display_dir}`.trim(),
8585
picked: true,
86-
file_path: file_path
86+
file_path
8787
}
8888
})
8989
)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,10 @@ const perform_code_at_cursor = async (params: {
372372
new vscode.Range(position, document.positionAt(document.getText().length))
373373
)
374374

375-
const files_collector = new FilesCollector(
376-
params.file_tree_provider,
377-
params.open_editors_provider
378-
)
375+
const files_collector = new FilesCollector({
376+
workspace_provider: params.file_tree_provider,
377+
open_editors_provider: params.open_editors_provider
378+
})
379379

380380
const context_text = await files_collector.collect_files()
381381

‎apps/editor/src/commands/search-files-for-context.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export const search_files_for_context_command = (
114114

115115
const matched_files = await search_files_by_keywords({
116116
files: all_files,
117-
search_term: search_term
117+
search_term
118118
})
119119

120120
if (matched_files.length == 0) {
@@ -140,7 +140,7 @@ export const search_files_for_context_command = (
140140
return {
141141
label: path.basename(file_path),
142142
description: dir_name == '.' ? '' : dir_name,
143-
file_path: file_path,
143+
file_path,
144144
buttons: [open_file_button]
145145
}
146146
})

‎apps/editor/src/context/context-initialization.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,22 +109,22 @@ export const context_initialization = async (
109109

110110
let workspace_view: vscode.TreeView<FileItem>
111111

112-
const workspace_provider = new WorkspaceProvider(
113-
workspace_folders as any,
112+
const workspace_provider = new WorkspaceProvider({
113+
workspace_folders,
114114
context
115-
)
115+
})
116116
const context_provider = new ContextProvider(workspace_provider)
117117
context.subscriptions.push(context_provider)
118118

119-
const open_editors_provider = new OpenEditorsProvider(
120-
workspace_folders as any,
119+
const open_editors_provider = new OpenEditorsProvider({
120+
workspace_folders,
121121
workspace_provider
122-
)
122+
})
123123

124-
const files_collector = new FilesCollector(
124+
const files_collector = new FilesCollector({
125125
workspace_provider,
126126
open_editors_provider
127-
)
127+
})
128128

129129
const update_view_badges = async () => {
130130
let context_token_count = 0

‎apps/editor/src/context/providers/open-editors/open-editors-provider.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ export class OpenEditorsProvider
3838
}
3939
}
4040

41-
constructor(
42-
workspace_folders: vscode.WorkspaceFolder[],
41+
constructor(params: {
42+
workspace_folders: readonly vscode.WorkspaceFolder[]
4343
workspace_provider: WorkspaceProvider
44-
) {
45-
this._workspace_roots = workspace_folders.map((folder) => folder.uri.fsPath)
44+
}) {
45+
this._workspace_roots = params.workspace_folders.map(
46+
(folder) => folder.uri.fsPath
47+
)
4648
this._shared_state = SharedFileState.get_instance()
47-
this._workspace_provider = workspace_provider
49+
this._workspace_provider = params.workspace_provider
4850

4951
this._workspace_change_handler =
5052
this._workspace_provider.onDidChangeTreeData(() => this.refresh())

‎apps/editor/src/context/providers/workspace/workspace-provider.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export class WorkspaceProvider
4040
readonly onDidChangeTreeData: vscode.Event<
4141
FileItem | undefined | null | void
4242
> = this._on_did_change_tree_data.event
43+
private _context: vscode.ExtensionContext
4344
private _workspace_roots: string[] = []
4445
private _workspace_names: string[] = []
4546
private _checked_items: Map<string, vscode.TreeItemCheckboxState> = new Map()
@@ -90,12 +91,17 @@ export class WorkspaceProvider
9091
}
9192
}
9293

93-
constructor(
94-
workspace_folders: vscode.WorkspaceFolder[],
95-
private _context: vscode.ExtensionContext
96-
) {
97-
this._workspace_roots = workspace_folders.map((folder) => folder.uri.fsPath)
98-
this._workspace_names = workspace_folders.map((folder) => folder.name)
94+
constructor(params: {
95+
workspace_folders: readonly vscode.WorkspaceFolder[]
96+
context: vscode.ExtensionContext
97+
}) {
98+
this._context = params.context
99+
this._workspace_roots = params.workspace_folders.map(
100+
(folder) => folder.uri.fsPath
101+
)
102+
this._workspace_names = params.workspace_folders.map(
103+
(folder) => folder.name
104+
)
99105
this.onDidChangeCheckedFiles(() => this._save_checked_files_state())
100106
this._token_calculator = new TokenCalculator(this, this._context)
101107
this._load_ignore_patterns()

‎apps/editor/src/extension.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ export async function activate(context: vscode.ExtensionContext) {
7070
// Run startup tasks without blocking extension activation
7171
startup_tasks()
7272

73-
const panel_provider = new PanelProvider(
74-
context.extensionUri,
73+
const panel_provider = new PanelProvider({
74+
extension_uri: context.extensionUri,
7575
workspace_provider,
7676
open_editors_provider,
7777
context,
7878
websocket_server_instance
79-
)
79+
})
8080

8181
const api_manager = new ApiManager(panel_provider)
8282

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

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ export class FilesCollector {
1010
private open_editors_provider?: OpenEditorsProvider
1111
private workspace_roots: string[] = []
1212

13-
constructor(
14-
workspace_provider: WorkspaceProvider,
13+
constructor(params: {
14+
workspace_provider: WorkspaceProvider
1515
open_editors_provider?: OpenEditorsProvider
16-
) {
17-
this.workspace_provider = workspace_provider
18-
this.open_editors_provider = open_editors_provider
16+
}) {
17+
this.workspace_provider = params.workspace_provider
18+
this.open_editors_provider = params.open_editors_provider
1919

20-
this.workspace_roots = workspace_provider.get_workspace_roots()
20+
this.workspace_roots = this.workspace_provider.get_workspace_roots()
2121
}
2222

2323
async collect_files(params?: {
@@ -48,15 +48,11 @@ export class FilesCollector {
4848
}
4949

5050
const context_files = [...new Set(context_files_list)]
51-
const now = Date.now()
52-
const THREE_HOURS = 3 * 60 * 60 * 1000
5351

5452
// Sort context files based on modification time and selection timestamp
55-
const sorted_context_files = this._sort_context_files(
56-
context_files,
57-
now,
58-
THREE_HOURS
59-
)
53+
const sorted_context_files = this._sort_context_files({
54+
files: context_files
55+
})
6056

6157
let collected_text = ''
6258

@@ -116,15 +112,13 @@ export class FilesCollector {
116112
return this.workspace_provider.get_workspace_root_for_file(file_path)
117113
}
118114

119-
private _sort_context_files(
120-
files: string[],
121-
now: number,
122-
three_hours: number
123-
): string[] {
115+
private _sort_context_files(params: { files: string[] }): string[] {
124116
const recently_modified: Array<{ path: string; mtime: number }> = []
125117
const older_files: Array<{ path: string; timestamp: number }> = []
118+
const now = Date.now()
119+
const THREE_HOURS = 3 * 60 * 60 * 1000
126120

127-
for (const file_path of files) {
121+
for (const file_path of params.files) {
128122
try {
129123
if (!fs.existsSync(file_path)) continue
130124
const stats = fs.statSync(file_path)
@@ -134,7 +128,7 @@ export class FilesCollector {
134128
const selection_timestamp =
135129
this.workspace_provider.get_selection_timestamp(file_path) ?? now
136130

137-
if (now - mtime < three_hours) {
131+
if (now - mtime < THREE_HOURS) {
138132
recently_modified.push({ path: file_path, mtime })
139133
} else {
140134
older_files.push({ path: file_path, timestamp: selection_timestamp })

‎apps/editor/src/views/panel/backend/message-handlers/handle-at-sign-quick-pick/handle-at-sign-quick-pick.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import fs from 'fs'
22
import { PanelProvider } from '@/views/panel/backend/panel-provider'
3-
import { MODE } from '@/views/panel/types/main-view-mode'
43
import * as vscode from 'vscode'
54
import * as path from 'path'
65
import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provider'

0 commit comments

Comments
 (0)