@theia/debug 1.44.0 → 1.45.1
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.
- package/lib/browser/debug-session-contribution.d.ts +2 -2
- package/lib/browser/debug-session-contribution.d.ts.map +1 -1
- package/lib/browser/debug-session-contribution.js +5 -5
- package/lib/browser/debug-session-contribution.js.map +1 -1
- package/lib/node/debug-adapter-session-manager.js +1 -1
- package/lib/node/debug-adapter-session-manager.js.map +1 -1
- package/package.json +15 -15
- package/src/browser/debug-session-contribution.ts +5 -5
- package/src/node/debug-adapter-session-manager.ts +1 -1
|
@@ -2,7 +2,6 @@ import { MessageClient } from '@theia/core/lib/common';
|
|
|
2
2
|
import { LabelProvider } from '@theia/core/lib/browser';
|
|
3
3
|
import { EditorManager } from '@theia/editor/lib/browser';
|
|
4
4
|
import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
|
|
5
|
-
import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
|
|
6
5
|
import { DebugSession } from './debug-session';
|
|
7
6
|
import { BreakpointManager } from './breakpoint/breakpoint-manager';
|
|
8
7
|
import { DebugConfigurationSessionOptions, DebugSessionOptions } from './debug-session-options';
|
|
@@ -12,6 +11,7 @@ import { ContributionProvider } from '@theia/core/lib/common/contribution-provid
|
|
|
12
11
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
13
12
|
import { DebugContribution } from './debug-contribution';
|
|
14
13
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
14
|
+
import { ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
|
|
15
15
|
/**
|
|
16
16
|
* DebugSessionContribution symbol for DI.
|
|
17
17
|
*/
|
|
@@ -57,7 +57,7 @@ export interface DebugSessionFactory {
|
|
|
57
57
|
get(sessionId: string, options: DebugSessionOptions, parentSession?: DebugSession): DebugSession;
|
|
58
58
|
}
|
|
59
59
|
export declare class DefaultDebugSessionFactory implements DebugSessionFactory {
|
|
60
|
-
protected readonly connectionProvider:
|
|
60
|
+
protected readonly connectionProvider: ServiceConnectionProvider;
|
|
61
61
|
protected readonly terminalService: TerminalService;
|
|
62
62
|
protected readonly editorManager: EditorManager;
|
|
63
63
|
protected readonly breakpoints: BreakpointManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-session-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/debug-session-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"debug-session-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/debug-session-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,6 @@ const common_1 = require("@theia/core/lib/common");
|
|
|
30
30
|
const browser_1 = require("@theia/core/lib/browser");
|
|
31
31
|
const browser_2 = require("@theia/editor/lib/browser");
|
|
32
32
|
const terminal_service_1 = require("@theia/terminal/lib/browser/base/terminal-service");
|
|
33
|
-
const ws_connection_provider_1 = require("@theia/core/lib/browser/messaging/ws-connection-provider");
|
|
34
33
|
const debug_session_1 = require("./debug-session");
|
|
35
34
|
const breakpoint_manager_1 = require("./breakpoint/breakpoint-manager");
|
|
36
35
|
const output_channel_1 = require("@theia/output/lib/browser/output-channel");
|
|
@@ -41,6 +40,7 @@ const contribution_provider_1 = require("@theia/core/lib/common/contribution-pro
|
|
|
41
40
|
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
42
41
|
const debug_contribution_1 = require("./debug-contribution");
|
|
43
42
|
const browser_3 = require("@theia/workspace/lib/browser");
|
|
43
|
+
const service_connection_provider_1 = require("@theia/core/lib/browser/messaging/service-connection-provider");
|
|
44
44
|
/**
|
|
45
45
|
* DebugSessionContribution symbol for DI.
|
|
46
46
|
*/
|
|
@@ -83,9 +83,9 @@ exports.DebugSessionContributionRegistryImpl = DebugSessionContributionRegistryI
|
|
|
83
83
|
exports.DebugSessionFactory = Symbol('DebugSessionFactory');
|
|
84
84
|
let DefaultDebugSessionFactory = class DefaultDebugSessionFactory {
|
|
85
85
|
get(sessionId, options, parentSession) {
|
|
86
|
-
const connection = new debug_session_connection_1.DebugSessionConnection(sessionId, () => new Promise(resolve => this.connectionProvider.
|
|
86
|
+
const connection = new debug_session_connection_1.DebugSessionConnection(sessionId, () => new Promise(resolve => this.connectionProvider.listen(`${debug_service_1.DebugAdapterPath}/${sessionId}`, (_, wsChannel) => {
|
|
87
87
|
resolve(new debug_service_1.ForwardingDebugChannel(wsChannel));
|
|
88
|
-
},
|
|
88
|
+
}, false)), this.getTraceOutputChannel());
|
|
89
89
|
return new debug_session_1.DebugSession(sessionId, options, parentSession, connection, this.terminalService, this.editorManager, this.breakpoints, this.labelProvider, this.messages, this.fileService, this.debugContributionProvider, this.workspaceService);
|
|
90
90
|
}
|
|
91
91
|
getTraceOutputChannel() {
|
|
@@ -95,8 +95,8 @@ let DefaultDebugSessionFactory = class DefaultDebugSessionFactory {
|
|
|
95
95
|
}
|
|
96
96
|
};
|
|
97
97
|
__decorate([
|
|
98
|
-
(0, inversify_1.inject)(
|
|
99
|
-
__metadata("design:type",
|
|
98
|
+
(0, inversify_1.inject)(service_connection_provider_1.RemoteConnectionProvider),
|
|
99
|
+
__metadata("design:type", service_connection_provider_1.ServiceConnectionProvider)
|
|
100
100
|
], DefaultDebugSessionFactory.prototype, "connectionProvider", void 0);
|
|
101
101
|
__decorate([
|
|
102
102
|
(0, inversify_1.inject)(terminal_service_1.TerminalService),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-session-contribution.js","sourceRoot":"","sources":["../../src/browser/debug-session-contribution.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,4DAAwF;AACxF,mDAAuD;AACvD,qDAAwD;AACxD,uDAA0D;AAC1D,wFAAoF;AACpF,
|
|
1
|
+
{"version":3,"file":"debug-session-contribution.js","sourceRoot":"","sources":["../../src/browser/debug-session-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ let DebugAdapterSessionManager = class DebugAdapterSessionManager {
|
|
|
37
37
|
this.sessions = new Map();
|
|
38
38
|
}
|
|
39
39
|
configure(service) {
|
|
40
|
-
service.
|
|
40
|
+
service.registerChannelHandler(`${debug_service_1.DebugAdapterPath}/:id`, ({ id }, wsChannel) => {
|
|
41
41
|
const session = this.find(id);
|
|
42
42
|
if (!session) {
|
|
43
43
|
wsChannel.close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-adapter-session-manager.js","sourceRoot":"","sources":["../../src/node/debug-adapter-session-manager.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,sEAA8D;AAC9D,4DAAkE;AAGlE,2DAAmF;AAEnF,uDAA6G;AAG7G;;GAEG;AAEH,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAAvC;QACuB,aAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;IA2EzE,CAAC;IAnEG,SAAS,CAAC,OAAyB;QAC/B,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"debug-adapter-session-manager.js","sourceRoot":"","sources":["../../src/node/debug-adapter-session-manager.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,sEAA8D;AAC9D,4DAAkE;AAGlE,2DAAmF;AAEnF,uDAA6G;AAG7G;;GAEG;AAEH,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAAvC;QACuB,aAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;IA2EzE,CAAC;IAnEG,SAAS,CAAC,OAAyB;QAC/B,OAAO,CAAC,sBAAsB,CAAC,GAAG,gCAAgB,MAAM,EAAE,CAAC,EAAE,EAAE,EAAkB,EAAE,SAAS,EAAE,EAAE;YAC5F,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE;gBACV,SAAS,CAAC,KAAK,EAAE,CAAC;gBAClB,OAAO;aACV;YACD,OAAO,CAAC,KAAK,CAAC,IAAI,sCAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,MAA0B,EAAE,QAA0C;QAC/E,MAAM,SAAS,GAAG,gBAAI,CAAC,KAAK,EAAE,CAAC;QAE/B,IAAI,qBAAqB,CAAC;QAC1B,IAAI,aAAa,IAAI,MAAM,EAAE;YACzB,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;SAChF;aAAM;YACH,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;YACxE,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;SACtE;QAED,MAAM,cAAc,GAAG,QAAQ,CAAC,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC;QAC3G,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QACrE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,MAAM,CAAC,aAAa,EAAE;YACtB,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACjE,IAAI,aAAa,EAAE;gBACf,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;aACzC;SACJ;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAiB;QACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED;;;;;OAKG;IACH,IAAI,CAAC,SAAiB;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAED;;;OAGG;IACH,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAClC,CAAC;CACJ,CAAA;AAxEG;IADC,IAAA,kBAAM,EAAC,wCAA0B,CAAC;;8EACuC;AAG1E;IADC,IAAA,kBAAM,EAAC,iCAAmB,CAAC;;uEACgC;AAPnD,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CA4EtC;AA5EY,gEAA0B"}
|
package/package.json
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/debug",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.45.1",
|
|
4
4
|
"description": "Theia - Debug Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/console": "1.
|
|
7
|
-
"@theia/core": "1.
|
|
8
|
-
"@theia/editor": "1.
|
|
9
|
-
"@theia/filesystem": "1.
|
|
10
|
-
"@theia/markers": "1.
|
|
11
|
-
"@theia/monaco": "1.
|
|
6
|
+
"@theia/console": "1.45.1",
|
|
7
|
+
"@theia/core": "1.45.1",
|
|
8
|
+
"@theia/editor": "1.45.1",
|
|
9
|
+
"@theia/filesystem": "1.45.1",
|
|
10
|
+
"@theia/markers": "1.45.1",
|
|
11
|
+
"@theia/monaco": "1.45.1",
|
|
12
12
|
"@theia/monaco-editor-core": "1.72.3",
|
|
13
|
-
"@theia/output": "1.
|
|
14
|
-
"@theia/process": "1.
|
|
15
|
-
"@theia/task": "1.
|
|
16
|
-
"@theia/terminal": "1.
|
|
17
|
-
"@theia/variable-resolver": "1.
|
|
18
|
-
"@theia/workspace": "1.
|
|
13
|
+
"@theia/output": "1.45.1",
|
|
14
|
+
"@theia/process": "1.45.1",
|
|
15
|
+
"@theia/task": "1.45.1",
|
|
16
|
+
"@theia/terminal": "1.45.1",
|
|
17
|
+
"@theia/variable-resolver": "1.45.1",
|
|
18
|
+
"@theia/workspace": "1.45.1",
|
|
19
19
|
"@vscode/debugprotocol": "^1.51.0",
|
|
20
20
|
"fast-deep-equal": "^3.1.3",
|
|
21
21
|
"jsonc-parser": "^2.2.0",
|
|
@@ -56,10 +56,10 @@
|
|
|
56
56
|
"watch": "theiaext watch"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@theia/ext-scripts": "1.
|
|
59
|
+
"@theia/ext-scripts": "1.45.1"
|
|
60
60
|
},
|
|
61
61
|
"nyc": {
|
|
62
62
|
"extends": "../../configs/nyc.json"
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "3837c50544190b80d0ad8e87aa9fa9f286c70fcc"
|
|
65
65
|
}
|
|
@@ -19,7 +19,6 @@ import { MessageClient } from '@theia/core/lib/common';
|
|
|
19
19
|
import { LabelProvider } from '@theia/core/lib/browser';
|
|
20
20
|
import { EditorManager } from '@theia/editor/lib/browser';
|
|
21
21
|
import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
|
|
22
|
-
import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
|
|
23
22
|
import { DebugSession } from './debug-session';
|
|
24
23
|
import { BreakpointManager } from './breakpoint/breakpoint-manager';
|
|
25
24
|
import { DebugConfigurationSessionOptions, DebugSessionOptions } from './debug-session-options';
|
|
@@ -31,6 +30,7 @@ import { ContributionProvider } from '@theia/core/lib/common/contribution-provid
|
|
|
31
30
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
32
31
|
import { DebugContribution } from './debug-contribution';
|
|
33
32
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
33
|
+
import { RemoteConnectionProvider, ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
|
|
34
34
|
|
|
35
35
|
/**
|
|
36
36
|
* DebugSessionContribution symbol for DI.
|
|
@@ -95,8 +95,8 @@ export interface DebugSessionFactory {
|
|
|
95
95
|
|
|
96
96
|
@injectable()
|
|
97
97
|
export class DefaultDebugSessionFactory implements DebugSessionFactory {
|
|
98
|
-
@inject(
|
|
99
|
-
protected readonly connectionProvider:
|
|
98
|
+
@inject(RemoteConnectionProvider)
|
|
99
|
+
protected readonly connectionProvider: ServiceConnectionProvider;
|
|
100
100
|
@inject(TerminalService)
|
|
101
101
|
protected readonly terminalService: TerminalService;
|
|
102
102
|
@inject(EditorManager)
|
|
@@ -122,9 +122,9 @@ export class DefaultDebugSessionFactory implements DebugSessionFactory {
|
|
|
122
122
|
const connection = new DebugSessionConnection(
|
|
123
123
|
sessionId,
|
|
124
124
|
() => new Promise<DebugChannel>(resolve =>
|
|
125
|
-
this.connectionProvider.
|
|
125
|
+
this.connectionProvider.listen(`${DebugAdapterPath}/${sessionId}`, (_, wsChannel) => {
|
|
126
126
|
resolve(new ForwardingDebugChannel(wsChannel));
|
|
127
|
-
},
|
|
127
|
+
}, false)
|
|
128
128
|
),
|
|
129
129
|
this.getTraceOutputChannel());
|
|
130
130
|
return new DebugSession(
|
|
@@ -37,7 +37,7 @@ export class DebugAdapterSessionManager implements MessagingService.Contribution
|
|
|
37
37
|
protected readonly debugAdapterFactory: DebugAdapterFactory;
|
|
38
38
|
|
|
39
39
|
configure(service: MessagingService): void {
|
|
40
|
-
service.
|
|
40
|
+
service.registerChannelHandler(`${DebugAdapterPath}/:id`, ({ id }: { id: string }, wsChannel) => {
|
|
41
41
|
const session = this.find(id);
|
|
42
42
|
if (!session) {
|
|
43
43
|
wsChannel.close();
|