Skip to content

Commit 474c49d

Browse files
karthiknadigkarthiknadig
committed
Remove TS debugAdapter (microsoft#11755)
* Remove TS debugAdapter - initial * Fix renameSourceMaps * Test fixes
1 parent 2a71954 commit 474c49d

37 files changed

Lines changed: 86 additions & 2302 deletions

‎.vscode/launch.json‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -90,27 +90,6 @@
9090
"program": "${file}",
9191
"console": "integratedTerminal"
9292
},
93-
{
94-
"name": "Debugger as debugServer",
95-
"type": "node",
96-
"request": "launch",
97-
"program": "${workspaceFolder}/out/client/debugger/debugAdapter/main.js",
98-
"stopOnEntry": false,
99-
"smartStep": true,
100-
"args": [
101-
"--server=4711"
102-
],
103-
"sourceMaps": true,
104-
"outFiles": [
105-
"${workspaceFolder}/out/client/**/*.js",
106-
"!${workspaceFolder}/**/node_modules**/*"
107-
],
108-
"cwd": "${workspaceFolder}",
109-
"preLaunchTask": "Compile",
110-
"skipFiles": [
111-
"<node_internals>/**"
112-
]
113-
},
11493
{
11594
"name": "Tests (Debugger, VS Code, *.test.ts)",
11695
"type": "extensionHost",
@@ -379,14 +358,5 @@
379358
"<node_internals>/**"
380359
]
381360
}
382-
],
383-
"compounds": [
384-
{
385-
"name": "Extension + Debugger",
386-
"configurations": [
387-
"Extension",
388-
"Debugger as debugServer"
389-
]
390-
}
391361
]
392362
}

‎build/existingFiles.json‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -135,27 +135,6 @@
135135
"src/client/common/variables/sysTypes.ts",
136136
"src/client/common/variables/types.ts",
137137
"src/client/debugger/constants.ts",
138-
"src/client/debugger/debugAdapter/Common/Contracts.ts",
139-
"src/client/debugger/debugAdapter/Common/debugStreamProvider.ts",
140-
"src/client/debugger/debugAdapter/Common/processServiceFactory.ts",
141-
"src/client/debugger/debugAdapter/Common/protocolLogger.ts",
142-
"src/client/debugger/debugAdapter/Common/protocolParser.ts",
143-
"src/client/debugger/debugAdapter/Common/protocolWriter.ts",
144-
"src/client/debugger/debugAdapter/Common/Utils.ts",
145-
"src/client/debugger/debugAdapter/DebugClients/DebugClient.ts",
146-
"src/client/debugger/debugAdapter/DebugClients/DebugFactory.ts",
147-
"src/client/debugger/debugAdapter/DebugClients/helper.ts",
148-
"src/client/debugger/debugAdapter/DebugClients/launcherProvider.ts",
149-
"src/client/debugger/debugAdapter/DebugClients/LocalDebugClient.ts",
150-
"src/client/debugger/debugAdapter/DebugClients/localDebugClientV2.ts",
151-
"src/client/debugger/debugAdapter/DebugClients/nonDebugClientV2.ts",
152-
"src/client/debugger/debugAdapter/DebugClients/RemoteDebugClient.ts",
153-
"src/client/debugger/debugAdapter/DebugServers/BaseDebugServer.ts",
154-
"src/client/debugger/debugAdapter/DebugServers/LocalDebugServerV2.ts",
155-
"src/client/debugger/debugAdapter/DebugServers/RemoteDebugServerv2.ts",
156-
"src/client/debugger/debugAdapter/main.ts",
157-
"src/client/debugger/debugAdapter/serviceRegistry.ts",
158-
"src/client/debugger/debugAdapter/types.ts",
159138
"src/client/debugger/extension/banner.ts",
160139
"src/client/debugger/extension/configuration/baseProvider.ts",
161140
"src/client/debugger/extension/configuration/configurationProviderUtils.ts",

‎build/webpack/webpack.debugadapter.config.js‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎gulpfile.js‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -176,18 +176,7 @@ gulp.task('webpack', async () => {
176176
await buildIPyWidgets();
177177
await buildWebPackForDevOrProduction('./build/webpack/webpack.datascience-ui-notebooks.config.js', 'production');
178178
await buildWebPackForDevOrProduction('./build/webpack/webpack.datascience-ui-viewers.config.js', 'production');
179-
// Run both in parallel, for faster process on CI.
180-
// Yes, console would print output from both, that's ok, we have a faster CI.
181-
// If things fail, we can run locally separately.
182-
if (isCI) {
183-
await Promise.all([
184-
buildWebPackForDevOrProduction('./build/webpack/webpack.extension.config.js', 'extension'),
185-
buildWebPackForDevOrProduction('./build/webpack/webpack.debugadapter.config.js', 'debugAdapter')
186-
]);
187-
} else {
188-
await buildWebPackForDevOrProduction('./build/webpack/webpack.extension.config.js', 'extension');
189-
await buildWebPackForDevOrProduction('./build/webpack/webpack.debugadapter.config.js', 'debugAdapter');
190-
}
179+
await buildWebPackForDevOrProduction('./build/webpack/webpack.extension.config.js', 'extension');
191180
});
192181

193182
gulp.task('updateBuildNumber', async () => {
@@ -310,9 +299,7 @@ gulp.task('renameSourceMaps', async () => {
310299
// By default source maps will be disabled in the extension.
311300
// Users will need to use the command `python.enableSourceMapSupport` to enable source maps.
312301
const extensionSourceMap = path.join(__dirname, 'out', 'client', 'extension.js.map');
313-
const debuggerSourceMap = path.join(__dirname, 'out', 'client', 'debugger', 'debugAdapter', 'main.js.map');
314302
await fs.rename(extensionSourceMap, `${extensionSourceMap}.disabled`);
315-
await fs.rename(debuggerSourceMap, `${debuggerSourceMap}.disabled`);
316303
});
317304

318305
gulp.task('verifyBundle', async () => {

‎package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,8 +1329,6 @@
13291329
"languages": [
13301330
"python"
13311331
],
1332-
"program": "./out/client/debugger/debugAdapter/main.js",
1333-
"runtime": "node",
13341332
"variables": {
13351333
"pickProcess": "python.pickLocalProcess"
13361334
},

‎src/client/datascience/jupyterDebugService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import { IDisposable, IDisposableRegistry } from '../common/types';
2626
import { createDeferred } from '../common/utils/async';
2727
import { noop } from '../common/utils/misc';
2828
import { EXTENSION_ROOT_DIR } from '../constants';
29-
import { IProtocolParser } from '../debugger/debugAdapter/types';
3029
import { DebugAdapterDescriptorFactory } from '../debugger/extension/adapter/factory';
30+
import { IProtocolParser } from '../debugger/extension/types';
3131
import { IJupyterDebugService } from './types';
3232

3333
// tslint:disable:no-any

‎src/client/datascience/serviceRegistry.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { NotebookEditorSupport } from '../common/experiments/groups';
77
import { StartPage } from '../common/startPage/startPage';
88
import { IStartPage } from '../common/startPage/types';
99
import { IExperimentsManager } from '../common/types';
10-
import { ProtocolParser } from '../debugger/debugAdapter/Common/protocolParser';
11-
import { IProtocolParser } from '../debugger/debugAdapter/types';
10+
import { ProtocolParser } from '../debugger/extension/helpers/protocolParser';
11+
import { IProtocolParser } from '../debugger/extension/types';
1212
import { IServiceManager } from '../ioc/types';
1313
import { Activation } from './activation';
1414
import { CodeCssGenerator } from './codeCssGenerator';

‎src/client/debugger/debugAdapter/Common/Contracts.ts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/client/debugger/debugAdapter/Common/debugStreamProvider.ts‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎src/client/debugger/debugAdapter/Common/processServiceFactory.ts‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)