Fix Compiler Plugin Diagnostics not Reporting (#1829)

* Bump the dependency versions * Fix compiler plugin not showing diagnostics
ballerina-platform · Apr 15, 2024 · 9ebb287 · 9ebb287
1 parent 7ec5a27
commit 9ebb287
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/...plugin-tests/src/test/java/io/ballerina/stdlib/graphql/compiler/SchemaGenerationTest.java b/...plugin-tests/src/test/java/io/ballerina/stdlib/graphql/compiler/SchemaGenerationTest.java
@@ -231,8 +231,6 @@ public void testMultipleInlineServiceDeclarations() {
     private DiagnosticResult getDiagnosticResult(String path) {
         Path projectDirPath = RESOURCE_DIRECTORY.resolve(path);
         BuildProject project = BuildProject.load(getEnvironmentBuilder(), projectDirPath);
-        DiagnosticResult diagnosticResult = project.currentPackage().getCompilation().diagnosticResult();
-        Assert.assertEquals(diagnosticResult.errorCount(), 0);
         return project.currentPackage().runCodeGenAndModifyPlugins();
     }
 

diff --git a/...lugin-tests/src/test/java/io/ballerina/stdlib/graphql/compiler/ServiceValidationTest.java b/...lugin-tests/src/test/java/io/ballerina/stdlib/graphql/compiler/ServiceValidationTest.java
@@ -294,6 +294,7 @@ public void testInvalidReturnTypes() {
 
         diagnostic = diagnosticIterator.next();
         message = getErrorMessage(CompilationDiagnostic.INVALID_FUNCTION, "Interceptor", "execute");
+        // This error points to the types.bal in the GraphQL package since this returns the `graphql:Interceptor` type.
         assertErrorMessage(diagnostic, message, 91, 5);
 
         diagnostic = diagnosticIterator.next();
@@ -1454,9 +1455,6 @@ public void testInvalidServiceConfigModification() {
     private DiagnosticResult getDiagnosticResult(String packagePath) {
         Path projectDirPath = RESOURCE_DIRECTORY.resolve(packagePath);
         BuildProject project = BuildProject.load(getEnvironmentBuilder(), projectDirPath);
-        DiagnosticResult diagnosticResult = project.currentPackage().getCompilation().diagnosticResult();
-        Assert.assertEquals(diagnosticResult.errorCount(), 0,
-                "Package compilation encountered errors before running compiler plugin");
         return project.currentPackage().runCodeGenAndModifyPlugins();
     }
 

diff --git a/...ugin/src/main/java/io/ballerina/stdlib/graphql/compiler/analyzer/GraphqlCodeAnalyzer.java b/...ugin/src/main/java/io/ballerina/stdlib/graphql/compiler/analyzer/GraphqlCodeAnalyzer.java
@@ -45,14 +45,12 @@ public void init(CodeAnalysisContext codeAnalysisContext) {
         if (this.userData == null) {
             return;
         }
-        if (this.userData.isEmpty()) {
-            this.analyze(codeAnalysisContext);
-        } else if (this.userData.containsKey(IS_ANALYSIS_COMPLETED)) {
-            boolean isAnalysisCompleted = (boolean) this.userData.get(IS_ANALYSIS_COMPLETED);
-            if (!isAnalysisCompleted) {
-                this.analyze(codeAnalysisContext);
+        if (this.userData.containsKey(IS_ANALYSIS_COMPLETED)) {
+            if ((boolean) this.userData.get(IS_ANALYSIS_COMPLETED)) {
+                return;
             }
         }
+        this.analyze(codeAnalysisContext);
     }
 
     private void analyze(CodeAnalysisContext codeAnalysisContext) {