Skip to content

Fix retrieval of CL syntax checker component #70

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.

Sign up for GitHub

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

Closed
SanjulaGanepola wants to merge 2 commits into from
Closed

Fix retrieval of CL syntax checker component #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac8bfb8
Fix retrieval of CL syntax checker component
SanjulaGanepola May 20, 2026
bb88a9b
Fix status check
SanjulaGanepola May 20, 2026
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
2 changes: 1 addition & 1 deletion client/src/components/gencmdxml/gencmdxml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default class GenCmdXml implements IBMiComponent {
const componentManager = connection.getComponentManager();
const componentStates = componentManager.getComponentStates();
const genCmdXmlComponentState = componentStates.find(cs => cs.id.name === GenCmdXml.ID);
if (genCmdXmlComponentState && (genCmdXmlComponentState.state === `Installed` || genCmdXmlComponentState.state === `NeedsUpdate`)) {
if (genCmdXmlComponentState && (genCmdXmlComponentState.state.status === `Installed` || genCmdXmlComponentState.state.status === `NeedsUpdate`)) {
const allAvailableComponents = componentManager.getAllAvailableComponents();
const genCmdXmlComponent = allAvailableComponents.find(ac => ac.getIdentification().name === GenCmdXml.ID) as GenCmdXml;
if (genCmdXmlComponent) {
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/syntaxChecker/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ export class CLSyntaxChecker implements IBMiComponent {
return { name: CLSyntaxChecker.ID, version: this.currentVersion };
}

static get(): CLSyntaxChecker | undefined {
static async get(): Promise<CLSyntaxChecker | undefined> {
const instance = getInstance();
const connection = instance?.getConnection();
return connection?.getComponent<CLSyntaxChecker>(CLSyntaxChecker.ID);
return await connection?.getComponent<CLSyntaxChecker>(CLSyntaxChecker.ID);
}

async getRemoteState(connection: IBMi, installDirectory: string): Promise<ComponentState> {
Expand Down
18 changes: 9 additions & 9 deletions client/src/components/syntaxChecker/problemProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ export namespace ProblemProvider {
}
}),

workspace.onDidOpenTextDocument(e => {
workspace.onDidOpenTextDocument(async e => {
const isSupportedLanguage = SUPPORTED_LANGUAGE_IDS.includes(e.languageId as SupportedLanguageId);
if (isSupportedLanguage) {
if (checkerAvailable() && !isSafeDocument(e)) {
if (await checkerAvailable() && !isSafeDocument(e)) {
const basename = e.fileName ? path.basename(e.fileName) : `Untitled`;
documentLargeError(basename);
}
Expand All @@ -46,13 +46,13 @@ export namespace ProblemProvider {
}
}),

workspace.onDidChangeTextDocument(e => {
workspace.onDidChangeTextDocument(async e => {
shiftDiagnostics(e.document, e.contentChanges);

const isSupportedLanguage = SUPPORTED_LANGUAGE_IDS.includes(e.document.languageId as SupportedLanguageId);
if (isSupportedLanguage) {
const checkOnChange = Configuration.get<boolean>(`syntax.checkOnEdit`) || false;
if (checkerAvailable() && checkOnChange && e.contentChanges.length > 0) {
if (await checkerAvailable() && checkOnChange && e.contentChanges.length > 0) {
if (currentTimeout) {
clearTimeout(currentTimeout);
}
Expand Down Expand Up @@ -158,7 +158,7 @@ export namespace ProblemProvider {
}

async function validateCLDocument(document: TextDocument, specificLines?: number[]) {
const checker = CLSyntaxChecker.get();
const checker = await CLSyntaxChecker.get();
if (checker) {
const basename = document.fileName ? path.basename(document.fileName) : `Untitled`;
if (isSafeDocument(document)) {
Expand Down Expand Up @@ -267,12 +267,12 @@ export namespace ProblemProvider {
return isSupportedLanguage && isBelowMaxLength;
}

function checkerAvailable() {
return CLSyntaxChecker.get() !== undefined;
async function checkerAvailable() {
return await CLSyntaxChecker.get() !== undefined;
}

export function setCheckerAvailableContext(additionalState = true) {
const available = checkerAvailable() && additionalState;
export async function setCheckerAvailableContext(additionalState = true) {
const available = await checkerAvailable() && additionalState;
commands.executeCommand(`setContext`, `vscode-clle.syntax.checkerAvailable`, available);
}

Expand Down
Loading