@theia/plugin-ext 1.70.0-next.81 → 1.71.0-next.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/main/browser/debug/debug-main.d.ts.map +1 -1
  2. package/lib/main/browser/debug/debug-main.js +21 -41
  3. package/lib/main/browser/debug/debug-main.js.map +1 -1
  4. package/package.json +30 -30
  5. package/src/main/browser/debug/debug-main.ts +25 -42
package/lib/main/browser/debug/debug-main.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"debug-main.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/debug/debug-main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-main.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/debug/debug-main.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EACH,oCAAoC,EACpC,SAAS,EAGZ,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,UAAU,EAAsC,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAMvH,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAStD,OAAO,EAAE,UAAU,EAAwB,MAAM,mCAAmC,CAAC;AASrF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAqB5D,qBAAa,aAAc,YAAW,SAAS,EAAE,UAAU;IA0BzB,QAAQ,CAAC,cAAc,EAAE,cAAc;IAzBrE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsB;IACrD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IACvD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwB;IAC9D,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA4B;IACjE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAC5D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAA4C;IAC3F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IACxD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA0C;IACpF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAEhD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA2C;IACjF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA2C;IAClF,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;gBAE5C,GAAG,EAAE,WAAW,EAAW,cAAc,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS;IA4CtG,OAAO,IAAI,IAAI;IAIT,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnD,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOvD,6BAA6B,CAAC,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2C9E,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOxE,mCAAmC,CAAC,WAAW,EAAE,oCAAoC,GAAG,IAAI;IActF,qCAAqC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpE,eAAe,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCzD,2BAA2B,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,GAAG,SAAS,CAAC;IAInH,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC;IAS/F,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,EAAE,mBAAmB,EAAE,MAAM,GAAG,kBAAkB,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmCtJ,cAAc,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWvD,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,0BAA0B;CA0BrC"}
package/lib/main/browser/debug/debug-main.js CHANGED
@@ -21,7 +21,6 @@ const debug_session_manager_1 = require("@theia/debug/lib/browser/debug-session-
21
21
  const browser_1 = require("@theia/core/lib/browser");
22
22
  const browser_2 = require("@theia/editor/lib/browser");
23
23
  const breakpoint_manager_1 = require("@theia/debug/lib/browser/breakpoint/breakpoint-manager");
24
- const debug_source_breakpoint_1 = require("@theia/debug/lib/browser/model/debug-source-breakpoint");
25
24
  const vscode_uri_1 = require("@theia/core/shared/vscode-uri");
26
25
  const debug_configuration_manager_1 = require("@theia/debug/lib/browser/debug-configuration-manager");
27
26
  const terminal_service_1 = require("@theia/terminal/lib/browser/base/terminal-service");
@@ -35,7 +34,6 @@ const disposable_1 = require("@theia/core/lib/common/disposable");
35
34
  const plugin_debug_session_factory_1 = require("./plugin-debug-session-factory");
36
35
  const plugin_debug_service_1 = require("./plugin-debug-service");
37
36
  const hosted_plugin_1 = require("../../../hosted/browser/hosted-plugin");
38
- const debug_function_breakpoint_1 = require("@theia/debug/lib/browser/model/debug-function-breakpoint");
39
37
  const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
40
38
  const console_session_manager_1 = require("@theia/console/lib/browser/console-session-manager");
41
39
  const debug_console_session_1 = require("@theia/debug/lib/browser/console/debug-console-session");
@@ -44,6 +42,17 @@ const debug_contribution_1 = require("@theia/debug/lib/browser/debug-contributio
44
42
  const browser_3 = require("@theia/workspace/lib/browser");
45
43
  const debug_session_options_1 = require("@theia/debug/lib/browser/debug-session-options");
46
44
  const test_service_1 = require("@theia/test/lib/browser/test-service");
45
+ function toOrigin(input) {
46
+ return input.origin;
47
+ }
48
+ function eventToOrigins({ added, removed, changed, uri }) {
49
+ return {
50
+ uri,
51
+ added: added.map(toOrigin),
52
+ removed: removed.map(toOrigin),
53
+ changed: changed.map(toOrigin)
54
+ };
55
+ }
47
56
  class DebugMainImpl {
48
57
  constructor(rpc, connectionMain, container) {
49
58
  this.connectionMain = connectionMain;
@@ -72,11 +81,11 @@ class DebugMainImpl {
72
81
  const fireDidChangeBreakpoints = ({ added, removed, changed }) => {
73
82
  this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(added), removed.map(b => b.id), this.toTheiaPluginApiBreakpoints(changed));
74
83
  };
75
- this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(this.breakpointsManager.getBreakpoints()), [], []);
76
- this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(this.breakpointsManager.getFunctionBreakpoints()), [], []);
84
+ this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(this.breakpointsManager.getBreakpoints().map(bp => bp.origin)), [], []);
85
+ this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(this.breakpointsManager.getFunctionBreakpoints().map(bp => bp.origin)), [], []);
77
86
  this.toDispose.pushAll([
78
- this.breakpointsManager.onDidChangeBreakpoints(fireDidChangeBreakpoints),
79
- this.breakpointsManager.onDidChangeFunctionBreakpoints(fireDidChangeBreakpoints),
87
+ this.breakpointsManager.onDidChangeBreakpoints(e => fireDidChangeBreakpoints(eventToOrigins(e))),
88
+ this.breakpointsManager.onDidChangeFunctionBreakpoints(e => fireDidChangeBreakpoints(eventToOrigins(e))),
80
89
  this.sessionManager.onDidCreateDebugSession(debugSession => this.debugExt.$sessionDidCreate(debugSession.id)),
81
90
  this.sessionManager.onDidStartDebugSession(debugSession => this.debugExt.$sessionDidStart(debugSession.id)),
82
91
  this.sessionManager.onDidDestroyDebugSession(debugSession => this.debugExt.$sessionDidDestroy(debugSession.id)),
@@ -144,16 +153,9 @@ class DebugMainImpl {
144
153
  async $addBreakpoints(breakpoints) {
145
154
  const newBreakpoints = new Map();
146
155
  breakpoints.forEach(b => newBreakpoints.set(b.id, b));
147
- this.breakpointsManager.findMarkers({
148
- dataFilter: data => {
149
- // install only new breakpoints
150
- if (newBreakpoints.has(data.id)) {
151
- newBreakpoints.delete(data.id);
152
- }
153
- return false;
154
- }
155
- });
156
- let addedFunctionBreakpoints = false;
156
+ for (const bp of this.breakpointsManager.getBreakpoints()) {
157
+ newBreakpoints.delete(bp.id);
158
+ }
157
159
  const functionBreakpoints = this.breakpointsManager.getFunctionBreakpoints();
158
160
  for (const breakpoint of functionBreakpoints) {
159
161
  // install only new breakpoints
@@ -179,8 +181,7 @@ class DebugMainImpl {
179
181
  });
180
182
  }
181
183
  else if (breakpoint.functionName) {
182
- addedFunctionBreakpoints = true;
183
- functionBreakpoints.push({
184
+ this.breakpointsManager.addFunctionBreakpoint({
184
185
  id: breakpoint.id,
185
186
  enabled: breakpoint.enabled,
186
187
  raw: {
@@ -189,33 +190,12 @@ class DebugMainImpl {
189
190
  });
190
191
  }
191
192
  }
192
- if (addedFunctionBreakpoints) {
193
- this.breakpointsManager.setFunctionBreakpoints(functionBreakpoints);
194
- }
195
193
  }
196
194
  async $getDebugProtocolBreakpoint(sessionId, breakpointId) {
197
- const session = this.sessionManager.getSession(sessionId);
198
- if (session) {
199
- return session.getBreakpoint(breakpointId)?.raw;
200
- }
201
- else {
202
- throw new Error(`Debug session '${sessionId}' not found`);
203
- }
195
+ return this.breakpointsManager.getBreakpointById(breakpointId)?.getDebugProtocolBreakpoint(sessionId);
204
196
  }
205
197
  async $removeBreakpoints(breakpoints) {
206
- const { labelProvider, breakpointsManager, editorManager } = this;
207
- const session = this.sessionManager.currentSession;
208
- const ids = new Set(breakpoints);
209
- for (const origin of this.breakpointsManager.findMarkers({ dataFilter: data => ids.has(data.id) })) {
210
- const breakpoint = new debug_source_breakpoint_1.DebugSourceBreakpoint(origin.data, { labelProvider, breakpoints: breakpointsManager, editorManager, session }, this.commandService);
211
- breakpoint.remove();
212
- }
213
- for (const origin of this.breakpointsManager.getFunctionBreakpoints()) {
214
- if (ids.has(origin.id)) {
215
- const breakpoint = new debug_function_breakpoint_1.DebugFunctionBreakpoint(origin, { labelProvider, breakpoints: breakpointsManager, editorManager, session });
216
- breakpoint.remove();
217
- }
218
- }
198
+ this.breakpointsManager.removeBreakpointsById(breakpoints);
219
199
  }
220
200
  async $customRequest(sessionId, command, args) {
221
201
  const session = this.sessionManager.getSession(sessionId);
package/lib/main/browser/debug/debug-main.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"debug-main.js","sourceRoot":"","sources":["../../../../src/main/browser/debug/debug-main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-main.js","sourceRoot":"","sources":["../../../../src/main/browser/debug/debug-main.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,38 +1,38 @@
1
1
  {
2
2
  "name": "@theia/plugin-ext",
3
- "version": "1.70.0-next.81+463fd57c3",
3
+ "version": "1.71.0-next.0+4ef126fca",
4
4
  "description": "Theia - Plugin Extension",
5
5
  "main": "lib/common/index.js",
6
6
  "typings": "lib/common/index.d.ts",
7
7
  "dependencies": {
8
- "@theia/ai-mcp": "1.70.0-next.81+463fd57c3",
9
- "@theia/bulk-edit": "1.70.0-next.81+463fd57c3",
10
- "@theia/callhierarchy": "1.70.0-next.81+463fd57c3",
11
- "@theia/console": "1.70.0-next.81+463fd57c3",
12
- "@theia/core": "1.70.0-next.81+463fd57c3",
13
- "@theia/debug": "1.70.0-next.81+463fd57c3",
14
- "@theia/editor": "1.70.0-next.81+463fd57c3",
15
- "@theia/editor-preview": "1.70.0-next.81+463fd57c3",
16
- "@theia/file-search": "1.70.0-next.81+463fd57c3",
17
- "@theia/filesystem": "1.70.0-next.81+463fd57c3",
18
- "@theia/markers": "1.70.0-next.81+463fd57c3",
19
- "@theia/messages": "1.70.0-next.81+463fd57c3",
20
- "@theia/monaco": "1.70.0-next.81+463fd57c3",
8
+ "@theia/ai-mcp": "1.71.0-next.0+4ef126fca",
9
+ "@theia/bulk-edit": "1.71.0-next.0+4ef126fca",
10
+ "@theia/callhierarchy": "1.71.0-next.0+4ef126fca",
11
+ "@theia/console": "1.71.0-next.0+4ef126fca",
12
+ "@theia/core": "1.71.0-next.0+4ef126fca",
13
+ "@theia/debug": "1.71.0-next.0+4ef126fca",
14
+ "@theia/editor": "1.71.0-next.0+4ef126fca",
15
+ "@theia/editor-preview": "1.71.0-next.0+4ef126fca",
16
+ "@theia/file-search": "1.71.0-next.0+4ef126fca",
17
+ "@theia/filesystem": "1.71.0-next.0+4ef126fca",
18
+ "@theia/markers": "1.71.0-next.0+4ef126fca",
19
+ "@theia/messages": "1.71.0-next.0+4ef126fca",
20
+ "@theia/monaco": "1.71.0-next.0+4ef126fca",
21
21
  "@theia/monaco-editor-core": "1.108.201",
22
- "@theia/navigator": "1.70.0-next.81+463fd57c3",
23
- "@theia/notebook": "1.70.0-next.81+463fd57c3",
24
- "@theia/output": "1.70.0-next.81+463fd57c3",
25
- "@theia/plugin": "1.70.0-next.81+463fd57c3",
26
- "@theia/preferences": "1.70.0-next.81+463fd57c3",
27
- "@theia/scm": "1.70.0-next.81+463fd57c3",
28
- "@theia/search-in-workspace": "1.70.0-next.81+463fd57c3",
29
- "@theia/task": "1.70.0-next.81+463fd57c3",
30
- "@theia/terminal": "1.70.0-next.81+463fd57c3",
31
- "@theia/test": "1.70.0-next.81+463fd57c3",
32
- "@theia/timeline": "1.70.0-next.81+463fd57c3",
33
- "@theia/typehierarchy": "1.70.0-next.81+463fd57c3",
34
- "@theia/variable-resolver": "1.70.0-next.81+463fd57c3",
35
- "@theia/workspace": "1.70.0-next.81+463fd57c3",
22
+ "@theia/navigator": "1.71.0-next.0+4ef126fca",
23
+ "@theia/notebook": "1.71.0-next.0+4ef126fca",
24
+ "@theia/output": "1.71.0-next.0+4ef126fca",
25
+ "@theia/plugin": "1.71.0-next.0+4ef126fca",
26
+ "@theia/preferences": "1.71.0-next.0+4ef126fca",
27
+ "@theia/scm": "1.71.0-next.0+4ef126fca",
28
+ "@theia/search-in-workspace": "1.71.0-next.0+4ef126fca",
29
+ "@theia/task": "1.71.0-next.0+4ef126fca",
30
+ "@theia/terminal": "1.71.0-next.0+4ef126fca",
31
+ "@theia/test": "1.71.0-next.0+4ef126fca",
32
+ "@theia/timeline": "1.71.0-next.0+4ef126fca",
33
+ "@theia/typehierarchy": "1.71.0-next.0+4ef126fca",
34
+ "@theia/variable-resolver": "1.71.0-next.0+4ef126fca",
35
+ "@theia/workspace": "1.71.0-next.0+4ef126fca",
36
36
  "@types/mime": "^2.0.1",
37
37
  "@vscode/debugprotocol": "^1.51.0",
38
38
  "@vscode/proxy-agent": "^0.13.2",
@@ -89,7 +89,7 @@
89
89
  "watch": "theiaext watch"
90
90
  },
91
91
  "devDependencies": {
92
- "@theia/ext-scripts": "1.69.0",
92
+ "@theia/ext-scripts": "1.70.0",
93
93
  "@types/decompress": "^4.2.2",
94
94
  "@types/escape-html": "^0.0.20",
95
95
  "@types/lodash.clonedeep": "^4.5.3"
@@ -97,5 +97,5 @@
97
97
  "nyc": {
98
98
  "extends": "../../configs/nyc.json"
99
99
  },
100
- "gitHead": "463fd57c374c371bbe48ade992af724cf143fb6a"
100
+ "gitHead": "4ef126fca6dbb6970e87d9d7749c599c4fcfe116"
101
101
  }
package/src/main/browser/debug/debug-main.ts CHANGED
@@ -29,9 +29,8 @@ import { Breakpoint, DebugStackFrameDTO, DebugThreadDTO, WorkspaceFolder } from
29
29
  import { LabelProvider } from '@theia/core/lib/browser';
30
30
  import { EditorManager } from '@theia/editor/lib/browser';
31
31
  import { BreakpointManager, BreakpointsChangeEvent } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
32
- import { DebugSourceBreakpoint } from '@theia/debug/lib/browser/model/debug-source-breakpoint';
33
32
  import { URI as Uri } from '@theia/core/shared/vscode-uri';
34
- import { SourceBreakpoint, FunctionBreakpoint } from '@theia/debug/lib/browser/breakpoint/breakpoint-marker';
33
+ import { SourceBreakpoint, FunctionBreakpoint, BaseBreakpoint } from '@theia/debug/lib/browser/breakpoint/breakpoint-marker';
35
34
  import { DebugConfiguration, DebugSessionOptions } from '@theia/debug/lib/common/debug-configuration';
36
35
  import { DebuggerDescription } from '@theia/debug/lib/common/debug-service';
37
36
  import { DebugProtocol } from '@vscode/debugprotocol';
@@ -47,7 +46,6 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
47
46
  import { PluginDebugSessionFactory } from './plugin-debug-session-factory';
48
47
  import { PluginDebugService } from './plugin-debug-service';
49
48
  import { HostedPluginSupport } from '../../../hosted/browser/hosted-plugin';
50
- import { DebugFunctionBreakpoint } from '@theia/debug/lib/browser/model/debug-function-breakpoint';
51
49
  import { FileService } from '@theia/filesystem/lib/browser/file-service';
52
50
  import { ConsoleSessionManager } from '@theia/console/lib/browser/console-session-manager';
53
51
  import { DebugConsoleSession } from '@theia/debug/lib/browser/console/debug-console-session';
@@ -59,6 +57,20 @@ import { DebugSessionOptions as TheiaDebugSessionOptions } from '@theia/debug/li
59
57
  import { DebugStackFrame } from '@theia/debug/lib/browser/model/debug-stack-frame';
60
58
  import { DebugThread } from '@theia/debug/lib/browser/model/debug-thread';
61
59
  import { TestService } from '@theia/test/lib/browser/test-service';
60
+ import { DebugBreakpoint } from '@theia/debug/lib/browser/model/debug-breakpoint';
61
+
62
+ function toOrigin<T extends BaseBreakpoint>(input: DebugBreakpoint<T>): T {
63
+ return input.origin;
64
+ }
65
+
66
+ function eventToOrigins<T extends BaseBreakpoint>({ added, removed, changed, uri }: BreakpointsChangeEvent<DebugBreakpoint<T>>): BreakpointsChangeEvent<T> {
67
+ return {
68
+ uri,
69
+ added: added.map(toOrigin),
70
+ removed: removed.map(toOrigin),
71
+ changed: changed.map(toOrigin)
72
+ };
73
+ }
62
74
 
63
75
  export class DebugMainImpl implements DebugMain, Disposable {
64
76
  private readonly debugExt: DebugExt;
@@ -114,12 +126,12 @@ export class DebugMainImpl implements DebugMain, Disposable {
114
126
  this.toTheiaPluginApiBreakpoints(changed)
115
127
  );
116
128
  };
117
- this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(this.breakpointsManager.getBreakpoints()), [], []);
118
- this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(this.breakpointsManager.getFunctionBreakpoints()), [], []);
129
+ this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(this.breakpointsManager.getBreakpoints().map(bp => bp.origin)), [], []);
130
+ this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(this.breakpointsManager.getFunctionBreakpoints().map(bp => bp.origin)), [], []);
119
131
 
120
132
  this.toDispose.pushAll([
121
- this.breakpointsManager.onDidChangeBreakpoints(fireDidChangeBreakpoints),
122
- this.breakpointsManager.onDidChangeFunctionBreakpoints(fireDidChangeBreakpoints),
133
+ this.breakpointsManager.onDidChangeBreakpoints(e => fireDidChangeBreakpoints(eventToOrigins(e))),
134
+ this.breakpointsManager.onDidChangeFunctionBreakpoints(e => fireDidChangeBreakpoints(eventToOrigins(e))),
123
135
  this.sessionManager.onDidCreateDebugSession(debugSession => this.debugExt.$sessionDidCreate(debugSession.id)),
124
136
  this.sessionManager.onDidStartDebugSession(debugSession => this.debugExt.$sessionDidStart(debugSession.id)),
125
137
  this.sessionManager.onDidDestroyDebugSession(debugSession => this.debugExt.$sessionDidDestroy(debugSession.id)),
@@ -222,16 +234,9 @@ export class DebugMainImpl implements DebugMain, Disposable {
222
234
  async $addBreakpoints(breakpoints: Breakpoint[]): Promise<void> {
223
235
  const newBreakpoints = new Map<string, Breakpoint>();
224
236
  breakpoints.forEach(b => newBreakpoints.set(b.id, b));
225
- this.breakpointsManager.findMarkers({
226
- dataFilter: data => {
227
- // install only new breakpoints
228
- if (newBreakpoints.has(data.id)) {
229
- newBreakpoints.delete(data.id);
230
- }
231
- return false;
232
- }
233
- });
234
- let addedFunctionBreakpoints = false;
237
+ for (const bp of this.breakpointsManager.getBreakpoints()) {
238
+ newBreakpoints.delete(bp.id);
239
+ }
235
240
  const functionBreakpoints = this.breakpointsManager.getFunctionBreakpoints();
236
241
  for (const breakpoint of functionBreakpoints) {
237
242
  // install only new breakpoints
@@ -256,8 +261,7 @@ export class DebugMainImpl implements DebugMain, Disposable {
256
261
  }
257
262
  });
258
263
  } else if (breakpoint.functionName) {
259
- addedFunctionBreakpoints = true;
260
- functionBreakpoints.push({
264
+ this.breakpointsManager.addFunctionBreakpoint({
261
265
  id: breakpoint.id,
262
266
  enabled: breakpoint.enabled,
263
267
  raw: {
@@ -266,35 +270,14 @@ export class DebugMainImpl implements DebugMain, Disposable {
266
270
  });
267
271
  }
268
272
  }
269
- if (addedFunctionBreakpoints) {
270
- this.breakpointsManager.setFunctionBreakpoints(functionBreakpoints);
271
- }
272
273
  }
273
274
 
274
275
  async $getDebugProtocolBreakpoint(sessionId: string, breakpointId: string): Promise<DebugProtocol.Breakpoint | undefined> {
275
- const session = this.sessionManager.getSession(sessionId);
276
- if (session) {
277
- return session.getBreakpoint(breakpointId)?.raw;
278
- } else {
279
- throw new Error(`Debug session '${sessionId}' not found`);
280
- }
276
+ return this.breakpointsManager.getBreakpointById(breakpointId)?.getDebugProtocolBreakpoint(sessionId);
281
277
  }
282
278
 
283
279
  async $removeBreakpoints(breakpoints: string[]): Promise<void> {
284
- const { labelProvider, breakpointsManager, editorManager } = this;
285
- const session = this.sessionManager.currentSession;
286
-
287
- const ids = new Set<string>(breakpoints);
288
- for (const origin of this.breakpointsManager.findMarkers({ dataFilter: data => ids.has(data.id) })) {
289
- const breakpoint = new DebugSourceBreakpoint(origin.data, { labelProvider, breakpoints: breakpointsManager, editorManager, session }, this.commandService);
290
- breakpoint.remove();
291
- }
292
- for (const origin of this.breakpointsManager.getFunctionBreakpoints()) {
293
- if (ids.has(origin.id)) {
294
- const breakpoint = new DebugFunctionBreakpoint(origin, { labelProvider, breakpoints: breakpointsManager, editorManager, session });
295
- breakpoint.remove();
296
- }
297
- }
280
+ this.breakpointsManager.removeBreakpointsById(breakpoints);
298
281
  }
299
282
 
300
283
  async $customRequest(sessionId: string, command: string, args?: any): Promise<DebugProtocol.Response> {