Add diagnostics for duplicate calcpvrs

Author: vetlek

server/src/language-service/diagnosticsProvider.ts

@@ -906,12 +906,26 @@ function validateCalcPvrIdentifierReferences(
     refProvider: SepticReferenceProvider,
     doc: ITextDocument
 ): Diagnostic[] {
+    const diagnostics: Diagnostic[] = [];
+    if (refProvider.validateRef(obj.identifier!.name, hasDuplicateCalcPvrRef)) {
+        diagnostics.push(
+            createDiagnostic(
+                DiagnosticSeverity.Warning,
+                {
+                    start: doc.positionAt(obj.identifier!.start),
+                    end: doc.positionAt(obj.identifier!.end),
+                },
+                `Duplicate CalcPvr with name: ${obj.identifier!.name}`,
+                DiagnosticCode.duplicate
+            )
+        );
+    }
     const referenceToEvr = refProvider.validateRef(
         obj.identifier!.name,
         hasReferenceToEvr
     );
     if (referenceToEvr) {
-        return [];
+        return diagnostics;
     }
     const referenceToXvr = refProvider.validateRef(
         obj.identifier!.name,
@@ -926,7 +940,7 @@ function validateCalcPvrIdentifierReferences(
     const code = referenceToXvr
         ? DiagnosticCode.invalidReference
         : DiagnosticCode.missingReference;
-    return [
+    diagnostics.push(
         createDiagnostic(
             severity,
             {
@@ -936,7 +950,8 @@ function validateCalcPvrIdentifierReferences(
             message,
             code
         ),
-    ];
+    );
+    return diagnostics;
 }
 
 function validateUAApplReferences(
@@ -973,6 +988,19 @@ const hasReferenceToEvr: RefValidationFunction = (refs: SepticReference[]) => {
     return false;
 };
 
+const hasDuplicateCalcPvrRef: RefValidationFunction = (refs: SepticReference[]) => {
+    let seen = false;
+    for (const ref of refs) {
+        if (ref.obj?.isType("CalcPvr")) {
+            if (seen) {
+                return true;
+            }
+            seen = true;
+        }
+    }
+    return false;
+};
+
 export function validateEvrReferences(
     obj: SepticObject,
     refProvider: SepticReferenceProvider,

server/src/septic/septicCnfg.ts

@@ -241,8 +241,7 @@ export function extractReferencesFromObj(obj: SepticObject): SepticReference[] {
     }
 
     if (objectDef.refs.identifier && obj.identifier) {
-        const isObjRef = obj.isXvr || obj.isOpcXvr;
-        const isCalcPvr = obj.isType("CalcPvr");
+        const isObjRef = obj.isXvr || obj.isOpcXvr || obj.isType("CalcPvr");
         const ref: SepticReference = createSepticReference(
             obj.identifier.name,
             {
@@ -253,9 +252,7 @@ export function extractReferencesFromObj(obj: SepticObject): SepticReference[] {
             isObjRef ? obj : undefined,
             isObjRef
                 ? ReferenceType.xvr
-                : isCalcPvr
-                    ? ReferenceType.calc
-                    : ReferenceType.identifier
+                : ReferenceType.identifier
         );
         xvrRefs.push(ref);
     }

server/src/test/diagnostics.test.ts

@@ -1359,6 +1359,26 @@ describe("Test validation of object references", () => {
         );
         expect(diagFilterd.length).to.equal(0);
     });
+    it("Expect diagnostics for duplicate calcpvr", () => {
+        const text = `
+            CalcPvr:  Test 
+            
+            CalcPvr: Test
+		`;
+        const doc = new MockDocument(text);
+        const cnfg = parseSepticSync(doc.getText());
+        const objectInfo = metaInfoProvider.getObject("CalcPvr");
+        const diag = validateObjectReferences(
+            cnfg.objects[0],
+            doc,
+            cnfg,
+            objectInfo!
+        );
+        const diagFilterd = diag.filter(
+            (d) => d.code === DiagnosticCode.duplicate
+        );
+        expect(diagFilterd.length).to.equal(1);
+    });
 });
 
 describe("Test validation of object structure", () => {

server/src/test/references.test.ts

@@ -4,7 +4,7 @@ import {
     getDeclaration,
     getReferences,
 } from "../language-service/referenceProvider";
-import { Attribute, AttributeValue, extractReferencesFromObj, Identifier, parseSepticSync, ReferenceType, SepticObject, SepticTokenType } from "../septic";
+import { Attribute, AttributeValue, extractReferencesFromObj, Identifier, parseSepticSync, SepticObject, SepticTokenType } from "../septic";
 import { MockDocument } from "./util";
 
 describe("Test extraction of refs from config file", () => {
@@ -289,8 +289,6 @@ describe("Test getReferences", () => {
         calcPvr.addAttribute(algAttribute);
         const refs = extractReferencesFromObj(calcPvr);
         expect(refs.length).to.equal(1);
-        expect(refs[0].type).to.equal(ReferenceType.calc);
-
     });
     it("Expect references from alg that contain other jinja expressions", () => {
         const alg = `"maxselection(6,{% for Wellname in (wells | unpack('Wellname'))[:5] %} {{ Wellname }}Priority,{% endfor %} -1,{% for Wellname in (wells | unpack('Wellname'))[:5] %} {{ Wellname }}Priority < {{ CurrentWell }}Priority,{% endfor %} 1)"`