apb/vscode-basex
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Wiki Activity Actions

[mod] update libraries

Browse source
This commit is contained in:
Andy Bunce 2022-01-27 22:14:54 +00:00
parent 95702e6355
commit 1ea5f9481f
5 changed files with 1527 additions and 2451 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/test-utils/test-data-loader.ts
View file

@ -2,6 +2,6 @@ import * as fs from "fs";
export class TestDataLoader {
static load(fileName: string): string {
return fs.readFileSync(`${__dirname}/../../../src/test/test-data/${fileName}`, "UTF-8");
return fs.readFileSync(`${__dirname}/../../../src/test/test-data/${fileName}`, "utf-8");
}
}

10
src/tree-view/xml-tree-data-provider.ts
View file

@ -33,7 +33,7 @@ export class XmlTreeDataProvider implements TreeDataProvider<any> {
return window.activeTextEditor || null;
}
getTreeItem(element: Node): TreeItem | Thenable<TreeItem> {
getTreeItem(element: Element): TreeItem | Thenable<TreeItem> {
const enableMetadata = Configuration.enableXmlTreeViewMetadata;
const enableSync = Configuration.enableXmlTreeViewCursorSync;
@ -60,9 +60,9 @@ export class XmlTreeDataProvider implements TreeDataProvider<any> {
treeItem.label += `children: ${childElements.length}, `;
treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed;
}
const label = treeItem.label as string;
treeItem.label = label.substr(0, label.length - 2) + ")";
treeItem.label = treeItem.label.substr(0, treeItem.label.length - 2);
treeItem.label += ")";
}
if (this._xmlTraverser.hasSimilarSiblings(<Element>element) && enableSync) {
@ -134,7 +134,7 @@ export class XmlTreeDataProvider implements TreeDataProvider<any> {
NativeCommands.setContext(constants.contextKeys.xmlTreeViewEnabled, false);
this._xmlDocument = null;
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(0);
return;
}
@ -162,7 +162,7 @@ export class XmlTreeDataProvider implements TreeDataProvider<any> {
this._xmlTraverser.xmlDocument = this._xmlDocument;
}
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(0);
}
}

14
src/xquery-execution/commands/executeXQuery.ts
View file

@ -108,12 +108,14 @@ export async function executeXQuery(editor: TextEditor, edit: TextEditorEdit): P
await ChildProcess.spawn(executable, args);
}
catch (error) {
if (error.message.search(/[Ll]ine:?\s*\d+/gm) > -1) {
const match: RegExpExecArray = /[Ll]ine:?\s*\d+/gm.exec(error.message);
const line: number = (Number.parseInt(match[0].replace(/([Ll]ine:?\s*)|\s/, "")) - 1);
catch (error ) {
let message = "Unknown Error";
if (error instanceof Error) { message = error.message; }
if (message.search(/[Ll]ine:?\s*\d+/gm) > -1) {
const match: RegExpExecArray = /[Ll]ine:?\s*\d+/gm.exec(message);
const line: number = (Number.parseInt(match[0].replace(/([Ll]ine:?\s*)|\s/, ""), 10) - 1);
const selection: string = await window.showErrorMessage(error.message, `Go to Line ${line}`);
const selection: string = await window.showErrorMessage(message, `Go to Line ${line}`);
if (selection === `Go to Line ${line}`) {
editor.revealRange(new Range(line, 0, line, 0));
@ -121,7 +123,7 @@ export async function executeXQuery(editor: TextEditor, edit: TextEditorEdit): P
}
else {
window.showErrorMessage(error.message);
window.showErrorMessage(message);
}
}