StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #510 from crispthinking/parent-error-cache 

cache parent errors
This commit is contained in:
Jos de Jong 2018-02-25 17:31:23 +01:00 committed by GitHub
parent 97cc0f39f4 e75043e51d
commit 4e6f43412c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/js/treemode.js
View File

@ -435,28 +435,35 @@ treemode.validate = function () {
}
}
// display the error in the nodes with a problem
this.errorNodes = duplicateErrors
.concat(schemaErrors)
.reduce(function expandParents (all, entry) {
// expand parents, then merge such that parents come first and
// original entries last
var errorNodes = duplicateErrors.concat(schemaErrors);
var parentPairs = errorNodes
.reduce(function (all, entry) {
return entry.node
.findParents()
.filter(function (parent) {
return !all.some(function (pair) {
return pair[0] === parent;
});
})
.map(function (parent) {
return [parent, entry.node];
})
.concat(all);
}, []);
this.errorNodes = parentPairs
.map(function (pair) {
return {
node: parent,
child: entry.node,
node: pair[0],
child: pair[1],
error: {
message: parent.type === 'object'
message: pair[0].type === 'object'
? 'Contains invalid properties' // object
: 'Contains invalid items' // array
}
};
})
.concat(all, [entry]);
}, [])
// TODO: dedupe the parent nodes
.concat(errorNodes)
.map(function setError (entry) {
entry.node.setError(entry.error, entry.child);
return entry.node;