external/vscode-xml
1
0
Fork 1
Code Issues 1 Pull requests Projects Releases Wiki Activity

Merge pull request #169 from DotJoshJohnson/undefined-xpath

Browse source 
Fix Undefined XPath Result
This commit is contained in:
Josh Johnson 2018-05-28 10:51:20 -04:00 • committed by GitHub
commit 7fa1d7130d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/xpath/xpath-evaluator.ts
View file

@ -12,6 +12,19 @@ export class EvaluatorResultType {
static NODE_COLLECTION = 1; static NODE_COLLECTION = 1;
} }
export class XPathResultTypes {
static ANY_TYPE = 0;
static NUMBER_TYPE = 1;
static STRING_TYPE = 2;
static BOOLEAN_TYPE = 3;
static UNORDERED_NODE_ITERATOR_TYPE = 4;
static ORDERED_NODE_ITERATOR_TYPE = 5;
static UNORDERED_NODE_SNAPSHOT_TYPE = 6;
static ORDERED_NODE_SNAPSHOT_TYPE = 7;
static ANY_UNORDERED_NODE_TYPE = 8;
static FIRST_ORDERED_NODE_TYPE = 9;
}
export class XPathEvaluator { export class XPathEvaluator {
static evaluate(query: string, xml: string, ignoreDefaultNamespace: boolean): EvaluatorResult { static evaluate(query: string, xml: string, ignoreDefaultNamespace: boolean): EvaluatorResult {
if (ignoreDefaultNamespace) { if (ignoreDefaultNamespace) {
@ -29,17 +42,17 @@ export class XPathEvaluator {
evaluatorResult.type = EvaluatorResultType.SCALAR_TYPE; evaluatorResult.type = EvaluatorResultType.SCALAR_TYPE;
switch (xPathResult.resultType) { switch (xPathResult.resultType) {
case xPathResult.NUMBER_TYPE: case XPathResultTypes.NUMBER_TYPE:
evaluatorResult.result = xPathResult.numberValue; evaluatorResult.result = xPathResult.numberValue;
break; break;
case xPathResult.STRING_TYPE: case XPathResultTypes.STRING_TYPE:
evaluatorResult.result = xPathResult.stringValue; evaluatorResult.result = xPathResult.stringValue;
break; break;
case xPathResult.BOOLEAN_TYPE: case XPathResultTypes.BOOLEAN_TYPE:
evaluatorResult.result = xPathResult.booleanValue; evaluatorResult.result = xPathResult.booleanValue;
break; break;
case xPathResult.UNORDERED_NODE_ITERATOR_TYPE: case XPathResultTypes.UNORDERED_NODE_ITERATOR_TYPE:
case xPathResult.ORDERED_NODE_ITERATOR_TYPE: case XPathResultTypes.ORDERED_NODE_ITERATOR_TYPE:
evaluatorResult.result = xPathResult.booleanValue; evaluatorResult.result = xPathResult.booleanValue;
let node: Node; let node: Node;