提交 d03974b5 编写于 作者: I isidor

multi root: launch and tasks read the master for now

上级 2b5c249a
......@@ -276,7 +276,7 @@ export class ConfigurationManager implements IConfigurationManager {
return null;
}
const config = this.configurationService.getConfiguration<IGlobalConfig>('launch');
const config = this.configurationService.getConfiguration<IGlobalConfig>('launch', { resource: this.contextService.getWorkspace().resource });
if (!config || !config.compounds) {
return null;
}
......@@ -285,7 +285,7 @@ export class ConfigurationManager implements IConfigurationManager {
}
public getConfigurationNames(): string[] {
const config = this.configurationService.getConfiguration<IGlobalConfig>('launch');
const config = this.configurationService.getConfiguration<IGlobalConfig>('launch', { resource: this.contextService.getWorkspace().resource });
if (!config || !config.configurations) {
return [];
} else {
......@@ -306,7 +306,7 @@ export class ConfigurationManager implements IConfigurationManager {
return null;
}
const config = this.configurationService.getConfiguration<IGlobalConfig>('launch');
const config = this.configurationService.getConfiguration<IGlobalConfig>('launch', { resource: this.contextService.getWorkspace().resource });
if (!config || !config.configurations) {
return null;
}
......
......@@ -822,7 +822,7 @@ export class DebugService implements debug.IDebugService {
watchExpressionsCount: this.model.getWatchExpressions().length,
extensionName: `${adapter.extensionDescription.publisher}.${adapter.extensionDescription.name}`,
isBuiltin: adapter.extensionDescription.isBuiltin,
launchJsonExists: !!this.configurationService.getConfiguration<debug.IGlobalConfig>('launch')
launchJsonExists: this.contextService.getWorkspace() && !!this.configurationService.getConfiguration<debug.IGlobalConfig>('launch', { resource: this.contextService.getWorkspace().resource })
});
}).then(() => process, (error: any) => {
if (error instanceof Error && error.message === 'Canceled') {
......
......@@ -1277,7 +1277,7 @@ class TaskService extends EventEmitter implements ITaskService {
}
private getConfiguration(): { config: TaskConfig.ExternalTaskRunnerConfiguration; hasParseErrors: boolean } {
let result = this.configurationService.getConfiguration<TaskConfig.ExternalTaskRunnerConfiguration>('tasks');
let result = this.configurationService.getConfiguration<TaskConfig.ExternalTaskRunnerConfiguration>('tasks', { resource: this.contextService.getWorkspace().resource });
if (!result) {
return { config: undefined, hasParseErrors: false };
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册