Propagate errors from INCAFTER compiler option (#768)

Signed-off-by: Markus Rudolph <markus.rudolph@typefox.io>

Author: Lotes

packages/language/src/validation/pp-validator.ts

@@ -22,7 +22,7 @@ import { LSPIS001_standalone_skip_directive_not_supported } from "./language-ser
 import { DeprecateIncludes } from "./compiler/IBM2444Iff-deprecate";
 import { typeCheck } from "./type-check-validator";
 import { CompilationUnit } from "../workspace/compilation-unit";
-import { IncludeDirective } from "../syntax-tree/ast";
+import { IncludeDirective, IncludeItem } from "../syntax-tree/ast";
 import { DiagnosticCategory } from "./diagnostics-store";
 import { Severity } from "../language-server/types";
 
@@ -48,20 +48,31 @@ function PropagateIncludeErrors(
   compilationUnit: CompilationUnit,
 ): void {
   for (const item of includeDirective.items.filter((i) => i.filePath)) {
-    const errors = [
-      DiagnosticCategory.Lexer,
-      DiagnosticCategory.Parser,
-      DiagnosticCategory.CompilerOptions,
-    ].flatMap((category) =>
-      compilationUnit.diagnostics.getByUri(category, item.filePath!),
-    );
-    if (errors.length > 0) {
-      acceptor({
-        uri: item.token?.uri?.toString(),
-        range: item.range ?? undefined,
-        message: `Included file '${item.relativeFilePath}' contains ${errors.length} errors.`,
-        severity: Severity.E,
-      });
-    }
+    PropagateIncludeItemErrors(item, acceptor, compilationUnit);
+  }
+}
+
+export function PropagateIncludeItemErrors(
+  item: IncludeItem,
+  acceptor: ValidationAcceptor,
+  compilationUnit: CompilationUnit,
+): void {
+  const errors = [
+    DiagnosticCategory.Lexer,
+    DiagnosticCategory.Parser,
+    DiagnosticCategory.CompilerOptions,
+  ].flatMap((category) =>
+    compilationUnit.diagnostics.getByUri(category, item.filePath!),
+  );
+  if (errors.length > 0 && item.token) {
+    acceptor({
+      uri: item.token.uri?.toString(),
+      range: item.range ?? {
+        start: item.token.startOffset,
+        end: item.token.endOffset + 1,
+      },
+      message: `Included file '${item.relativeFilePath}' contains ${errors.length} errors.`,
+      severity: Severity.E,
+    });
   }
 }

packages/language/src/validation/validator.ts

@@ -18,7 +18,10 @@ import { forEachNode } from "../syntax-tree/ast-iterator";
 import { registerPliValidationChecks } from "./pli-validator";
 import { ScopeCache, ScopeCacheGroups } from "../linking/scope";
 import { LinkerErrorReporter } from "../linking/error";
-import { registerPreprocessorValidationChecks } from "./pp-validator";
+import {
+  PropagateIncludeItemErrors,
+  registerPreprocessorValidationChecks,
+} from "./pp-validator";
 import { DiagnosticCategory } from "./diagnostics-store";
 
 /**
@@ -46,6 +49,12 @@ export function generatePreprocessorValidationDiagnostics(
   unit: CompilationUnit,
 ): void {
   const acceptor = unit.diagnostics.getAcceptor(DiagnosticCategory.Validation);
+  if (unit.compilerOptions.incAfter?.token) {
+    const item = unit.compilerOptions.incAfter.token.element;
+    if (item && item.kind === SyntaxKind.IncludeItemFile) {
+      PropagateIncludeItemErrors(item, acceptor, unit);
+    }
+  }
   validateSyntaxNode(unit, unit.preprocessorAst, acceptor, ppValidations);
 }
 

packages/language/test/fourslash/preprocessor/include/incafter-with-errors.ts

@@ -0,0 +1,25 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ */
+
+/// <reference path="../../framework.ts" />
+
+// @filename: cpy/lib.pli
+//// WRONG WRONG WRONG!!
+
+// @filename: main.pli
+////*PROCESS <|1:INCAFTER(PROCESS(lib))|>;
+
+verify.expectDiagnosticsAt(1, [
+  {
+    severity: 2,
+    message: "Included file './cpy/lib.pli' contains 3 errors.",
+  },
+]);