diff options
| author | Orkun Tokdemir <orkun.tokdemir@qt.io> | 2024-08-27 17:38:37 +0200 |
|---|---|---|
| committer | Orkun Tokdemir <orkun.tokdemir@qt.io> | 2024-08-28 07:58:39 +0000 |
| commit | a783ca9764bf7e6ec03c27a4a3d97ec914fc4b65 (patch) | |
| tree | 3dfab2815744c44c4071330cb29c68e5b260f388 /qt-cpp | |
| parent | 9153f975f97a9b35c1c6ad58e9ffa6f486ea1635 (diff) | |
Style: Use the same naming convention for coreApi across all extensions
Change-Id: I1e526a649de31f992d0652ccee8fb973e0ec7133
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Diffstat (limited to 'qt-cpp')
| -rw-r--r-- | qt-cpp/src/extension.ts | 18 | ||||
| -rw-r--r-- | qt-cpp/src/kit-manager.ts | 6 | ||||
| -rw-r--r-- | qt-cpp/src/project.ts | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/qt-cpp/src/extension.ts b/qt-cpp/src/extension.ts index b747cb4..6d23a07 100644 --- a/qt-cpp/src/extension.ts +++ b/qt-cpp/src/extension.ts @@ -4,7 +4,7 @@ import * as vscode from 'vscode'; import { - CoreApi, + CoreAPI, getCoreApi, QtWorkspaceType, createLogger, @@ -30,7 +30,7 @@ import { EXTENSION_ID } from '@/constants'; export let kitManager: KitManager; export let projectManager: ProjectManager; -export let coreApi: CoreApi | undefined; +export let coreAPI: CoreAPI | undefined; let taskProvider: vscode.Disposable | undefined; @@ -42,7 +42,7 @@ export async function activate(context: vscode.ExtensionContext) { initLogger(EXTENSION_ID); kitManager = new KitManager(context); projectManager = new ProjectManager(context); - coreApi = await getCoreApi(); + coreAPI = await getCoreApi(); if (vscode.workspace.workspaceFolders !== undefined) { for (const folder of vscode.workspace.workspaceFolders) { @@ -67,7 +67,7 @@ export async function activate(context: vscode.ExtensionContext) { wasmStartTaskProvider ); - coreApi?.onValueChanged((message) => { + coreAPI?.onValueChanged((message) => { logger.info('Received config change:', message.config as unknown as string); processMessage(message); }); @@ -86,15 +86,15 @@ export function deactivate() { } export async function initCoreValues() { - if (!coreApi) { - throw new Error('CoreApi is not initialized'); + if (!coreAPI) { + throw new Error('CoreAPI is not initialized'); } const globalUpdateMessage = new QtWorkspaceConfigMessage(GlobalWorkspace); globalUpdateMessage.config.set( QtInsRootConfigName, getCurrentGlobalQtInstallationRoot() ); - coreApi.update(globalUpdateMessage); + coreAPI.update(globalUpdateMessage); for (const project of projectManager.getProjects()) { const folder = project.getFolder(); @@ -113,8 +113,8 @@ export async function initCoreValues() { QtInsRootConfigName, KitManager.getWorkspaceFolderQtInsRoot(folder) ); - logger.info('Updating coreApi with message:', message as unknown as string); - coreApi.update(message); + logger.info('Updating coreAPI with message:', message as unknown as string); + coreAPI.update(message); } } diff --git a/qt-cpp/src/kit-manager.ts b/qt-cpp/src/kit-manager.ts index 5df58cb..9cc9bf9 100644 --- a/qt-cpp/src/kit-manager.ts +++ b/qt-cpp/src/kit-manager.ts @@ -20,7 +20,7 @@ import { } from 'qt-lib'; import * as qtPath from '@util/get-qt-paths'; import { Project } from '@/project'; -import { coreApi } from '@/extension'; +import { coreAPI } from '@/extension'; import { GlobalStateManager } from '@/state'; const logger = createLogger('kit-manager'); @@ -571,9 +571,9 @@ export class KitManager { } public static getWorkspaceFolderQtInsRoot(folder: vscode.WorkspaceFolder) { - return coreApi?.getValue<string>(folder, QtInsRootConfigName) ?? ''; + return coreAPI?.getValue<string>(folder, QtInsRootConfigName) ?? ''; } } export function getCurrentGlobalQtInstallationRoot(): string { - return coreApi?.getValue<string>(GlobalWorkspace, QtInsRootConfigName) ?? ''; + return coreAPI?.getValue<string>(GlobalWorkspace, QtInsRootConfigName) ?? ''; } diff --git a/qt-cpp/src/project.ts b/qt-cpp/src/project.ts index fe649a6..82e49b3 100644 --- a/qt-cpp/src/project.ts +++ b/qt-cpp/src/project.ts @@ -5,7 +5,7 @@ import * as vscode from 'vscode'; import * as cmakeAPi from 'vscode-cmake-tools'; import { WorkspaceStateManager } from '@/state'; -import { coreApi, kitManager } from '@/extension'; +import { coreAPI, kitManager } from '@/extension'; import { createLogger, QtWorkspaceConfigMessage } from 'qt-lib'; import { ProjectBase } from 'qt-lib'; import { getSelectedQtInstallationPath } from '@cmd/register-qt-path'; @@ -39,7 +39,7 @@ export class Project implements ProjectBase { ); const message = new QtWorkspaceConfigMessage(this.folder); message.config.set('selectedKitPath', selectedKitPath); - coreApi?.update(message); + coreAPI?.update(message); } } ); |