Merge pull request #19 from prakanth97/fix_compilerPlugin

Fix document lookup in compiler plugin

compiler-plugin-test/src/test/java/io/ballerina/lib/data/xmldata/compiler/CompilerPluginTest.java

@@ -178,4 +178,23 @@ public void testUnionTypeNegative() {
         Assert.assertEquals(errorDiagnosticsList.get(5).diagnosticInfo().messageFormat(),
                 "invalid field: duplicate field found");
     }
+
+    @Test
+    public void testCompilerPluginWithAProjectWithSubModule() {
+        DiagnosticResult diagnosticResult =
+                CompilerPluginTestUtils.loadPackage("sample_package_10").getCompilation().diagnosticResult();
+        List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
+                .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
+                .collect(Collectors.toList());
+        Assert.assertEquals(errorDiagnosticsList.size(), 1);
+        Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
+                "invalid field: duplicate field found");
+
+        List<Diagnostic> warningDiagnosticsList = diagnosticResult.diagnostics().stream()
+                .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.WARNING))
+                .collect(Collectors.toList());
+        Assert.assertEquals(warningDiagnosticsList.size(), 1);
+        Assert.assertEquals(warningDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
+                "invalid annotation attachment: child record does not allow name annotation");
+    }
 }

compiler-plugin-test/src/test/resources/ballerina_sources/sample_package_10/Ballerina.toml

@@ -0,0 +1,4 @@
+[package]
+org = "xmldata_test"
+name = "sample_10"
+version = "0.1.0"

compiler-plugin-test/src/test/resources/ballerina_sources/sample_package_10/main.bal

@@ -0,0 +1,15 @@
+import ballerina/data.xmldata;
+
+@xmldata:Name {
+    value: "Data"
+}
+type Data3 record {|
+    Data4 a;
+|};
+
+@xmldata:Name {
+    value: "A"
+}
+type Data4 record {|
+    string b;
+|};

compiler-plugin-test/src/test/resources/ballerina_sources/sample_package_10/modules/util/util.bal

@@ -0,0 +1,9 @@
+import ballerina/data.xmldata;
+
+type Data record {|
+    string A;
+    @xmldata:Name {
+        value: "A"
+    }
+    string B;
+|};

compiler-plugin/src/main/java/io/ballerina/lib/data/xmldata/compiler/XmldataRecordFieldValidator.java

@@ -48,7 +48,6 @@
 import io.ballerina.compiler.syntax.tree.TypeDefinitionNode;
 import io.ballerina.compiler.syntax.tree.VariableDeclarationNode;
 import io.ballerina.lib.data.xmldata.compiler.objects.QualifiedName;
-import io.ballerina.projects.Document;
 import io.ballerina.projects.plugins.AnalysisTask;
 import io.ballerina.projects.plugins.SyntaxNodeAnalysisContext;
 import io.ballerina.tools.diagnostics.Diagnostic;
@@ -72,13 +71,11 @@
 public class XmldataRecordFieldValidator implements AnalysisTask<SyntaxNodeAnalysisContext> {
 
     private SemanticModel semanticModel;
-    private Document srcFile;
     private final HashMap<Location, DiagnosticInfo> allDiagnosticInfo = new HashMap<>();
 
     @Override
     public void perform(SyntaxNodeAnalysisContext ctx) {
         semanticModel = ctx.semanticModel();
-        srcFile = ctx.currentPackage().getDefaultModule().document(ctx.documentId());
         List<Diagnostic> diagnostics = semanticModel.diagnostics();
         boolean erroneousCompilation = diagnostics.stream()
                 .anyMatch(d -> d.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR));
@@ -260,15 +257,16 @@ private void detectNameAnnotUsageWarning(RecordFieldSymbol fieldSymbol, SyntaxNo
             return;
         }
 
-        Optional<Symbol> symbol = semanticModel.symbol(srcFile, location.get().lineRange().startLine());
-        if (symbol.isEmpty()) {
+        TypeSymbol typeSymbol = fieldSymbol.typeDescriptor();
+        if (typeSymbol.typeKind() != TypeDescKind.TYPE_REFERENCE) {
             return;
         }
-
-        if (symbol.get().kind() != SymbolKind.TYPE_DEFINITION) {
+        TypeReferenceTypeSymbol typeReferenceTypeSymbol = (TypeReferenceTypeSymbol) typeSymbol;
+        Symbol symbol = typeReferenceTypeSymbol.definition();
+        if (symbol == null || symbol.kind() != SymbolKind.TYPE_DEFINITION) {
             return;
         }
-        TypeDefinitionSymbol typeDefinitionSymbol = (TypeDefinitionSymbol) symbol.get();
+        TypeDefinitionSymbol typeDefinitionSymbol = (TypeDefinitionSymbol) symbol;
         typeDefinitionSymbol.annotations().forEach(annotationSymbol -> {
             if (!isAnnotFromXmldata(annotationSymbol)) {
                 return;