Skip to content

Commit 481ccdb

Browse files
Read launch config from devcontainers (#388)
* Use workspace when getting the launch.json * fix local vsix creation
1 parent 161cd6b commit 481ccdb

File tree

3 files changed

+65
-82
lines changed

3 files changed

+65
-82
lines changed

package-lock.json

Lines changed: 63 additions & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export async function getConfigurationsForWorkspace(workspace: WorkspaceFolder):
1111
const filename = path.join(workspace.uri.fsPath, '.vscode', 'launch.json');
1212
if (!(await fs.pathExists(filename))) {
1313
// Check launch config in the workspace file
14-
const codeWorkspaceConfig = getConfiguration('launch');
14+
const codeWorkspaceConfig = getConfiguration('launch', workspace);
1515
if (!codeWorkspaceConfig.configurations || !Array.isArray(codeWorkspaceConfig.configurations)) {
1616
return [];
1717
}

webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ const extensionConfig = {
3838
'@opentelemetry/instrumentation': 'commonjs @opentelemetry/instrumentation', // ignored because we don't ship instrumentation
3939
'@azure/opentelemetry-instrumentation-azure-sdk': 'commonjs @azure/opentelemetry-instrumentation-azure-sdk', // ignored because we don't ship instrumentation
4040
'@azure/functions-core': '@azure/functions-core', // ignored because we don't ship instrumentation
41+
'@microsoft/dynamicproto-js': '@microsoft/dynamicproto-js', // ignored because we don't ship instrumentation
4142
},
4243
resolve: {
4344
// support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader

0 commit comments

Comments
 (0)