diff --git a/src/providers/completionProvider.ts b/src/providers/completionProvider.ts index 5455645d..7e818ae5 100755 --- a/src/providers/completionProvider.ts +++ b/src/providers/completionProvider.ts @@ -457,7 +457,7 @@ export class CompletionProvider implements vscode.CompletionItemProvider { } try { const fetched = await getComponentService().getComponentFromUrl(expandedUrl); - if (!fetched) { + if (!fetched || fetched.fetchFailure) { return null; } getComponentCacheManager().addDynamicComponent({ diff --git a/src/providers/componentDetector.ts b/src/providers/componentDetector.ts index e5800506..74cb7a97 100755 --- a/src/providers/componentDetector.ts +++ b/src/providers/componentDetector.ts @@ -255,7 +255,7 @@ export async function detectIncludeComponent(document: vscode.TextDocument, posi const componentService = getComponentService(); const specificVersionComponent = await componentService.getComponentFromUrl(componentUrl); - if (specificVersionComponent) { + if (specificVersionComponent && !specificVersionComponent.fetchFailure) { logger.debug(`[ComponentDetector] Successfully fetched specific version ${requestedVersion} for ${cachedComponent.name}`, 'ComponentDetector'); const cacheVersion = requestedVersion || 'main'; diff --git a/src/providers/validationProvider.ts b/src/providers/validationProvider.ts index 663828ba..008fa63c 100644 --- a/src/providers/validationProvider.ts +++ b/src/providers/validationProvider.ts @@ -142,6 +142,7 @@ export class ValidationProvider implements vscode.CodeActionProvider { } this.logger.debug(`[ValidationProvider] Validating ${document.fileName}`, 'ValidationProvider'); + const validatedVersion = document.version; const findings = await validateIncludes({ text: document.getText(), file: document.uri.fsPath, @@ -150,6 +151,12 @@ export class ValidationProvider implements vscode.CodeActionProvider { resolveLocalInclude: localPath => resolveLocalIncludeOutcome(localPath, document), }); + // A slow pass on a half-typed ref would overwrite the newer pass; the edit already scheduled one for this text. + if (document.version !== validatedVersion) { + this.logger.debug(`[ValidationProvider] Discarding stale findings for ${document.fileName} (v${validatedVersion}, now v${document.version})`, 'ValidationProvider'); + return; + } + this.logger.debug(`[ValidationProvider] Created ${findings.length} total diagnostics for ${document.fileName}`, 'ValidationProvider'); this.diagnosticCollection.set(document.uri, findings.map(findingToDiagnostic)); } @@ -167,6 +174,9 @@ export class ValidationProvider implements vscode.CodeActionProvider { */ private async fetchComponent(expandedUrl: string): Promise { const fetchedComponent = await getComponentService().getComponentFromUrl(expandedUrl); + if (fetchedComponent?.fetchFailure) { + return null; + } if (fetchedComponent) { this.addComponentToCache(expandedUrl, fetchedComponent); return fetchedComponent; diff --git a/src/services/component/componentFetcher.ts b/src/services/component/componentFetcher.ts index 5e004d91..4f48d2de 100644 --- a/src/services/component/componentFetcher.ts +++ b/src/services/component/componentFetcher.ts @@ -12,7 +12,7 @@ import type { GitLabProjectInfo, GitLabTreeItem } from '../../types/api'; import { HttpClient } from '../../utils/httpClient'; import { Logger } from '../../utils/logger'; import { GitLabSpecParser, ComponentVariable } from '../../parsers/specParser'; -import { classifyFetchFailure, isAuthError } from '../../errors'; +import { classifyFetchFailure, isAuthError, NetworkError } from '../../errors'; import { TokenManager } from './tokenManager'; import { UrlParser } from './urlParser'; import { @@ -212,15 +212,14 @@ export class ComponentFetcher { const project = projectInfo.value; - // Process template result - let resolvedTemplatePath: string | undefined; - if (templateResult.status === 'fulfilled' && templateResult.value) { - const { content, parameters: extractedParams, templatePath } = templateResult.value; - templateContent = content; - parameters = extractedParams; - resolvedTemplatePath = templatePath; - this.logger.debug(`Found component template with ${parameters.length} parameters at ${templatePath}`); + // A component with no inputs would flag every provided input as unknown. + if (templateResult.status !== 'fulfilled' || !templateResult.value) { + throw new NetworkError(`No template for component '${componentName}' at ref '${version}'`, { statusCode: 404 }); } + const { content, parameters: extractedParams, templatePath: resolvedTemplatePath } = templateResult.value; + templateContent = content; + parameters = extractedParams; + this.logger.debug(`Found component template with ${parameters.length} parameters at ${resolvedTemplatePath}`); // A component's README sits next to its template; fall back to the repo root for flat layouts. const readmeDirs = [readmeDirForTemplate(resolvedTemplatePath), '']; diff --git a/tests/unit/componentFetcherUrl.test.ts b/tests/unit/componentFetcherUrl.test.ts index 8523408e..a377b2f1 100644 --- a/tests/unit/componentFetcherUrl.test.ts +++ b/tests/unit/componentFetcherUrl.test.ts @@ -1,8 +1,8 @@ // @mocha /** * `fetchComponentMetadata` must address the right project and ref for a component URL whose version contains `/` - * (a branch such as `feature/my-branch`). The HTTP client is a fake that records every URL it is asked for, so - * nothing leaves the process. + * (a branch such as `feature/my-branch`), and report a ref with no template as not found. The HTTP client is a fake + * that records every URL it is asked for, so nothing leaves the process. */ import * as assert from 'node:assert/strict'; @@ -63,6 +63,16 @@ suite('ComponentFetcher.fetchComponentMetadata with a slashed version', () => { assert.deepEqual(component.parameters.map((p) => p.name), ['stage']); }); + test('fails as not-found, not as a component with no inputs, when the ref has no template', async () => { + const fetcher = new ComponentFetcher(createFakeHttp([], true), new TokenManager(), new UrlParser()); + + const component = await fetcher.fetchComponentMetadata(`https://gitlab.com/${PROJECT_PATH}/other-component@${BRANCH}`); + + assert.deepEqual(component.fetchFailure, { kind: 'not-found', statusCode: NOT_FOUND }); + assert.equal(component.name, 'other-component'); + assert.deepEqual(component.parameters, []); + }); + test('names the fallback component after the component, not the branch', async () => { const fetcher = new ComponentFetcher(createFakeHttp([], false), new TokenManager(), new UrlParser());