Skip to content

Commit f314b55

Browse files
authored
Merge pull request #1305 from microsoft/chore/deprecated-prefixed-types
chore: mark prefixed debug types as deprecated
2 parents 562f999 + 1253dab commit f314b55

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/build/generate-contributions.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,7 @@ function buildDebuggers() {
10601060
const entry = ensureEntryForType(preferred, d);
10611061
delete entry.languages;
10621062
entries.unshift(entry);
1063+
primary.deprecated = `Please use type ${preferred} instead`;
10631064
}
10641065

10651066
entries[0].configurationSnippets.push(...d.configurationSnippets);

src/common/contributionUtils.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ export const preferredDebugTypes: ReadonlyMap<DebugType, string> = new Map([
6565
[DebugType.Edge, 'msedge'],
6666
]);
6767

68+
export const getPreferredOrDebugType = <T extends DebugType>(t: T) =>
69+
(preferredDebugTypes.get(t) as T) || t;
70+
6871
export const enum DebugType {
6972
ExtensionHost = 'pwa-extensionHost',
7073
Terminal = 'node-terminal',

src/ui/configuration/nodeDebugConfigurationProvider.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { injectable } from 'inversify';
66
import * as path from 'path';
77
import * as vscode from 'vscode';
88
import * as nls from 'vscode-nls';
9-
import { DebugType } from '../../common/contributionUtils';
9+
import { DebugType, getPreferredOrDebugType } from '../../common/contributionUtils';
1010
import { flatten } from '../../common/objUtils';
1111
import {
1212
AnyNodeConfiguration,
@@ -80,7 +80,7 @@ export class NodeDynamicDebugConfigurationProvider extends BaseConfigurationProv
8080
*/
8181
protected async getFromNpmScripts(folder?: vscode.WorkspaceFolder): Promise<DynamicConfig[]> {
8282
const openTerminal: AnyResolvingConfiguration = {
83-
type: DebugType.Terminal,
83+
type: getPreferredOrDebugType(DebugType.Terminal),
8484
name: localize('debug.terminal.label', 'JavaScript Debug Terminal'),
8585
request: 'launch',
8686
cwd: folder?.uri.fsPath,
@@ -98,7 +98,7 @@ export class NodeDynamicDebugConfigurationProvider extends BaseConfigurationProv
9898
const packageManager = await getPackageManager(folder);
9999
return scripts
100100
.map<DynamicConfig>(script => ({
101-
type: DebugType.Terminal,
101+
type: getPreferredOrDebugType(DebugType.Terminal),
102102
name: localize('node.launch.script', 'Run Script: {0}', script.name),
103103
request: 'launch',
104104
command: `${packageManager} run ${script.name}`,
@@ -122,7 +122,7 @@ export class NodeDynamicDebugConfigurationProvider extends BaseConfigurationProv
122122

123123
return [
124124
{
125-
type: DebugType.Node,
125+
type: getPreferredOrDebugType(DebugType.Node),
126126
name: localize('node.launch.currentFile', 'Run Current File'),
127127
request: 'launch',
128128
program: editor.document.uri.fsPath,

0 commit comments

Comments
 (0)