Skip to content

Commit 25ce532

Browse files
committed
remove dup getConfig
1 parent 2d208c0 commit 25ce532

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

src/extension/debugger/configuration/launch.json/launchJsonReader.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import * as path from 'path';
55
import * as fs from 'fs-extra';
66
import { parse } from 'jsonc-parser';
77
import { DebugConfiguration, Uri, WorkspaceFolder } from 'vscode';
8-
import { getWorkspaceFolder } from '../../../common/vscodeapi';
8+
import { getConfiguration, getWorkspaceFolder } from '../../../common/vscodeapi';
99
import { traceLog } from '../../../common/log/logging';
10-
import { getConfiguration } from './utils';
1110

1211
export async function getConfigurationsForWorkspace(workspace: WorkspaceFolder): Promise<DebugConfiguration[]> {
1312
traceLog('Getting configurations for workspace');

src/extension/debugger/configuration/launch.json/utils.ts

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

src/test/unittest/configuration/launch.json/launchJsonReader.unit.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
getConfigurationsForWorkspace,
1010
getConfigurationsFromSettings,
1111
} from '../../../../extension/debugger/configuration/launch.json/launchJsonReader';
12-
import * as utils from '../../../../extension/debugger/configuration/launch.json/utils';
12+
import * as vscodeapi from '../../../../extension/common/vscodeapi';
1313

1414
suite('Debugging - launchJsonReader', () => {
1515
let sandbox: sinon.SinonSandbox;
@@ -64,7 +64,7 @@ suite('Debugging - launchJsonReader', () => {
6464
]);
6565

6666
sandbox.stub(fs, 'pathExists').resolves(false);
67-
sandbox.stub(utils, 'getConfiguration').returns(mockConfig.object);
67+
sandbox.stub(vscodeapi, 'getConfiguration').returns(mockConfig.object);
6868

6969
const configurations = await getConfigurationsForWorkspace(workspace.object);
7070
assert.strictEqual(configurations.length, 1);
@@ -89,7 +89,7 @@ suite('Debugging - launchJsonReader', () => {
8989
},
9090
]);
9191

92-
sandbox.stub(utils, 'getConfiguration').returns(mockConfig.object);
92+
sandbox.stub(vscodeapi, 'getConfiguration').returns(mockConfig.object);
9393

9494
const configurations = getConfigurationsFromSettings(workspace.object);
9595
assert.strictEqual(configurations.length, 1);
@@ -104,7 +104,7 @@ suite('Debugging - launchJsonReader', () => {
104104
mockConfig.setup((c) => c.get('configurations')).returns(() => []);
105105
mockConfig.setup((c) => c.configurations).returns(() => []);
106106

107-
sandbox.stub(utils, 'getConfiguration').returns(mockConfig.object);
107+
sandbox.stub(vscodeapi, 'getConfiguration').returns(mockConfig.object);
108108

109109
assert.throws(
110110
() => getConfigurationsFromSettings(workspace.object),

0 commit comments

Comments
 (0)