From cda9e9aad22187df635b3d15c843369f27eddd39 Mon Sep 17 00:00:00 2001 From: Georg Schwarz Date: Fri, 12 Jan 2024 17:58:24 +0100 Subject: [PATCH] Ensure pipeline wrapper can be created in validations --- .../src/lib/validation/checks/block-definition.ts | 6 +++++- .../src/lib/validation/checks/pipeline-definition.ts | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/language-server/src/lib/validation/checks/block-definition.ts b/libs/language-server/src/lib/validation/checks/block-definition.ts index cd2aa118c..87da1ae64 100644 --- a/libs/language-server/src/lib/validation/checks/block-definition.ts +++ b/libs/language-server/src/lib/validation/checks/block-definition.ts @@ -31,7 +31,10 @@ function checkPipesOfBlock( whatToCheck: 'input' | 'output', context: ValidationContext, ): void { - if (!BlockTypeWrapper.canBeWrapped(block?.type)) { + if ( + !BlockTypeWrapper.canBeWrapped(block?.type) || + !PipelineWrapper.canBeWrapped(block.$container) + ) { return; } const blockType = new BlockTypeWrapper(block?.type); @@ -98,6 +101,7 @@ function collectPipes( whatToCheck: 'input' | 'output', ): PipeWrapper[] { const pipelineWrapper = new PipelineWrapper(block.$container); + let pipes: PipeWrapper[]; switch (whatToCheck) { case 'input': { diff --git a/libs/language-server/src/lib/validation/checks/pipeline-definition.ts b/libs/language-server/src/lib/validation/checks/pipeline-definition.ts index 35a2198ad..1ccffc8c7 100644 --- a/libs/language-server/src/lib/validation/checks/pipeline-definition.ts +++ b/libs/language-server/src/lib/validation/checks/pipeline-definition.ts @@ -22,7 +22,11 @@ function checkStartingBlocks( pipeline: PipelineDefinition, context: ValidationContext, ): void { + if (PipelineWrapper.canBeWrapped(pipeline)) { + return; + } const pipelineWrapper = new PipelineWrapper(pipeline); + const startingBlocks = pipelineWrapper.getStartingBlocks(); if (startingBlocks.length === 0) { context.accept(