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

handle scalar values

Browse source
This commit is contained in:
Maciej Zawiasa 2016-11-25 21:34:31 +01:00
parent 62234629e2
commit 1112f56801
2 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/providers/XPath.ts
View file

@ -2,7 +2,7 @@
import * as vsc from 'vscode';
import * as ext from '../Extension';
import { XPathEvaluator } from '../services/XPathEvaluator';
import { XPathEvaluator, EvaluatorResult, EvaluatorResultType } from '../services/XPathEvaluator';
const CFG_SECTION: string = 'xmlTools';
const CFG_PERSIST_QUERY: string = 'persistXPathQuery';
@ -59,12 +59,11 @@ export class XPathFeatureProvider {
// run the query
let xml: string = editor.document.getText();
let nodes: Node[];
let evalResult: EvaluatorResult;
try {
nodes = XPathEvaluator.evaluate(query, xml, ignoreDefaultNamespace);
evalResult = XPathEvaluator.evaluate(query, xml, ignoreDefaultNamespace);
}
catch (error) {
console.error(error);
vsc.window.showErrorMessage(`Something went wrong while evaluating the XPath: ${error}`);
@ -78,10 +77,13 @@ export class XPathFeatureProvider {
outputChannel.appendLine(`XPath Query: ${query}`);
outputChannel.append('\n');
nodes.forEach((node: XmlNode) => {
outputChannel.appendLine(`[Line ${node.lineNumber}] ${node.localName}: ${node.textContent}`);
});
if (evalResult.type === EvaluatorResultType.NODE_COLLECTION) {
(evalResult.result as Node[]).forEach((node: XmlNode) => {
outputChannel.appendLine(`[Line ${node.lineNumber}] ${node.localName}: ${node.textContent}`);
});
} else {
outputChannel.appendLine(`[Result]: ${evalResult.result}`);
}
outputChannel.show(vsc.ViewColumn.Three);
// if persistence is enabled, save the query for later