Custom model editor: Fix another edge-case (pairs in list)

Author: easbar

web-bundle/src/main/js/custom-model-editor/src/validate.js

@@ -285,7 +285,10 @@ function validateList(path, node, minLength, maxLength, validateListItem) {
             const range = node.cstNode.items[i].range;
             errors.push(error(`${path}[${i}]`, `must not be null`, [range.start, range.end]));
         } else if (isYamlPair(item.type)) {
-            errors.push(error(`${path}[${i}]`, `must be an object. given type: ${displayType(item)}`, [item.key.range[0], item.value.range[1]]));
+            // this is a bit ugly. we do not reliably get useful range information, e.g. for nested pairs
+            // so we fallback to the range of the entire node. maybe related: https://github.com/eemeli/yaml/discussions/231
+            errors.push(error(`${path}`, `must not contain pairs`, node.range));
+            break;
         } else {
             errors.push.apply(errors, validateListItem(`${path}[${i}]`, item, i));
         }
@@ -332,6 +335,8 @@ function isValidAreaName(string) {
 }
 
 function validateObject(path, obj, keyIsValid, validateKeys, message, validateKeyValuePair) {
+    if (obj.value === null)
+        return [error(path, `must not be null`, obj.range)];
     if (!isYamlObject(obj.type))
         return [error(path, `must be an object. given type: ${displayType(obj)}`, obj.range)];
 

web-bundle/src/main/js/custom-model-editor/src/validate.test.js

@@ -138,8 +138,7 @@ describe("validate", () => {
             `priority[1]: every statement must have an operator ['multiply_by', 'limit_to']. given: if, range: [44, 60]`
         ]);
         test_validate(`speed: [ if: condition, limit_to: 100 ]`, [
-            `speed[0]: must be an object. given type: pair, range: [9, 22]`,
-            `speed[1]: must be an object. given type: pair, range: [24, 38]`
+            `speed: must not contain pairs, range: [7, 39]`
         ]);
     });
 
@@ -168,6 +167,16 @@ describe("validate", () => {
         test_validate(`speed: [{limit_to: 100, if:`, [
             `speed[0][if]: must be a string or boolean. given type: null, range: [24, 26]`
         ]);
+        test_validate(`speed: [ if:`, [
+            `speed[0]: must be an object. given type: string, range: [9, 11]`,
+            `speed[1]: must not be null, range: [11, 12]`
+        ]);
+        test_validate(`speed: [ if: `, [
+            `speed: must not contain pairs, range: [7, 13]`,
+        ]);
+        test_validate(`speed: [ if: if: `, [
+            `speed: must not contain pairs, range: [7, 17]`
+        ]);
         test_validate(`speed: [{if: true, multiply_by: 0.15}]`, []);
     });