Skip to content

Commit 017e74a

Browse files
committed
Rename SharedFileState to SharedContextState and update all references to improve naming consistency
- 'shared file state' should not be a singleton but prop-provided instance. - rename 'shared state', 'shared file state' to 'shared context state' - rename 'shared state' to 'shared context state'
1 parent 96f769a commit 017e74a

6 files changed

Lines changed: 34 additions & 33 deletions

File tree

‎apps/editor/src/commands/apply-chat-response-command/response-processor.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provi
2929
import { natural_sort } from '@/utils/natural-sort'
3030
import { t } from '@/i18n'
3131
import { is_truncation_line } from './utils/edit-formats/truncations'
32-
import { SharedFileState } from '@/context/shared-file-state'
3332

3433
export type PreviewData = {
3534
original_states: OriginalFileState[]
@@ -173,11 +172,11 @@ export const process_chat_response = async (
173172
)
174173

175174
if (selected_files) {
176-
const shared_state = SharedFileState.get_instance()
175+
const shared_context_state = panel_provider.shared_context_state
177176
const was_frf = workspace_provider.is_frf_mode
178177

179178
if (was_frf) {
180-
shared_state.switch_context_state(false)
179+
shared_context_state.switch_context_state(false)
181180
}
182181

183182
const presented_files = files_for_modal.map((f) => f.file_path)
@@ -192,7 +191,7 @@ export const process_chat_response = async (
192191
await workspace_provider.set_checked_files(merged_files)
193192

194193
if (was_frf) {
195-
shared_state.switch_context_state(true)
194+
shared_context_state.switch_context_state(true)
196195
}
197196

198197
panel_provider.send_message({

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ import {
66
} from './providers/workspace/workspace-provider'
77
import { FilesCollector } from '../utils/files-collector'
88
import { OpenEditorsProvider } from './providers/open-editors/open-editors-provider'
9-
import { SharedFileState } from './shared-file-state'
9+
import { SharedContextState } from './shared-context-state'
1010
import { EventEmitter } from 'events'
1111
import { dictionary } from '@shared/constants/dictionary'
1212
import {
1313
CONTEXT_CHECKED_PATHS_STATE_KEY,
1414
CONTEXT_CHECKED_TIMESTAMPS_STATE_KEY,
15-
CONTEXT_CHECKED_PATHS_FRF_STATE_KEY,
16-
CONTEXT_CHECKED_TIMESTAMPS_FRF_STATE_KEY,
1715
DUPLICATE_WORKSPACE_CONTEXT_STATE_KEY,
1816
RANGES_STATE_KEY,
1917
type DuplicateWorkspaceContext
@@ -104,13 +102,16 @@ export const context_initialization = async (
104102
): Promise<{
105103
workspace_provider: WorkspaceProvider
106104
open_editors_provider: OpenEditorsProvider
105+
shared_context_state: SharedContextState
107106
}> => {
108107
await restore_duplicated_workspace_context(context)
109108

110109
const workspace_folders = vscode.workspace.workspaceFolders ?? []
111110

112111
let workspace_view: vscode.TreeView<FileItem>
113112

113+
const shared_context_state = new SharedContextState()
114+
114115
const workspace_provider = new WorkspaceProvider({
115116
workspace_folders,
116117
context
@@ -120,7 +121,8 @@ export const context_initialization = async (
120121

121122
const open_editors_provider = new OpenEditorsProvider({
122123
workspace_folders,
123-
workspace_provider
124+
workspace_provider,
125+
shared_context_state
124126
})
125127

126128
const files_collector = new FilesCollector({
@@ -149,11 +151,10 @@ export const context_initialization = async (
149151
token_count_emitter.emit('token-count-updated', context_token_count)
150152
}
151153

152-
const shared_state = SharedFileState.get_instance()
153-
shared_state.set_providers(workspace_provider, open_editors_provider)
154+
shared_context_state.set_providers(workspace_provider, open_editors_provider)
154155

155156
context.subscriptions.push({
156-
dispose: () => shared_state.dispose()
157+
dispose: () => shared_context_state.dispose()
157158
})
158159

159160
const register_workspace_view_handlers = (
@@ -428,7 +429,10 @@ export const context_initialization = async (
428429
open_editors_provider.update_workspace_folders(
429430
vscode.workspace.workspaceFolders
430431
)
431-
shared_state.set_providers(workspace_provider, open_editors_provider)
432+
shared_context_state.set_providers(
433+
workspace_provider,
434+
open_editors_provider
435+
)
432436
update_view_badges()
433437
}
434438
})
@@ -453,6 +457,7 @@ export const context_initialization = async (
453457

454458
return {
455459
workspace_provider,
456-
open_editors_provider
460+
open_editors_provider,
461+
shared_context_state
457462
}
458463
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as path from 'path'
44
import { FileItem } from '../workspace/workspace-provider'
55
import { WorkspaceProvider } from '../workspace/workspace-provider'
66
import { display_token_count } from '../../../utils/display-token-count'
7-
import { SharedFileState } from '@/context/shared-file-state'
7+
import { SharedContextState } from '@/context/shared-context-state'
88

99
export class OpenEditorsProvider
1010
implements vscode.TreeDataProvider<FileItem>, vscode.Disposable
@@ -40,7 +40,7 @@ export class OpenEditorsProvider
4040
private _preview_tabs: Map<string, boolean> = new Map()
4141
private _on_did_change_checked_files = new vscode.EventEmitter<void>()
4242
readonly onDidChangeCheckedFiles = this._on_did_change_checked_files.event
43-
private _shared_state: SharedFileState
43+
private _shared_context_state: SharedContextState
4444
private _config_change_handler: vscode.Disposable
4545
private _workspace_provider: WorkspaceProvider
4646
private _use_shrink_token_count: boolean = false
@@ -74,12 +74,13 @@ export class OpenEditorsProvider
7474
constructor(params: {
7575
workspace_folders: readonly vscode.WorkspaceFolder[]
7676
workspace_provider: WorkspaceProvider
77+
shared_context_state: SharedContextState
7778
}) {
7879
this._workspace_roots = params.workspace_folders
7980
.map((folder) => folder.uri.fsPath)
8081
.filter((folder_path) => fs.existsSync(folder_path))
8182

82-
this._shared_state = SharedFileState.get_instance()
83+
this._shared_context_state = params.shared_context_state
8384
this._workspace_provider = params.workspace_provider
8485

8586
this._workspace_change_handler =
@@ -205,7 +206,8 @@ export class OpenEditorsProvider
205206
}
206207

207208
private _is_file_checked_in_workspace(file_path: string): boolean {
208-
const workspace_checked_files = this._shared_state.get_checked_files()
209+
const workspace_checked_files =
210+
this._shared_context_state.get_checked_files()
209211
return workspace_checked_files.includes(file_path)
210212
}
211213

apps/editor/src/context/shared-file-state.ts renamed to apps/editor/src/context/shared-context-state.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ type ContextState = {
1111
files: string[]
1212
}
1313

14-
export class SharedFileState {
15-
private static _instance: SharedFileState
14+
export class SharedContextState {
1615
private _on_did_change_checked_files = new vscode.EventEmitter<void>()
1716
readonly onDidChangeCheckedFiles = this._on_did_change_checked_files.event
1817

@@ -40,13 +39,6 @@ export class SharedFileState {
4039
private _is_initialized: boolean = false
4140
private _is_undoing_redoing: boolean = false
4241

43-
static get_instance(): SharedFileState {
44-
if (!SharedFileState._instance) {
45-
SharedFileState._instance = new SharedFileState()
46-
}
47-
return SharedFileState._instance
48-
}
49-
5042
private get _checked_files() {
5143
return this._is_frf_mode
5244
? this._frf_state.checked_files

‎apps/editor/src/extension.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
migrate_model_providers_type,
1212
migrate_prune_context_to_find_relevant_files
1313
} from './migrations'
14-
import { SharedFileState } from './context/shared-file-state'
1514
import {
1615
apply_chat_response_command,
1716
apply_context_command,
@@ -47,7 +46,7 @@ import { get_current_preview_url } from './views/panel/backend/message-handlers/
4746
let websocket_server_instance: WebSocketManager | null = null
4847

4948
export async function activate(context: vscode.ExtensionContext) {
50-
const { workspace_provider, open_editors_provider } =
49+
const { workspace_provider, open_editors_provider, shared_context_state } =
5150
await context_initialization(context)
5251

5352
websocket_server_instance = new WebSocketManager(context)
@@ -74,7 +73,8 @@ export async function activate(context: vscode.ExtensionContext) {
7473
workspace_provider,
7574
open_editors_provider,
7675
context,
77-
websocket_server_instance
76+
websocket_server_instance,
77+
shared_context_state
7878
})
7979

8080
const api_manager = new ApiManager(panel_provider)
@@ -182,11 +182,11 @@ export async function activate(context: vscode.ExtensionContext) {
182182
),
183183
vscode.commands.registerCommand(
184184
'codeWebChat.undoContextSelection',
185-
async () => SharedFileState.get_instance().undo()
185+
async () => shared_context_state.undo()
186186
),
187187
vscode.commands.registerCommand(
188188
'codeWebChat.redoContextSelection',
189-
async () => SharedFileState.get_instance().redo()
189+
async () => shared_context_state.redo()
190190
),
191191
vscode.commands.registerCommand(
192192
'codeWebChat.openInIntegratedTerminal',

‎apps/editor/src/views/panel/backend/panel-provider.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,15 @@ import { CancelTokenSource } from 'axios'
129129
import { dictionary } from '@shared/constants/dictionary'
130130
import { DEFAULT_CONTEXT_SIZE_WARNING_THRESHOLD } from '@/constants/values'
131131
import { ModelProvidersManager } from '@/services/model-providers-manager'
132-
import { SharedFileState } from '@/context/shared-file-state'
132+
import { SharedContextState } from '@/context/shared-context-state'
133133

134134
export class PanelProvider implements vscode.WebviewViewProvider {
135135
public readonly extension_uri: vscode.Uri
136136
public readonly workspace_provider: WorkspaceProvider
137137
public readonly open_editors_provider: OpenEditorsProvider
138138
public readonly context: vscode.ExtensionContext
139139
public readonly websocket_server_instance: WebSocketManager
140+
public readonly shared_context_state: SharedContextState
140141
private _webview_view: vscode.WebviewView | undefined
141142
private _config_listener: vscode.Disposable | undefined
142143
public currently_open_file_path?: string
@@ -282,7 +283,7 @@ export class PanelProvider implements vscode.WebviewViewProvider {
282283
const is_no_context =
283284
this.mode == MODE.WEB && this.web_prompt_type == 'no-context'
284285

285-
SharedFileState.get_instance().switch_context_state(is_find_relevant_files)
286+
this.shared_context_state.switch_context_state(is_find_relevant_files)
286287

287288
this.workspace_provider.set_no_context_mode(is_no_context)
288289
this.open_editors_provider.set_no_context_mode(is_no_context)
@@ -385,12 +386,14 @@ export class PanelProvider implements vscode.WebviewViewProvider {
385386
open_editors_provider: OpenEditorsProvider
386387
context: vscode.ExtensionContext
387388
websocket_server_instance: WebSocketManager
389+
shared_context_state: SharedContextState
388390
}) {
389391
this.extension_uri = params.extension_uri
390392
this.workspace_provider = params.workspace_provider
391393
this.open_editors_provider = params.open_editors_provider
392394
this.context = params.context
393395
this.websocket_server_instance = params.websocket_server_instance
396+
this.shared_context_state = params.shared_context_state
394397

395398
this.websocket_server_instance.on_connection_status_change((connected) => {
396399
if (this._webview_view) {

0 commit comments

Comments
 (0)