@theia/plugin-ext 1.73.0-next.24 → 1.73.0-next.26

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 (11) hide show
  1. package/lib/main/browser/debug/debug-main.d.ts +1 -11
  2. package/lib/main/browser/debug/debug-main.d.ts.map +1 -1
  3. package/lib/main/browser/debug/debug-main.js +3 -24
  4. package/lib/main/browser/debug/debug-main.js.map +1 -1
  5. package/lib/main/browser/debug/plugin-debug-session-factory.d.ts +7 -44
  6. package/lib/main/browser/debug/plugin-debug-session-factory.d.ts.map +1 -1
  7. package/lib/main/browser/debug/plugin-debug-session-factory.js +29 -35
  8. package/lib/main/browser/debug/plugin-debug-session-factory.js.map +1 -1
  9. package/package.json +29 -29
  10. package/src/main/browser/debug/debug-main.ts +3 -45
  11. package/src/main/browser/debug/plugin-debug-session-factory.ts +25 -71
package/lib/main/browser/debug/debug-main.d.ts CHANGED
@@ -10,24 +10,14 @@ import { ConnectionImpl } from '../../../common/connection';
10
10
  export declare class DebugMainImpl implements DebugMain, Disposable {
11
11
  readonly connectionMain: ConnectionImpl;
12
12
  private readonly debugExt;
13
+ private readonly container;
13
14
  private readonly sessionManager;
14
- private readonly labelProvider;
15
- private readonly editorManager;
16
15
  private readonly breakpointsManager;
17
16
  private readonly consoleSessionManager;
18
17
  private readonly configurationManager;
19
- private readonly terminalService;
20
- private readonly messages;
21
- private readonly outputChannelManager;
22
- private readonly debugPreferences;
23
18
  private readonly sessionContributionRegistrator;
24
19
  private readonly pluginDebugService;
25
- private readonly fileService;
26
20
  private readonly pluginService;
27
- private readonly debugContributionProvider;
28
- private readonly testService;
29
- private readonly workspaceService;
30
- private readonly commandService;
31
21
  private readonly debuggerContributions;
32
22
  private readonly configurationProviders;
33
23
  private readonly toDispose;
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":"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"}
package/lib/main/browser/debug/debug-main.js CHANGED
@@ -18,15 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.DebugMainImpl = void 0;
19
19
  const plugin_api_rpc_1 = require("../../../common/plugin-api-rpc");
20
20
  const debug_session_manager_1 = require("@theia/debug/lib/browser/debug-session-manager");
21
- const browser_1 = require("@theia/core/lib/browser");
22
- const browser_2 = require("@theia/editor/lib/browser");
23
21
  const breakpoint_manager_1 = require("@theia/debug/lib/browser/breakpoint/breakpoint-manager");
24
22
  const vscode_uri_1 = require("@theia/core/shared/vscode-uri");
25
23
  const debug_configuration_manager_1 = require("@theia/debug/lib/browser/debug-configuration-manager");
26
- const terminal_service_1 = require("@theia/terminal/lib/browser/base/terminal-service");
27
- const message_service_protocol_1 = require("@theia/core/lib/common/message-service-protocol");
28
- const output_channel_1 = require("@theia/output/lib/browser/output-channel");
29
- const debug_preferences_1 = require("@theia/debug/lib/common/debug-preferences");
30
24
  const plugin_debug_adapter_contribution_1 = require("./plugin-debug-adapter-contribution");
31
25
  const plugin_debug_configuration_provider_1 = require("./plugin-debug-configuration-provider");
32
26
  const plugin_debug_session_contribution_registry_1 = require("./plugin-debug-session-contribution-registry");
@@ -34,14 +28,9 @@ const disposable_1 = require("@theia/core/lib/common/disposable");
34
28
  const plugin_debug_session_factory_1 = require("./plugin-debug-session-factory");
35
29
  const plugin_debug_service_1 = require("./plugin-debug-service");
36
30
  const hosted_plugin_1 = require("../../../hosted/browser/hosted-plugin");
37
- const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
38
31
  const console_session_manager_1 = require("@theia/console/lib/browser/console-session-manager");
39
32
  const debug_console_session_1 = require("@theia/debug/lib/browser/console/debug-console-session");
40
- const common_1 = require("@theia/core/lib/common");
41
- const debug_contribution_1 = require("@theia/debug/lib/browser/debug-contribution");
42
- const browser_3 = require("@theia/workspace/lib/browser");
43
33
  const debug_session_options_1 = require("@theia/debug/lib/browser/debug-session-options");
44
- const test_service_1 = require("@theia/test/lib/browser/test-service");
45
34
  function toOrigin(input) {
46
35
  return input.origin;
47
36
  }
@@ -60,24 +49,14 @@ class DebugMainImpl {
60
49
  this.configurationProviders = new Map();
61
50
  this.toDispose = new disposable_1.DisposableCollection();
62
51
  this.debugExt = rpc.getProxy(plugin_api_rpc_1.MAIN_RPC_CONTEXT.DEBUG_EXT);
52
+ this.container = container;
63
53
  this.sessionManager = container.get(debug_session_manager_1.DebugSessionManager);
64
- this.labelProvider = container.get(browser_1.LabelProvider);
65
- this.editorManager = container.get(browser_2.EditorManager);
66
54
  this.breakpointsManager = container.get(breakpoint_manager_1.BreakpointManager);
67
55
  this.consoleSessionManager = container.get(console_session_manager_1.ConsoleSessionManager);
68
56
  this.configurationManager = container.get(debug_configuration_manager_1.DebugConfigurationManager);
69
- this.terminalService = container.get(terminal_service_1.TerminalService);
70
- this.messages = container.get(message_service_protocol_1.MessageClient);
71
- this.outputChannelManager = container.get(output_channel_1.OutputChannelManager);
72
- this.debugPreferences = container.get(debug_preferences_1.DebugPreferences);
73
57
  this.pluginDebugService = container.get(plugin_debug_service_1.PluginDebugService);
74
58
  this.sessionContributionRegistrator = container.get(plugin_debug_session_contribution_registry_1.PluginDebugSessionContributionRegistry);
75
- this.debugContributionProvider = container.getNamed(common_1.ContributionProvider, debug_contribution_1.DebugContribution);
76
- this.fileService = container.get(file_service_1.FileService);
77
59
  this.pluginService = container.get(hosted_plugin_1.HostedPluginSupport);
78
- this.testService = container.get(test_service_1.TestService);
79
- this.workspaceService = container.get(browser_3.WorkspaceService);
80
- this.commandService = container.get(common_1.CommandService);
81
60
  const fireDidChangeBreakpoints = ({ added, removed, changed }) => {
82
61
  this.debugExt.$breakpointsDidChange(this.toTheiaPluginApiBreakpoints(added), removed.map(b => b.id), this.toTheiaPluginApiBreakpoints(changed));
83
62
  };
@@ -116,10 +95,10 @@ class DebugMainImpl {
116
95
  if (this.toDispose.disposed) {
117
96
  return;
118
97
  }
119
- const debugSessionFactory = new plugin_debug_session_factory_1.PluginDebugSessionFactory(this.terminalService, this.editorManager, this.breakpointsManager, this.labelProvider, this.messages, this.outputChannelManager, this.debugPreferences, async (sessionId) => {
98
+ const debugSessionFactory = new plugin_debug_session_factory_1.PluginDebugSessionFactory(async (sessionId) => {
120
99
  const connection = await this.connectionMain.ensureConnection(sessionId);
121
100
  return connection;
122
- }, this.fileService, terminalOptionsExt, this.debugContributionProvider, this.testService, this.workspaceService, this.commandService);
101
+ }, terminalOptionsExt, this.container);
123
102
  const toDispose = new disposable_1.DisposableCollection(disposable_1.Disposable.create(() => this.debuggerContributions.delete(debugType)));
124
103
  this.debuggerContributions.set(debugType, toDispose);
125
104
  toDispose.pushAll([
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":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAMhF,mEAKwC;AACxC,0FAAqF;AAErF,+FAAmH;AACnH,8DAA2D;AAK3D,sGAAiG;AACjG,2FAAqF;AACrF,+FAAyF;AACzF,6GAAiJ;AACjJ,kEAAqF;AACrF,iFAA2E;AAC3E,iEAA4D;AAC5D,yEAA4E;AAC5E,gGAA2F;AAC3F,kGAA6F;AAE7F,0FAAiH;AAKjH,SAAS,QAAQ,CAA2B,KAAyB;IACjE,OAAO,KAAK,CAAC,MAAM,CAAC;AACxB,CAAC;AAED,SAAS,cAAc,CAA2B,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAA8C;IAC1H,OAAO;QACH,GAAG;QACH,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC1B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC9B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;KACjC,CAAC;AACN,CAAC;AAED,MAAa,aAAa;IAgBtB,YAAY,GAAgB,EAAW,cAA8B,EAAE,SAA+B;QAA/D,mBAAc,GAAd,cAAc,CAAgB;QAJpD,0BAAqB,GAAG,IAAI,GAAG,EAAgC,CAAC;QAChE,2BAAsB,GAAG,IAAI,GAAG,EAAgC,CAAC;QACjE,cAAS,GAAG,IAAI,iCAAoB,EAAE,CAAC;QAGpD,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,iCAAgB,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,2CAAmB,CAAC,CAAC;QACzD,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC,GAAG,CAAC,sCAAiB,CAAC,CAAC;QAC3D,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC,GAAG,CAAC,+CAAqB,CAAC,CAAC;QAClE,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC;QACrE,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC,GAAG,CAAC,yCAAkB,CAAC,CAAC;QAC5D,IAAI,CAAC,8BAA8B,GAAG,SAAS,CAAC,GAAG,CAAC,mFAAsC,CAAC,CAAC;QAC5F,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,mCAAmB,CAAC,CAAC;QAExD,MAAM,wBAAwB,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAiE,EAAE,EAAE;YAC5H,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAC/B,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,EACvC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACtB,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAC5C,CAAC;QACN,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7I,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAErJ,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACnB,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YAChG,IAAI,CAAC,kBAAkB,CAAC,8BAA8B,CAAC,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YACxG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAC7G,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAC3G,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAC/G,IAAI,CAAC,cAAc,CAAC,6BAA6B,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC9H,IAAI,CAAC,cAAc,CAAC,mCAAmC,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAChJ,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;YACpI,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;SAClI,CAAC,CAAC;IACP,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,KAAa;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC;QAC3D,IAAI,OAAO,YAAY,2CAAmB,EAAE,CAAC;YACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;IACL,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,KAAa;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC;QAC3D,IAAI,OAAO,YAAY,2CAAmB,EAAE,CAAC;YACzC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,WAAgC;QAChE,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;QACnC,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC;QACtF,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC1B,OAAO;QACX,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAI,wDAAyB,CACrD,KAAK,EAAE,SAAiB,EAAE,EAAE;YACxB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACzE,OAAO,UAAU,CAAC;QACtB,CAAC,EACD,kBAAkB,EAClB,IAAI,CAAC,SAAS,CACjB,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,iCAAoB,CACtC,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CACxE,CAAC;QACF,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACrD,SAAS,CAAC,OAAO,CAAC;YACd,IAAI,CAAC,kBAAkB,CAAC,gCAAgC,CACpD,IAAI,kEAA8B,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CACrF;YACD,IAAI,CAAC,8BAA8B,CAAC,gCAAgC,CAAC;gBACjE,SAAS,EAAE,WAAW,CAAC,IAAI;gBAC3B,mBAAmB,EAAE,GAAG,EAAE,CAAC,mBAAmB;aACjD,CAAC;SACL,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACnG,CAAC;IAED,KAAK,CAAC,gCAAgC,CAAC,SAAiB;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,UAAU,EAAE,CAAC;YACb,UAAU,CAAC,OAAO,EAAE,CAAC;QACzB,CAAC;IACL,CAAC;IAED,mCAAmC,CAAC,WAAiD;QACjF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;QAClC,MAAM,SAAS,GAAG,IAAI,iCAAoB,CACtC,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CACtE,CAAC;QACF,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEnD,SAAS,CAAC,IAAI,CACV,IAAI,CAAC,kBAAkB,CAAC,kCAAkC,CAAC,IAAI,sEAAgC,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAC/H,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,qCAAqC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACrG,CAAC;IAED,KAAK,CAAC,qCAAqC,CAAC,MAAc;QACtD,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,UAAU,EAAE,CAAC;YACb,UAAU,CAAC,OAAO,EAAE,CAAC;QACzB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,WAAyB;QAC3C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAsB,CAAC;QACrD,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACtD,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,EAAE,CAAC;YACxD,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;QAC7E,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;YAC3C,+BAA+B;YAC/B,IAAI,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;gBACpC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACzC,CAAC;QACL,CAAC;QACD,KAAK,MAAM,UAAU,IAAI,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YAC/C,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACtB,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;gBACrC,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC;gBACrD,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC;oBAClC,EAAE,EAAE,UAAU,CAAC,EAAE;oBACjB,GAAG,EAAE,gBAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;oBACxC,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,GAAG,EAAE;wBACD,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC;wBACnD,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;wBAC3C,SAAS,EAAE,UAAU,CAAC,SAAS;wBAC/B,YAAY,EAAE,UAAU,CAAC,YAAY;wBACrC,UAAU,EAAE,UAAU,CAAC,UAAU;qBACpC;iBACJ,CAAC,CAAC;YACP,CAAC;iBAAM,IAAI,UAAU,CAAC,YAAY,EAAE,CAAC;gBACjC,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CAAC;oBAC1C,EAAE,EAAE,UAAU,CAAC,EAAE;oBACjB,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,GAAG,EAAE;wBACD,IAAI,EAAE,UAAU,CAAC,YAAY;qBAChC;iBACJ,CAAC,CAAC;YACP,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,SAAiB,EAAE,YAAoB;QACrE,OAAO,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,YAAY,CAAC,EAAE,0BAA0B,CAAC,SAAS,CAAC,CAAC;IAC1G,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,WAAqB;QAC1C,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAiB,EAAE,OAAe,EAAE,IAAU;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,OAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,kBAAkB,SAAS,aAAa,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAmC,EAAE,mBAAgD,EAAE,OAA4B;QACrI,8BAA8B;QAC9B,IAAI,cAAoD,CAAC;QACzD,IAAI,OAAO,mBAAmB,KAAK,QAAQ,EAAE,CAAC;YAC1C,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC;gBACxD,IAAI,aAAa,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;oBAC7C,cAAc,GAAG,aAAa,CAAC;gBACnC,CAAC;YACL,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,cAAc,GAAG;gBACb,IAAI,EAAE,mBAAmB,CAAC,IAAI;gBAC9B,aAAa,EAAE,mBAAmB;aACrC,CAAC;QACN,CAAC;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,uCAAuC,mBAAmB,EAAE,CAAC,CAAC;YAC5E,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,6BAA6B;QAC7B,MAAM,kBAAkB,GAAG,MAAM,IAAI,gBAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvE,IAAI,2CAAwB,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC;YAC3D,cAAc,GAAG,EAAE,GAAG,cAAc,EAAE,aAAa,EAAE,EAAE,GAAG,cAAc,CAAC,aAAa,EAAE,GAAG,OAAO,EAAE,EAAE,kBAAkB,EAAE,CAAC;QAC/H,CAAC;aAAM,CAAC;YACJ,cAAc,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,kBAAkB,EAAE,CAAC;QAC3E,CAAC;QACD,cAAc,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEzC,gBAAgB;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAChE,OAAO,CAAC,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAkB;QACnC,IAAI,SAAS,EAAE,CAAC;YACZ,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAC1D,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,oDAAoD;QACpD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YACjD,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;IACL,CAAC;IAEO,oBAAoB,CAAC,UAAuC;QAChE,OAAO,UAAU,CAAC,CAAC,CAAC;YAChB,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE;YAChC,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ;SACvC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClB,CAAC;IAEO,gBAAgB,CAAC,WAAoC;QACzD,OAAO,WAAW,CAAC,CAAC,CAAC;YACjB,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE;YACjC,QAAQ,EAAE,WAAW,CAAC,QAAQ;SACjC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClB,CAAC;IAEO,2BAA2B,CAAC,WAAsD;QACtF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;IAEO,0BAA0B,CAAC,UAAiD;QAChF,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;YAC3B,OAAO;gBACH,EAAE,EAAE,UAAU,CAAC,EAAE;gBACjB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,SAAS;gBACnC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,YAAY;gBACzC,UAAU,EAAE,GAAG,CAAC,UAAU;gBAC1B,QAAQ,EAAE;oBACN,GAAG,EAAE,gBAAG,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;oBAC9B,KAAK,EAAE;wBACH,eAAe,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC;wBAC7B,WAAW,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC;wBAClC,aAAa,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC;wBAC3B,SAAS,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC;qBACnC;iBACJ;aACJ,CAAC;QACN,CAAC;QACD,OAAO;YACH,EAAE,EAAE,UAAU,CAAC,EAAE;YACjB,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI;SACpC,CAAC;IACN,CAAC;CACJ;AArRD,sCAqRC"}
package/lib/main/browser/debug/plugin-debug-session-factory.d.ts CHANGED
@@ -1,40 +1,15 @@
1
+ import { interfaces } from '@theia/core/shared/inversify';
1
2
  import { DefaultDebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
2
- import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
3
- import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
4
- import { BreakpointManager } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
5
- import { LabelProvider } from '@theia/core/lib/browser/label-provider';
6
- import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
7
- import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
8
- import { DebugPreferences } from '@theia/debug/lib/common/debug-preferences';
9
- import { DebugConfigurationSessionOptions, TestRunReference } from '@theia/debug/lib/browser/debug-session-options';
10
- import { DebugSession } from '@theia/debug/lib/browser/debug-session';
3
+ import { DebugConfigurationSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
4
+ import { DebugSession, DebugSessionData } from '@theia/debug/lib/browser/debug-session';
11
5
  import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
12
6
  import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
13
7
  import { TerminalOptionsExt } from '../../../common/plugin-api-rpc';
14
- import { FileService } from '@theia/filesystem/lib/browser/file-service';
15
- import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
16
- import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
17
- import { WorkspaceService } from '@theia/workspace/lib/browser';
18
8
  import { PluginChannel } from '../../../common/connection';
19
- import { TestService } from '@theia/test/lib/browser/test-service';
20
- import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
21
- import { CommandService } from '@theia/core';
9
+ export declare const PluginTerminalOptionsExt: unique symbol;
22
10
  export declare class PluginDebugSession extends DebugSession {
23
- readonly id: string;
24
- readonly options: DebugConfigurationSessionOptions;
25
- readonly parentSession: DebugSession | undefined;
26
- protected readonly connection: DebugSessionConnection;
27
- protected readonly terminalServer: TerminalService;
28
- protected readonly editorManager: EditorManager;
29
- protected readonly breakpoints: BreakpointManager;
30
- protected readonly labelProvider: LabelProvider;
31
- protected readonly messages: MessageClient;
32
- protected readonly fileService: FileService;
11
+ static createContainer(parent: interfaces.Container, data: DebugSessionData, connection: DebugSessionConnection, terminalOptionsExt?: TerminalOptionsExt): interfaces.Container;
33
12
  protected readonly terminalOptionsExt: TerminalOptionsExt | undefined;
34
- protected readonly debugContributionProvider: ContributionProvider<DebugContribution>;
35
- protected readonly workspaceService: WorkspaceService;
36
- protected readonly commandService: CommandService;
37
- constructor(id: string, options: DebugConfigurationSessionOptions, parentSession: DebugSession | undefined, testService: TestService, testRun: TestRunReference | undefined, sessionManager: DebugSessionManager, connection: DebugSessionConnection, terminalServer: TerminalService, editorManager: EditorManager, breakpoints: BreakpointManager, labelProvider: LabelProvider, messages: MessageClient, fileService: FileService, terminalOptionsExt: TerminalOptionsExt | undefined, debugContributionProvider: ContributionProvider<DebugContribution>, workspaceService: WorkspaceService, debugPreferences: DebugPreferences, commandService: CommandService);
38
13
  protected doCreateTerminal(terminalWidgetOptions: TerminalWidgetOptions): Promise<TerminalWidget>;
39
14
  }
40
15
  /**
@@ -42,21 +17,9 @@ export declare class PluginDebugSession extends DebugSession {
42
17
  * The main difference is to use a connection factory that creates [Channel](#Channel) over Rpc channel.
43
18
  */
44
19
  export declare class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
45
- protected readonly terminalService: TerminalService;
46
- protected readonly editorManager: EditorManager;
47
- protected readonly breakpoints: BreakpointManager;
48
- protected readonly labelProvider: LabelProvider;
49
- protected readonly messages: MessageClient;
50
- protected readonly outputChannelManager: OutputChannelManager;
51
- protected readonly debugPreferences: DebugPreferences;
52
20
  protected readonly connectionFactory: (sessionId: string) => Promise<PluginChannel>;
53
- protected readonly fileService: FileService;
54
21
  protected readonly terminalOptionsExt: TerminalOptionsExt | undefined;
55
- protected readonly debugContributionProvider: ContributionProvider<DebugContribution>;
56
- protected readonly testService: TestService;
57
- protected readonly workspaceService: WorkspaceService;
58
- protected readonly commandService: CommandService;
59
- constructor(terminalService: TerminalService, editorManager: EditorManager, breakpoints: BreakpointManager, labelProvider: LabelProvider, messages: MessageClient, outputChannelManager: OutputChannelManager, debugPreferences: DebugPreferences, connectionFactory: (sessionId: string) => Promise<PluginChannel>, fileService: FileService, terminalOptionsExt: TerminalOptionsExt | undefined, debugContributionProvider: ContributionProvider<DebugContribution>, testService: TestService, workspaceService: WorkspaceService, commandService: CommandService);
60
- get(manager: DebugSessionManager, sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession;
22
+ constructor(connectionFactory: (sessionId: string) => Promise<PluginChannel>, terminalOptionsExt: TerminalOptionsExt | undefined, container: interfaces.Container);
23
+ createSession(sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession;
61
24
  }
62
25
  //# sourceMappingURL=plugin-debug-session-factory.d.ts.map
package/lib/main/browser/debug/plugin-debug-session-factory.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-debug-session-factory.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/debug/plugin-debug-session-factory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin-debug-session-factory.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/debug/plugin-debug-session-factory.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAE,gCAAgC,EAAE,MAAM,gDAAgD,CAAC;AAClG,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AACzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAE3E,qBACa,kBAAmB,SAAQ,YAAY;WAEhC,eAAe,CAC3B,MAAM,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,sBAAsB,EAAE,kBAAkB,CAAC,EAAE,kBAAkB,GAClI,UAAU,CAAC,SAAS;IAQvB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;cAE7C,gBAAgB,CAAC,qBAAqB,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC;CAInH;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,0BAA0B;IAEjE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC;IACnF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS;gBADlD,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,EAChE,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,EACrE,SAAS,EAAE,UAAU,CAAC,SAAS;IAK1B,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,gCAAgC,EAAE,aAAa,CAAC,EAAE,YAAY,GAAG,YAAY;CAanI"}
package/lib/main/browser/debug/plugin-debug-session-factory.js CHANGED
@@ -14,60 +14,54 @@
14
14
  //
15
15
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
16
  // *****************************************************************************
17
+ var PluginDebugSession_1;
17
18
  Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.PluginDebugSessionFactory = exports.PluginDebugSession = void 0;
19
+ exports.PluginDebugSessionFactory = exports.PluginDebugSession = exports.PluginTerminalOptionsExt = void 0;
20
+ const tslib_1 = require("tslib");
21
+ const inversify_1 = require("@theia/core/shared/inversify");
19
22
  const debug_session_contribution_1 = require("@theia/debug/lib/browser/debug-session-contribution");
20
23
  const debug_session_1 = require("@theia/debug/lib/browser/debug-session");
21
24
  const debug_session_connection_1 = require("@theia/debug/lib/browser/debug-session-connection");
22
- class PluginDebugSession extends debug_session_1.DebugSession {
23
- constructor(id, options, parentSession, testService, testRun, sessionManager, connection, terminalServer, editorManager, breakpoints, labelProvider, messages, fileService, terminalOptionsExt, debugContributionProvider, workspaceService, debugPreferences, commandService) {
24
- super(id, options, parentSession, testService, testRun, sessionManager, connection, terminalServer, editorManager, breakpoints, labelProvider, messages, fileService, debugContributionProvider, workspaceService, debugPreferences, commandService);
25
- this.id = id;
26
- this.options = options;
27
- this.parentSession = parentSession;
28
- this.connection = connection;
29
- this.terminalServer = terminalServer;
30
- this.editorManager = editorManager;
31
- this.breakpoints = breakpoints;
32
- this.labelProvider = labelProvider;
33
- this.messages = messages;
34
- this.fileService = fileService;
35
- this.terminalOptionsExt = terminalOptionsExt;
36
- this.debugContributionProvider = debugContributionProvider;
37
- this.workspaceService = workspaceService;
38
- this.commandService = commandService;
25
+ exports.PluginTerminalOptionsExt = Symbol('PluginTerminalOptionsExt');
26
+ let PluginDebugSession = PluginDebugSession_1 = class PluginDebugSession extends debug_session_1.DebugSession {
27
+ static createContainer(parent, data, connection, terminalOptionsExt) {
28
+ const child = debug_session_1.DebugSession.createContainer(parent, data, connection);
29
+ child.rebind(debug_session_1.DebugSession).to(PluginDebugSession_1);
30
+ child.bind(exports.PluginTerminalOptionsExt).toConstantValue(terminalOptionsExt);
31
+ return child;
39
32
  }
40
33
  async doCreateTerminal(terminalWidgetOptions) {
41
34
  terminalWidgetOptions = Object.assign({}, terminalWidgetOptions, this.terminalOptionsExt);
42
35
  return super.doCreateTerminal(terminalWidgetOptions);
43
36
  }
44
- }
37
+ };
45
38
  exports.PluginDebugSession = PluginDebugSession;
39
+ tslib_1.__decorate([
40
+ (0, inversify_1.inject)(exports.PluginTerminalOptionsExt),
41
+ tslib_1.__metadata("design:type", Object)
42
+ ], PluginDebugSession.prototype, "terminalOptionsExt", void 0);
43
+ exports.PluginDebugSession = PluginDebugSession = PluginDebugSession_1 = tslib_1.__decorate([
44
+ (0, inversify_1.injectable)()
45
+ ], PluginDebugSession);
46
46
  /**
47
47
  * Session factory for a client debug session that communicates with debug adapter contributed as plugin.
48
48
  * The main difference is to use a connection factory that creates [Channel](#Channel) over Rpc channel.
49
49
  */
50
50
  class PluginDebugSessionFactory extends debug_session_contribution_1.DefaultDebugSessionFactory {
51
- constructor(terminalService, editorManager, breakpoints, labelProvider, messages, outputChannelManager, debugPreferences, connectionFactory, fileService, terminalOptionsExt, debugContributionProvider, testService, workspaceService, commandService) {
52
- super();
53
- this.terminalService = terminalService;
54
- this.editorManager = editorManager;
55
- this.breakpoints = breakpoints;
56
- this.labelProvider = labelProvider;
57
- this.messages = messages;
58
- this.outputChannelManager = outputChannelManager;
59
- this.debugPreferences = debugPreferences;
51
+ constructor(connectionFactory, terminalOptionsExt, container) {
52
+ super(container);
60
53
  this.connectionFactory = connectionFactory;
61
- this.fileService = fileService;
62
54
  this.terminalOptionsExt = terminalOptionsExt;
63
- this.debugContributionProvider = debugContributionProvider;
64
- this.testService = testService;
65
- this.workspaceService = workspaceService;
66
- this.commandService = commandService;
67
55
  }
68
- get(manager, sessionId, options, parentSession) {
56
+ createSession(sessionId, options, parentSession) {
69
57
  const connection = new debug_session_connection_1.DebugSessionConnection(sessionId, this.connectionFactory, this.getTraceOutputChannel());
70
- return new PluginDebugSession(sessionId, options, parentSession, this.testService, options.testRun, manager, connection, this.terminalService, this.editorManager, this.breakpoints, this.labelProvider, this.messages, this.fileService, this.terminalOptionsExt, this.debugContributionProvider, this.workspaceService, this.debugPreferences, this.commandService);
58
+ const data = {
59
+ id: sessionId,
60
+ options,
61
+ parentSession,
62
+ };
63
+ const child = PluginDebugSession.createContainer(this.container, data, connection, this.terminalOptionsExt);
64
+ return child.get(debug_session_1.DebugSession);
71
65
  }
72
66
  }
73
67
  exports.PluginDebugSessionFactory = PluginDebugSessionFactory;
package/lib/main/browser/debug/plugin-debug-session-factory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-debug-session-factory.js","sourceRoot":"","sources":["../../../../src/main/browser/debug/plugin-debug-session-factory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin-debug-session-factory.js","sourceRoot":"","sources":["../../../../src/main/browser/debug/plugin-debug-session-factory.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;AAEhF,4DAA8E;AAC9E,oGAAiG;AAEjG,0EAAwF;AACxF,gGAA2F;AAK9E,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAGpE,IAAM,kBAAkB,0BAAxB,MAAM,kBAAmB,SAAQ,4BAAY;IAEhD,MAAM,CAAU,eAAe,CAC3B,MAA4B,EAAE,IAAsB,EAAE,UAAkC,EAAE,kBAAuC;QAEjI,MAAM,KAAK,GAAG,4BAAY,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACrE,KAAK,CAAC,MAAM,CAAC,4BAAY,CAAC,CAAC,EAAE,CAAC,oBAAkB,CAAC,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC,gCAAwB,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACzE,OAAO,KAAK,CAAC;IACjB,CAAC;IAKkB,KAAK,CAAC,gBAAgB,CAAC,qBAA4C;QAClF,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,qBAAqB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC1F,OAAO,KAAK,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IACzD,CAAC;CACJ,CAAA;AAlBY,gDAAkB;AAYR;IADlB,IAAA,kBAAM,EAAC,gCAAwB,CAAC;;8DACqC;6BAZ7D,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAkB9B;AAED;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,uDAA0B;IACrE,YACuB,iBAAgE,EAChE,kBAAkD,EACrE,SAA+B;QAE/B,KAAK,CAAC,SAAS,CAAC,CAAC;QAJE,sBAAiB,GAAjB,iBAAiB,CAA+C;QAChE,uBAAkB,GAAlB,kBAAkB,CAAgC;IAIzE,CAAC;IAEQ,aAAa,CAAC,SAAiB,EAAE,OAAyC,EAAE,aAA4B;QAC7G,MAAM,UAAU,GAAG,IAAI,iDAAsB,CACzC,SAAS,EACT,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAClC,MAAM,IAAI,GAAqB;YAC3B,EAAE,EAAE,SAAS;YACb,OAAO;YACP,aAAa;SAChB,CAAC;QACF,MAAM,KAAK,GAAG,kBAAkB,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC5G,OAAO,KAAK,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC;IACnC,CAAC;CACJ;AAtBD,8DAsBC"}
package/package.json CHANGED
@@ -1,38 +1,38 @@
1
1
  {
2
2
  "name": "@theia/plugin-ext",
3
- "version": "1.73.0-next.24+ed85d4937",
3
+ "version": "1.73.0-next.26+d6f45631a",
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.73.0-next.24+ed85d4937",
9
- "@theia/bulk-edit": "1.73.0-next.24+ed85d4937",
10
- "@theia/callhierarchy": "1.73.0-next.24+ed85d4937",
11
- "@theia/console": "1.73.0-next.24+ed85d4937",
12
- "@theia/core": "1.73.0-next.24+ed85d4937",
13
- "@theia/debug": "1.73.0-next.24+ed85d4937",
14
- "@theia/editor": "1.73.0-next.24+ed85d4937",
15
- "@theia/editor-preview": "1.73.0-next.24+ed85d4937",
16
- "@theia/file-search": "1.73.0-next.24+ed85d4937",
17
- "@theia/filesystem": "1.73.0-next.24+ed85d4937",
18
- "@theia/markers": "1.73.0-next.24+ed85d4937",
19
- "@theia/messages": "1.73.0-next.24+ed85d4937",
20
- "@theia/monaco": "1.73.0-next.24+ed85d4937",
8
+ "@theia/ai-mcp": "1.73.0-next.26+d6f45631a",
9
+ "@theia/bulk-edit": "1.73.0-next.26+d6f45631a",
10
+ "@theia/callhierarchy": "1.73.0-next.26+d6f45631a",
11
+ "@theia/console": "1.73.0-next.26+d6f45631a",
12
+ "@theia/core": "1.73.0-next.26+d6f45631a",
13
+ "@theia/debug": "1.73.0-next.26+d6f45631a",
14
+ "@theia/editor": "1.73.0-next.26+d6f45631a",
15
+ "@theia/editor-preview": "1.73.0-next.26+d6f45631a",
16
+ "@theia/file-search": "1.73.0-next.26+d6f45631a",
17
+ "@theia/filesystem": "1.73.0-next.26+d6f45631a",
18
+ "@theia/markers": "1.73.0-next.26+d6f45631a",
19
+ "@theia/messages": "1.73.0-next.26+d6f45631a",
20
+ "@theia/monaco": "1.73.0-next.26+d6f45631a",
21
21
  "@theia/monaco-editor-core": "1.108.201",
22
- "@theia/navigator": "1.73.0-next.24+ed85d4937",
23
- "@theia/notebook": "1.73.0-next.24+ed85d4937",
24
- "@theia/output": "1.73.0-next.24+ed85d4937",
25
- "@theia/plugin": "1.73.0-next.24+ed85d4937",
26
- "@theia/preferences": "1.73.0-next.24+ed85d4937",
27
- "@theia/scm": "1.73.0-next.24+ed85d4937",
28
- "@theia/search-in-workspace": "1.73.0-next.24+ed85d4937",
29
- "@theia/task": "1.73.0-next.24+ed85d4937",
30
- "@theia/terminal": "1.73.0-next.24+ed85d4937",
31
- "@theia/test": "1.73.0-next.24+ed85d4937",
32
- "@theia/timeline": "1.73.0-next.24+ed85d4937",
33
- "@theia/typehierarchy": "1.73.0-next.24+ed85d4937",
34
- "@theia/variable-resolver": "1.73.0-next.24+ed85d4937",
35
- "@theia/workspace": "1.73.0-next.24+ed85d4937",
22
+ "@theia/navigator": "1.73.0-next.26+d6f45631a",
23
+ "@theia/notebook": "1.73.0-next.26+d6f45631a",
24
+ "@theia/output": "1.73.0-next.26+d6f45631a",
25
+ "@theia/plugin": "1.73.0-next.26+d6f45631a",
26
+ "@theia/preferences": "1.73.0-next.26+d6f45631a",
27
+ "@theia/scm": "1.73.0-next.26+d6f45631a",
28
+ "@theia/search-in-workspace": "1.73.0-next.26+d6f45631a",
29
+ "@theia/task": "1.73.0-next.26+d6f45631a",
30
+ "@theia/terminal": "1.73.0-next.26+d6f45631a",
31
+ "@theia/test": "1.73.0-next.26+d6f45631a",
32
+ "@theia/timeline": "1.73.0-next.26+d6f45631a",
33
+ "@theia/typehierarchy": "1.73.0-next.26+d6f45631a",
34
+ "@theia/variable-resolver": "1.73.0-next.26+d6f45631a",
35
+ "@theia/workspace": "1.73.0-next.26+d6f45631a",
36
36
  "@types/mime": "^2.0.3",
37
37
  "@vscode/debugprotocol": "^1.68.0",
38
38
  "@vscode/proxy-agent": "^0.13.2",
@@ -97,5 +97,5 @@
97
97
  "nyc": {
98
98
  "extends": "../../configs/nyc.json"
99
99
  },
100
- "gitHead": "ed85d49379279b6472543df174249476e1619bac"
100
+ "gitHead": "d6f45631a893ad1944a87db5aaf4bc94c64b1c60"
101
101
  }
package/src/main/browser/debug/debug-main.ts CHANGED
@@ -26,8 +26,6 @@ import {
26
26
  } from '../../../common/plugin-api-rpc';
27
27
  import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
28
28
  import { Breakpoint, DebugStackFrameDTO, DebugThreadDTO, WorkspaceFolder } from '../../../common/plugin-api-rpc-model';
29
- import { LabelProvider } from '@theia/core/lib/browser';
30
- import { EditorManager } from '@theia/editor/lib/browser';
31
29
  import { BreakpointManager, BreakpointsChangeEvent } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
32
30
  import { URI as Uri } from '@theia/core/shared/vscode-uri';
33
31
  import { SourceBreakpoint, FunctionBreakpoint, BaseBreakpoint } from '@theia/debug/lib/browser/breakpoint/breakpoint-marker';
@@ -35,10 +33,6 @@ import { DebugConfiguration, DebugSessionOptions } from '@theia/debug/lib/common
35
33
  import { DebuggerDescription } from '@theia/debug/lib/common/debug-service';
36
34
  import { DebugProtocol } from '@vscode/debugprotocol';
37
35
  import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
38
- import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
39
- import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
40
- import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
41
- import { DebugPreferences } from '@theia/debug/lib/common/debug-preferences';
42
36
  import { PluginDebugAdapterContribution } from './plugin-debug-adapter-contribution';
43
37
  import { PluginDebugConfigurationProvider } from './plugin-debug-configuration-provider';
44
38
  import { PluginDebugSessionContributionRegistrator, PluginDebugSessionContributionRegistry } from './plugin-debug-session-contribution-registry';
@@ -46,17 +40,12 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
46
40
  import { PluginDebugSessionFactory } from './plugin-debug-session-factory';
47
41
  import { PluginDebugService } from './plugin-debug-service';
48
42
  import { HostedPluginSupport } from '../../../hosted/browser/hosted-plugin';
49
- import { FileService } from '@theia/filesystem/lib/browser/file-service';
50
43
  import { ConsoleSessionManager } from '@theia/console/lib/browser/console-session-manager';
51
44
  import { DebugConsoleSession } from '@theia/debug/lib/browser/console/debug-console-session';
52
- import { CommandService, ContributionProvider } from '@theia/core/lib/common';
53
- import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
54
45
  import { ConnectionImpl } from '../../../common/connection';
55
- import { WorkspaceService } from '@theia/workspace/lib/browser';
56
46
  import { DebugSessionOptions as TheiaDebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
57
47
  import { DebugStackFrame } from '@theia/debug/lib/browser/model/debug-stack-frame';
58
48
  import { DebugThread } from '@theia/debug/lib/browser/model/debug-thread';
59
- import { TestService } from '@theia/test/lib/browser/test-service';
60
49
  import { DebugBreakpoint } from '@theia/debug/lib/browser/model/debug-breakpoint';
61
50
 
62
51
  function toOrigin<T extends BaseBreakpoint>(input: DebugBreakpoint<T>): T {
@@ -75,24 +64,14 @@ function eventToOrigins<T extends BaseBreakpoint>({ added, removed, changed, uri
75
64
  export class DebugMainImpl implements DebugMain, Disposable {
76
65
  private readonly debugExt: DebugExt;
77
66
 
67
+ private readonly container: interfaces.Container;
78
68
  private readonly sessionManager: DebugSessionManager;
79
- private readonly labelProvider: LabelProvider;
80
- private readonly editorManager: EditorManager;
81
69
  private readonly breakpointsManager: BreakpointManager;
82
70
  private readonly consoleSessionManager: ConsoleSessionManager;
83
71
  private readonly configurationManager: DebugConfigurationManager;
84
- private readonly terminalService: TerminalService;
85
- private readonly messages: MessageClient;
86
- private readonly outputChannelManager: OutputChannelManager;
87
- private readonly debugPreferences: DebugPreferences;
88
72
  private readonly sessionContributionRegistrator: PluginDebugSessionContributionRegistrator;
89
73
  private readonly pluginDebugService: PluginDebugService;
90
- private readonly fileService: FileService;
91
74
  private readonly pluginService: HostedPluginSupport;
92
- private readonly debugContributionProvider: ContributionProvider<DebugContribution>;
93
- private readonly testService: TestService;
94
- private readonly workspaceService: WorkspaceService;
95
- private readonly commandService: CommandService;
96
75
 
97
76
  private readonly debuggerContributions = new Map<string, DisposableCollection>();
98
77
  private readonly configurationProviders = new Map<number, DisposableCollection>();
@@ -100,24 +79,14 @@ export class DebugMainImpl implements DebugMain, Disposable {
100
79
 
101
80
  constructor(rpc: RPCProtocol, readonly connectionMain: ConnectionImpl, container: interfaces.Container) {
102
81
  this.debugExt = rpc.getProxy(MAIN_RPC_CONTEXT.DEBUG_EXT);
82
+ this.container = container;
103
83
  this.sessionManager = container.get(DebugSessionManager);
104
- this.labelProvider = container.get(LabelProvider);
105
- this.editorManager = container.get(EditorManager);
106
84
  this.breakpointsManager = container.get(BreakpointManager);
107
85
  this.consoleSessionManager = container.get(ConsoleSessionManager);
108
86
  this.configurationManager = container.get(DebugConfigurationManager);
109
- this.terminalService = container.get(TerminalService);
110
- this.messages = container.get(MessageClient);
111
- this.outputChannelManager = container.get(OutputChannelManager);
112
- this.debugPreferences = container.get(DebugPreferences);
113
87
  this.pluginDebugService = container.get(PluginDebugService);
114
88
  this.sessionContributionRegistrator = container.get(PluginDebugSessionContributionRegistry);
115
- this.debugContributionProvider = container.getNamed(ContributionProvider, DebugContribution);
116
- this.fileService = container.get(FileService);
117
89
  this.pluginService = container.get(HostedPluginSupport);
118
- this.testService = container.get(TestService);
119
- this.workspaceService = container.get(WorkspaceService);
120
- this.commandService = container.get(CommandService);
121
90
 
122
91
  const fireDidChangeBreakpoints = ({ added, removed, changed }: BreakpointsChangeEvent<SourceBreakpoint | FunctionBreakpoint>) => {
123
92
  this.debugExt.$breakpointsDidChange(
@@ -168,23 +137,12 @@ export class DebugMainImpl implements DebugMain, Disposable {
168
137
  }
169
138
 
170
139
  const debugSessionFactory = new PluginDebugSessionFactory(
171
- this.terminalService,
172
- this.editorManager,
173
- this.breakpointsManager,
174
- this.labelProvider,
175
- this.messages,
176
- this.outputChannelManager,
177
- this.debugPreferences,
178
140
  async (sessionId: string) => {
179
141
  const connection = await this.connectionMain.ensureConnection(sessionId);
180
142
  return connection;
181
143
  },
182
- this.fileService,
183
144
  terminalOptionsExt,
184
- this.debugContributionProvider,
185
- this.testService,
186
- this.workspaceService,
187
- this.commandService,
145
+ this.container,
188
146
  );
189
147
 
190
148
  const toDispose = new DisposableCollection(
package/src/main/browser/debug/plugin-debug-session-factory.ts CHANGED
@@ -14,53 +14,32 @@
14
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
15
  // *****************************************************************************
16
16
 
17
+ import { injectable, inject, interfaces } from '@theia/core/shared/inversify';
17
18
  import { DefaultDebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
18
- import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
19
- import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
20
- import { BreakpointManager } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
21
- import { LabelProvider } from '@theia/core/lib/browser/label-provider';
22
- import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
23
- import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
24
- import { DebugPreferences } from '@theia/debug/lib/common/debug-preferences';
25
- import { DebugConfigurationSessionOptions, TestRunReference } from '@theia/debug/lib/browser/debug-session-options';
26
- import { DebugSession } from '@theia/debug/lib/browser/debug-session';
19
+ import { DebugConfigurationSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
20
+ import { DebugSession, DebugSessionData } from '@theia/debug/lib/browser/debug-session';
27
21
  import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
28
22
  import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
29
23
  import { TerminalOptionsExt } from '../../../common/plugin-api-rpc';
30
- import { FileService } from '@theia/filesystem/lib/browser/file-service';
31
- import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
32
- import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
33
- import { WorkspaceService } from '@theia/workspace/lib/browser';
34
24
  import { PluginChannel } from '../../../common/connection';
35
- import { TestService } from '@theia/test/lib/browser/test-service';
36
- import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
37
- import { CommandService } from '@theia/core';
38
25
 
26
+ export const PluginTerminalOptionsExt = Symbol('PluginTerminalOptionsExt');
27
+
28
+ @injectable()
39
29
  export class PluginDebugSession extends DebugSession {
40
- constructor(
41
- override readonly id: string,
42
- override readonly options: DebugConfigurationSessionOptions,
43
- override readonly parentSession: DebugSession | undefined,
44
- testService: TestService,
45
- testRun: TestRunReference | undefined,
46
- sessionManager: DebugSessionManager,
47
- protected override readonly connection: DebugSessionConnection,
48
- protected override readonly terminalServer: TerminalService,
49
- protected override readonly editorManager: EditorManager,
50
- protected override readonly breakpoints: BreakpointManager,
51
- protected override readonly labelProvider: LabelProvider,
52
- protected override readonly messages: MessageClient,
53
- protected override readonly fileService: FileService,
54
- protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
55
- protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
56
- protected override readonly workspaceService: WorkspaceService,
57
- debugPreferences: DebugPreferences,
58
- protected override readonly commandService: CommandService) {
59
- super(id, options, parentSession, testService, testRun, sessionManager, connection, terminalServer, editorManager, breakpoints,
60
- labelProvider, messages, fileService, debugContributionProvider,
61
- workspaceService, debugPreferences, commandService);
30
+
31
+ static override createContainer(
32
+ parent: interfaces.Container, data: DebugSessionData, connection: DebugSessionConnection, terminalOptionsExt?: TerminalOptionsExt
33
+ ): interfaces.Container {
34
+ const child = DebugSession.createContainer(parent, data, connection);
35
+ child.rebind(DebugSession).to(PluginDebugSession);
36
+ child.bind(PluginTerminalOptionsExt).toConstantValue(terminalOptionsExt);
37
+ return child;
62
38
  }
63
39
 
40
+ @inject(PluginTerminalOptionsExt)
41
+ protected readonly terminalOptionsExt: TerminalOptionsExt | undefined;
42
+
64
43
  protected override async doCreateTerminal(terminalWidgetOptions: TerminalWidgetOptions): Promise<TerminalWidget> {
65
44
  terminalWidgetOptions = Object.assign({}, terminalWidgetOptions, this.terminalOptionsExt);
66
45
  return super.doCreateTerminal(terminalWidgetOptions);
@@ -73,49 +52,24 @@ export class PluginDebugSession extends DebugSession {
73
52
  */
74
53
  export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
75
54
  constructor(
76
- protected override readonly terminalService: TerminalService,
77
- protected override readonly editorManager: EditorManager,
78
- protected override readonly breakpoints: BreakpointManager,
79
- protected override readonly labelProvider: LabelProvider,
80
- protected override readonly messages: MessageClient,
81
- protected override readonly outputChannelManager: OutputChannelManager,
82
- protected override readonly debugPreferences: DebugPreferences,
83
55
  protected readonly connectionFactory: (sessionId: string) => Promise<PluginChannel>,
84
- protected override readonly fileService: FileService,
85
56
  protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
86
- protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
87
- protected override readonly testService: TestService,
88
- protected override readonly workspaceService: WorkspaceService,
89
- protected override readonly commandService: CommandService,
57
+ container: interfaces.Container,
90
58
  ) {
91
- super();
59
+ super(container);
92
60
  }
93
61
 
94
- override get(manager: DebugSessionManager, sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
62
+ override createSession(sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
95
63
  const connection = new DebugSessionConnection(
96
64
  sessionId,
97
65
  this.connectionFactory,
98
66
  this.getTraceOutputChannel());
99
-
100
- return new PluginDebugSession(
101
- sessionId,
67
+ const data: DebugSessionData = {
68
+ id: sessionId,
102
69
  options,
103
70
  parentSession,
104
- this.testService,
105
- options.testRun,
106
- manager,
107
- connection,
108
- this.terminalService,
109
- this.editorManager,
110
- this.breakpoints,
111
- this.labelProvider,
112
- this.messages,
113
- this.fileService,
114
- this.terminalOptionsExt,
115
- this.debugContributionProvider,
116
- this.workspaceService,
117
- this.debugPreferences,
118
- this.commandService
119
- );
71
+ };
72
+ const child = PluginDebugSession.createContainer(this.container, data, connection, this.terminalOptionsExt);
73
+ return child.get(DebugSession);
120
74
  }
121
75
  }