Skip to content

Commit f09f068

Browse files
authored
debug: update debugFocus class names (microsoft#210788)
1 parent f861341 commit f09f068

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

src/vs/workbench/api/common/extHost.api.impl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1693,8 +1693,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
16931693
InteractiveSessionVoteDirection: extHostTypes.InteractiveSessionVoteDirection,
16941694
ChatCopyKind: extHostTypes.ChatCopyKind,
16951695
InteractiveEditorResponseFeedbackKind: extHostTypes.InteractiveEditorResponseFeedbackKind,
1696-
StackFrame: extHostTypes.StackFrame,
1697-
Thread: extHostTypes.Thread,
1696+
DebugStackFrame: extHostTypes.DebugStackFrame,
1697+
DebugThread: extHostTypes.DebugThread,
16981698
RelatedInformationType: extHostTypes.RelatedInformationType,
16991699
SpeechToTextStatus: extHostTypes.SpeechToTextStatus,
17001700
PartialAcceptTriggerKind: extHostTypes.PartialAcceptTriggerKind,

src/vs/workbench/api/common/extHostDebugService.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { DebugSessionUUID, ExtHostDebugServiceShape, IBreakpointsDeltaDto, IThre
1515
import { IExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
1616
import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
1717
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
18-
import { Breakpoint, DataBreakpoint, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, Disposable, FunctionBreakpoint, Location, Position, setBreakpointId, SourceBreakpoint, Thread, StackFrame, ThemeIcon } from 'vs/workbench/api/common/extHostTypes';
18+
import { Breakpoint, DataBreakpoint, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, Disposable, FunctionBreakpoint, Location, Position, setBreakpointId, SourceBreakpoint, DebugThread, DebugStackFrame, ThemeIcon } from 'vs/workbench/api/common/extHostTypes';
1919
import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
2020
import { AbstractDebugAdapter } from 'vs/workbench/contrib/debug/common/abstractDebugAdapter';
2121
import { MainThreadDebugVisualization, IAdapterDescriptor, IConfig, IDebugAdapter, IDebugAdapterExecutable, IDebugAdapterNamedPipeServer, IDebugAdapterServer, IDebugVisualization, IDebugVisualizationContext, IDebuggerContribution, DebugVisualizationType, IDebugVisualizationTreeItem } from 'vs/workbench/contrib/debug/common/debug';
@@ -44,8 +44,8 @@ export interface IExtHostDebugService extends ExtHostDebugServiceShape {
4444
onDidReceiveDebugSessionCustomEvent: Event<vscode.DebugSessionCustomEvent>;
4545
onDidChangeBreakpoints: Event<vscode.BreakpointsChangeEvent>;
4646
breakpoints: vscode.Breakpoint[];
47-
onDidChangeActiveStackItem: Event<vscode.Thread | vscode.StackFrame | undefined>;
48-
activeStackItem: vscode.Thread | vscode.StackFrame | undefined;
47+
onDidChangeActiveStackItem: Event<vscode.DebugThread | vscode.DebugStackFrame | undefined>;
48+
activeStackItem: vscode.DebugThread | vscode.DebugStackFrame | undefined;
4949

5050
addBreakpoints(breakpoints0: readonly vscode.Breakpoint[]): Promise<void>;
5151
removeBreakpoints(breakpoints0: readonly vscode.Breakpoint[]): Promise<void>;
@@ -97,8 +97,8 @@ export abstract class ExtHostDebugServiceBase implements IExtHostDebugService, E
9797

9898
private readonly _onDidChangeBreakpoints: Emitter<vscode.BreakpointsChangeEvent>;
9999

100-
private _activeStackItem: vscode.Thread | vscode.StackFrame | undefined;
101-
private readonly _onDidChangeActiveStackItem: Emitter<vscode.Thread | vscode.StackFrame | undefined>;
100+
private _activeStackItem: vscode.DebugThread | vscode.DebugStackFrame | undefined;
101+
private readonly _onDidChangeActiveStackItem: Emitter<vscode.DebugThread | vscode.DebugStackFrame | undefined>;
102102

103103
private _debugAdapters: Map<number, IDebugAdapter>;
104104
private _debugAdaptersTrackers: Map<number, vscode.DebugAdapterTracker>;
@@ -144,7 +144,7 @@ export abstract class ExtHostDebugServiceBase implements IExtHostDebugService, E
144144

145145
this._onDidChangeBreakpoints = new Emitter<vscode.BreakpointsChangeEvent>();
146146

147-
this._onDidChangeActiveStackItem = new Emitter<vscode.Thread | vscode.StackFrame | undefined>();
147+
this._onDidChangeActiveStackItem = new Emitter<vscode.DebugThread | vscode.DebugStackFrame | undefined>();
148148

149149
this._activeDebugConsole = new ExtHostDebugConsole(this._debugServiceProxy);
150150

@@ -278,11 +278,11 @@ export abstract class ExtHostDebugServiceBase implements IExtHostDebugService, E
278278
// extension debug API
279279

280280

281-
get activeStackItem(): vscode.Thread | vscode.StackFrame | undefined {
281+
get activeStackItem(): vscode.DebugThread | vscode.DebugStackFrame | undefined {
282282
return this._activeStackItem;
283283
}
284284

285-
get onDidChangeActiveStackItem(): Event<vscode.Thread | vscode.StackFrame | undefined> {
285+
get onDidChangeActiveStackItem(): Event<vscode.DebugThread | vscode.DebugStackFrame | undefined> {
286286
return this._onDidChangeActiveStackItem.event;
287287
}
288288

@@ -769,13 +769,13 @@ export abstract class ExtHostDebugServiceBase implements IExtHostDebugService, E
769769
}
770770

771771
public async $acceptStackFrameFocus(focusDto: IThreadFocusDto | IStackFrameFocusDto | undefined): Promise<void> {
772-
let focus: vscode.Thread | vscode.StackFrame | undefined;
772+
let focus: vscode.DebugThread | vscode.DebugStackFrame | undefined;
773773
if (focusDto) {
774774
const session = await this.getSession(focusDto.sessionId);
775775
if (focusDto.kind === 'thread') {
776-
focus = new Thread(session.api, focusDto.threadId);
776+
focus = new DebugThread(session.api, focusDto.threadId);
777777
} else {
778-
focus = new StackFrame(session.api, focusDto.threadId, focusDto.frameId);
778+
focus = new DebugStackFrame(session.api, focusDto.threadId, focusDto.frameId);
779779
}
780780
}
781781

src/vs/workbench/api/common/extHostTypes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3099,14 +3099,14 @@ export class DebugAdapterInlineImplementation implements vscode.DebugAdapterInli
30993099
}
31003100

31013101

3102-
export class StackFrame implements vscode.StackFrame {
3102+
export class DebugStackFrame implements vscode.DebugStackFrame {
31033103
constructor(
31043104
public readonly session: vscode.DebugSession,
31053105
readonly threadId: number,
31063106
readonly frameId: number) { }
31073107
}
31083108

3109-
export class Thread implements vscode.Thread {
3109+
export class DebugThread implements vscode.DebugThread {
31103110
constructor(
31113111
public readonly session: vscode.DebugSession,
31123112
readonly threadId: number) { }

src/vscode-dts/vscode.proposed.debugFocus.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ declare module 'vscode' {
77

88
// See https://github.com/microsoft/vscode/issues/63943
99

10-
export class Thread {
10+
export class DebugThread {
1111
/**
1212
* Create a ThreadFocus
1313
* @param session
@@ -26,7 +26,7 @@ declare module 'vscode' {
2626
readonly threadId: number;
2727
}
2828

29-
export class StackFrame {
29+
export class DebugStackFrame {
3030
/**
3131
* Create a StackFrameFocus
3232
* @param session
@@ -56,11 +56,11 @@ declare module 'vscode' {
5656
* The currently focused thread or stack frame, or `undefined` if no
5757
* thread or stack is focused.
5858
*/
59-
export const activeStackItem: Thread | StackFrame | undefined;
59+
export const activeStackItem: DebugThread | DebugStackFrame | undefined;
6060

6161
/**
6262
* An event which fires when the {@link debug.activeStackItem} has changed.
6363
*/
64-
export const onDidChangeActiveStackItem: Event<Thread | StackFrame | undefined>;
64+
export const onDidChangeActiveStackItem: Event<DebugThread | DebugStackFrame | undefined>;
6565
}
6666
}

0 commit comments

Comments
 (0)