CPT editor: use the marking scope when finding dependencies

Now that undefined function names are considered to be undefined
variables, it's more important to make sure that the dependency finder
is using the right scope.

Author: christianp

editor/static/js/custom_part_type/edit.js

@@ -423,6 +423,8 @@ $(document).ready(function() {
     var CustomPartType = Editor.custom_part_type.CustomPartType = function(data, save_url, set_access_url) {
         var pt = this;
 
+        this.marking_scope = new Numbas.marking.StatefulScope([Numbas.jme.builtinScope]);
+
         this.save_url = save_url;
         this.set_access_url = set_access_url;
 
@@ -1101,7 +1103,7 @@ $(document).ready(function() {
             if(this.definitionError() || !this.definition_tree()) {
                 return [];
             }
-            var vars = Numbas.jme.findvars(this.definition_tree());
+            var vars = Numbas.jme.findvars(this.definition_tree(), [], pt.marking_scope);
             var note_names = pt.marking_notes().map(function(n) { return n.name().toLowerCase() });
             return vars
                 .filter(function(name) { return !marking_reserved_names.contains(name.toLowerCase()) })

editor/static/js/editor.js

@@ -2008,6 +2008,7 @@ $(document).ready(function() {
         viewModel: function(params) {
             this.expr = params.expr;
             this.vars = params.vars || [];
+            this.scope = params.scope || Numbas.jme.builtinScope;
             this.show_syntax_errors = params.show_syntax_errors===undefined ? true : params.show_syntax_errors;
             this.error = ko.pureComputed(function() {
                 var expr = ko.unwrap(this.expr);
@@ -2017,7 +2018,7 @@ $(document).ready(function() {
                     return this.show_syntax_errors ? e.message : '';
                 }
                 try {
-                    var vars = Numbas.jme.findvars(tree);
+                    var vars = Numbas.jme.findvars(tree, [], scope);
                 } catch(e) {
                     return '';
                 }

editor/templates/custom_part_type/edit.html

@@ -424,7 +424,7 @@ <h1 class="name-header">
                             </label>
                             <div class="{{form_control_class}}">
                                 <textarea id="input-input_options-correctAnswer" {% if not editable %}disabled{% endif %} data-bind="codemirror: input_options.correctAnswer, codemirrorMode: 'jme'"></textarea>
-                                <undefined-variable-warning params="expr: input_options.correctAnswer, vars: ['settings']"></undefined-variable-warning>
+                                <undefined-variable-warning params="expr: input_options.correctAnswer, vars: ['settings'], scope: $root.marking_scope"></undefined-variable-warning>
                                 {% if editable %}
                                 <p class="help-block">
                                     An expression which evaluates to the expected answer to the part. You can refer to any of the part's settings.
@@ -543,7 +543,7 @@ <h1 class="name-header">
                                     <div class="form-group">
                                         <label for="input-marking_note-definition">Definition</label>
                                         <textarea id="input-marking_note-definition" {% if not editable %}disabled{% endif %} class="definition" data-bind="codemirror: definition"></textarea>
-                                        <undefined-variable-warning params="expr: definition, vars: $parent.marking_defined_names, show_syntax_errors: false"></undefined-variable-warning>
+                                        <undefined-variable-warning params="expr: definition, vars: $parent.marking_defined_names, show_syntax_errors: false, scope: $root.marking_scope"></undefined-variable-warning>
                                         <div class="alert alert-danger" data-bind="visible: definitionError" aria-live="polite">
                                             <p data-bind="html: definitionError"></p>
                                         </div>