Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix regression preventing command palette from opening #5888

Merged
merged 1 commit into from
Aug 8, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions packages/cpp/src/browser/cpp-build-configurations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { WorkspaceService } from '@theia/workspace/lib/browser';
import { CppBuildConfiguration, CppBuildConfigurationServer } from '../common/cpp-build-configuration-protocol';
import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
import URI from '@theia/core/lib/common/uri';
import { deepClone } from '@theia/core';

/**
* @deprecated Import from `@theia/cpp/lib/common` instead
Expand Down Expand Up @@ -232,7 +233,7 @@ export class CppBuildConfigurationManagerImpl implements CppBuildConfigurationMa
await Promise.all(roots.map(async ({ uri: root }) => {
const context = new URI(root);
const configs = this.getConfigsFromPreferences(root);
const resolvedConfigs = configs.map(config => ({ ...config })); // copy
const resolvedConfigs = configs.map(config => deepClone(config)); // copy
await Promise.all(resolvedConfigs.map(async config => Promise.all<any>([
this.variableResolver.resolve(config.directory, { context })
.then(resolved => config.directory = resolved),
Expand Down Expand Up @@ -271,7 +272,10 @@ export class CppBuildConfigurationManagerImpl implements CppBuildConfigurationMa

getActiveConfig(root?: string): CppBuildConfiguration | undefined {
// Get the active workspace root for the given uri, else for the first workspace root.
const workspaceRoot = root ? root : this.workspaceService.tryGetRoots()[0].uri;
const workspaceRoot = this.getRoot(root);
if (!workspaceRoot) {
return undefined;
}
return this.activeConfigurations.get(workspaceRoot);
}

Expand All @@ -281,7 +285,10 @@ export class CppBuildConfigurationManagerImpl implements CppBuildConfigurationMa

setActiveConfig(config: CppBuildConfiguration | undefined, root?: string): void {
// Set the active workspace root for the given uri, else for the first workspace root.
const workspaceRoot = root ? root : this.workspaceService.tryGetRoots()[0].uri;
const workspaceRoot = this.getRoot(root);
if (!workspaceRoot) {
return;
}
this.activeConfigurations.set(workspaceRoot, config);
this.saveActiveConfigs(this.activeConfigurations);

Expand All @@ -305,7 +312,10 @@ export class CppBuildConfigurationManagerImpl implements CppBuildConfigurationMa
}

getConfigs(root?: string): CppBuildConfiguration[] {
const workspaceRoot = root ? root : this.workspaceService.tryGetRoots()[0].uri;
const workspaceRoot = this.getRoot(root);
if (!workspaceRoot) {
return [];
}
let configs = this.resolvedConfigurations.get(workspaceRoot);
if (!configs) {
this.resolvedConfigurations.set(workspaceRoot, configs = []);
Expand All @@ -325,4 +335,15 @@ export class CppBuildConfigurationManagerImpl implements CppBuildConfigurationMa
async getMergedCompilationDatabase(params: { directories: string[] }): Promise<string> {
return this.buildConfigurationServer.getMergedCompilationDatabase(params);
}

protected getRoot(root?: string): string | undefined {
if (root) {
return root;
}
const roots = this.workspaceService.tryGetRoots();
if (roots.length > 0) {
return roots[0].uri;
}
return undefined;
}
}