Skip to content
This repository was archived by the owner on Dec 6, 2022. It is now read-only.

Commit 8733995

Browse files
author
Dmitry Guketlev
committed
Provide target tyupes filter configuration
1 parent 9247bf7 commit 8733995

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

src/chromeDebug.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import { ChromeDebugSession, logger, UrlPathTransformer, BaseSourceMapTransformer, telemetry } from 'vscode-chrome-debug-core';
66
import * as path from 'path';
77
import * as os from 'os';
8-
import { targetFilter } from './utils';
8+
import { targetFilterProvider } from './utils';
99

1010
import { ChromeDebugAdapter } from './chromeDebugAdapter';
1111

@@ -18,7 +18,7 @@ ChromeDebugSession.run(ChromeDebugSession.getSession(
1818
adapter: ChromeDebugAdapter,
1919
extensionName: EXTENSION_NAME,
2020
logFilePath: path.resolve(os.tmpdir(), 'vscode-chrome-debug.txt'),
21-
targetFilter,
21+
targetFilter: targetFilterProvider(),
2222

2323
pathTransformer: UrlPathTransformer,
2424
sourceMapTransformer: BaseSourceMapTransformer,

src/extension.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import * as vscode from 'vscode';
66
import * as Core from 'vscode-chrome-debug-core';
77

8-
import { targetFilter } from './utils';
8+
import { targetFilterProvider } from './utils';
99

1010
import * as nls from 'vscode-nls';
1111
const localize = nls.loadMessageBundle();
@@ -50,7 +50,11 @@ export class ChromeConfigurationProvider implements vscode.DebugConfigurationPro
5050

5151
let targets;
5252
try {
53-
targets = await discovery.getAllTargets(config.address || '127.0.0.1', config.port, targetFilter, config.url || config.urlFilter);
53+
targets = await discovery.getAllTargets(
54+
config.address || '127.0.0.1',
55+
config.port,
56+
targetFilterProvider(config.targetTypes),
57+
config.url || config.urlFilter);
5458
} catch (e) {
5559
// Target not running?
5660
}
@@ -111,4 +115,4 @@ function unescapeTargetTitle(title: string): string {
111115
.replace(/>/g, '>')
112116
.replace(/'/g, `'`)
113117
.replace(/"/g, '"');
114-
}
118+
}

src/utils.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,6 @@ export class DebounceHelper {
6464
}
6565
}
6666

67-
export const targetFilter: chromeConnection.ITargetFilter =
68-
target => target && (!target.type || target.type === 'page');
67+
export const targetFilterProvider =
68+
(types: Iterable<string> = ['page']): chromeConnection.ITargetFilter =>
69+
target => target && (!target.type || Array.from(types).some(t => t === target.type));

0 commit comments

Comments
 (0)