@@ -15,7 +15,7 @@ import { DebugSessionUUID, ExtHostDebugServiceShape, IBreakpointsDeltaDto, IThre
15
15
import { IExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs' ;
16
16
import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService' ;
17
17
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' ;
19
19
import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace' ;
20
20
import { AbstractDebugAdapter } from 'vs/workbench/contrib/debug/common/abstractDebugAdapter' ;
21
21
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 {
44
44
onDidReceiveDebugSessionCustomEvent : Event < vscode . DebugSessionCustomEvent > ;
45
45
onDidChangeBreakpoints : Event < vscode . BreakpointsChangeEvent > ;
46
46
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 ;
49
49
50
50
addBreakpoints ( breakpoints0 : readonly vscode . Breakpoint [ ] ) : Promise < void > ;
51
51
removeBreakpoints ( breakpoints0 : readonly vscode . Breakpoint [ ] ) : Promise < void > ;
@@ -97,8 +97,8 @@ export abstract class ExtHostDebugServiceBase implements IExtHostDebugService, E
97
97
98
98
private readonly _onDidChangeBreakpoints : Emitter < vscode . BreakpointsChangeEvent > ;
99
99
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 > ;
102
102
103
103
private _debugAdapters : Map < number , IDebugAdapter > ;
104
104
private _debugAdaptersTrackers : Map < number , vscode . DebugAdapterTracker > ;
@@ -144,7 +144,7 @@ export abstract class ExtHostDebugServiceBase implements IExtHostDebugService, E
144
144
145
145
this . _onDidChangeBreakpoints = new Emitter < vscode . BreakpointsChangeEvent > ( ) ;
146
146
147
- this . _onDidChangeActiveStackItem = new Emitter < vscode . Thread | vscode . StackFrame | undefined > ( ) ;
147
+ this . _onDidChangeActiveStackItem = new Emitter < vscode . DebugThread | vscode . DebugStackFrame | undefined > ( ) ;
148
148
149
149
this . _activeDebugConsole = new ExtHostDebugConsole ( this . _debugServiceProxy ) ;
150
150
@@ -278,11 +278,11 @@ export abstract class ExtHostDebugServiceBase implements IExtHostDebugService, E
278
278
// extension debug API
279
279
280
280
281
- get activeStackItem ( ) : vscode . Thread | vscode . StackFrame | undefined {
281
+ get activeStackItem ( ) : vscode . DebugThread | vscode . DebugStackFrame | undefined {
282
282
return this . _activeStackItem ;
283
283
}
284
284
285
- get onDidChangeActiveStackItem ( ) : Event < vscode . Thread | vscode . StackFrame | undefined > {
285
+ get onDidChangeActiveStackItem ( ) : Event < vscode . DebugThread | vscode . DebugStackFrame | undefined > {
286
286
return this . _onDidChangeActiveStackItem . event ;
287
287
}
288
288
@@ -769,13 +769,13 @@ export abstract class ExtHostDebugServiceBase implements IExtHostDebugService, E
769
769
}
770
770
771
771
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 ;
773
773
if ( focusDto ) {
774
774
const session = await this . getSession ( focusDto . sessionId ) ;
775
775
if ( focusDto . kind === 'thread' ) {
776
- focus = new Thread ( session . api , focusDto . threadId ) ;
776
+ focus = new DebugThread ( session . api , focusDto . threadId ) ;
777
777
} else {
778
- focus = new StackFrame ( session . api , focusDto . threadId , focusDto . frameId ) ;
778
+ focus = new DebugStackFrame ( session . api , focusDto . threadId , focusDto . frameId ) ;
779
779
}
780
780
}
781
781
0 commit comments