aboutsummaryrefslogtreecommitdiffstats
path: root/qt-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qt-cpp')
-rw-r--r--qt-cpp/src/extension.ts10
-rw-r--r--qt-cpp/src/kit-manager.ts6
2 files changed, 8 insertions, 8 deletions
diff --git a/qt-cpp/src/extension.ts b/qt-cpp/src/extension.ts
index 9d2cc5a..6f38401 100644
--- a/qt-cpp/src/extension.ts
+++ b/qt-cpp/src/extension.ts
@@ -82,9 +82,9 @@ export async function activate(context: vscode.ExtensionContext) {
wasmStartTaskProvider
);
- coreAPI?.onValueChanged((message) => {
+ coreAPI?.onValueChanged(async (message) => {
logger.info('Received config change:', message.config as unknown as string);
- processMessage(message);
+ return processMessage(message);
});
void tryToUseCMakeFromQtTools();
await kitManager.checkForAllQtInstallations();
@@ -125,7 +125,7 @@ export async function initCoreValues() {
}
}
-function processMessage(message: QtWorkspaceConfigMessage) {
+async function processMessage(message: QtWorkspaceConfigMessage) {
// check if workspace folder is a string
let project: CppProject | undefined;
if (typeof message.workspaceFolder === 'string') {
@@ -142,14 +142,14 @@ function processMessage(message: QtWorkspaceConfigMessage) {
for (const key of message.config.keys()) {
if (key === QtInsRootConfigName) {
const value = message.get<string>(QtInsRootConfigName) ?? '';
- void kitManager.onQtInstallationRootChanged(value, project?.folder);
+ await kitManager.onQtInstallationRootChanged(value, project?.folder);
continue;
}
if (key === AdditionalQtPathsName) {
const additionalQtPaths =
message.get<QtAdditionalPath[]>(AdditionalQtPathsName) ?? [];
- kitManager.onQtPathsChanged(additionalQtPaths, project?.folder);
+ await kitManager.onQtPathsChanged(additionalQtPaths, project?.folder);
continue;
}
}
diff --git a/qt-cpp/src/kit-manager.ts b/qt-cpp/src/kit-manager.ts
index 884eed8..8765e8c 100644
--- a/qt-cpp/src/kit-manager.ts
+++ b/qt-cpp/src/kit-manager.ts
@@ -262,17 +262,17 @@ export class KitManager {
}
);
}
- public onQtPathsChanged(
+ public async onQtPathsChanged(
additionalQtPaths: QtAdditionalPath[],
workspaceFolder?: vscode.WorkspaceFolder
) {
- void vscode.window.withProgress(
+ return vscode.window.withProgress(
{
location: vscode.ProgressLocation.Notification,
title: 'Updating kits'
},
async () => {
- await this.updateQtPathsQtKits(additionalQtPaths, workspaceFolder);
+ return this.updateQtPathsQtKits(additionalQtPaths, workspaceFolder);
}
);
}