From ea1a3739c8351b5b529000d2c942d53a997fb82b Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Mon, 31 Jan 2022 20:34:05 +0000 Subject: [PATCH 1/7] [mod] remove trailing # from xquery.lib --- .vscode/sftp.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .vscode/sftp.json diff --git a/.vscode/sftp.json b/.vscode/sftp.json new file mode 100644 index 0000000..e83ebb0 --- /dev/null +++ b/.vscode/sftp.json @@ -0,0 +1,11 @@ +{ + "name": "My Server", + "host": "localhost", + "protocol": "sftp", + "port": 22, + "username": "username", + "remotePath": "/", + "uploadOnSave": true, + "useTempFile": false, + "openSsh": false +} From 19a57fe6ca344a1de9c6537ad15806ebcb2bbe4a Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Mon, 31 Jan 2022 20:50:52 +0000 Subject: [PATCH 2/7] rename --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9544fc3..f82bc5f 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "xml", + "name": "vscode-basex", "displayName": "XML Tools for BaseX", "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", - "version": "2.5.2", + "version": "0.0.1", "preview": false, "publisher": "quodatum", "author": { From 6f919dd209a7aacb892cf88c53de4f6dab41d192 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Mon, 31 Jan 2022 21:14:34 +0000 Subject: [PATCH 3/7] [add] icon --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f82bc5f..ddb88d2 100644 --- a/package.json +++ b/package.json @@ -2,26 +2,26 @@ "name": "vscode-basex", "displayName": "XML Tools for BaseX", "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", - "version": "0.0.1", + "version": "0.0.2", "preview": false, "publisher": "quodatum", "author": { "name": "Andy Bunce", - "url": "https://github.com/DotJoshJohnson" + "url": "https://github.com/Quodatum" }, "license": "MIT", "galleryBanner": { "color": "#FFFFFF", "theme": "light" }, - "icon": "resources/xml.png", - "homepage": "https://github.com/DotJoshJohnson/vscode-xml", + "icon": "resources/basex.png", + "homepage": "https://github.com/Quodatum/vscode-xml", "repository": { "type": "git", - "url": "https://github.com/DotJoshJohnson/vscode-xml.git" + "url": "https://github.com/Quodatum/vscode-xml.git" }, "bugs": { - "url": "https://github.com/DotJoshJohnson/vscode-xml/issues" + "url": "https://github.com/Quodatum/vscode-xml/issues" }, "engines": { "vscode": "^1.63.0" From 4cbf4cb5689aec7bc1efea493b55946fc200f06a Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Mon, 31 Jan 2022 21:15:37 +0000 Subject: [PATCH 4/7] [add] icon --- .vscode/sftp.json | 11 ----------- resources/basex.png | Bin 0 -> 3049 bytes resources/xml.png | Bin 3277 -> 0 bytes 3 files changed, 11 deletions(-) delete mode 100644 .vscode/sftp.json create mode 100644 resources/basex.png delete mode 100644 resources/xml.png diff --git a/.vscode/sftp.json b/.vscode/sftp.json deleted file mode 100644 index e83ebb0..0000000 --- a/.vscode/sftp.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "My Server", - "host": "localhost", - "protocol": "sftp", - "port": 22, - "username": "username", - "remotePath": "/", - "uploadOnSave": true, - "useTempFile": false, - "openSsh": false -} diff --git a/resources/basex.png b/resources/basex.png new file mode 100644 index 0000000000000000000000000000000000000000..d737358698c2d40fe477e768ffac3221ea8ea4a0 GIT binary patch literal 3049 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 WDt|&#&Yis}0CQt&Or@cF^nU@Uyb>4y From c275d88f77b74be8efa3478e111c19bfacd870b3 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Sat, 5 Feb 2022 22:40:34 +0000 Subject: [PATCH 5/7] [mod] xmlTools ->basexTools --- .github/ISSUE_TEMPLATE/xml-formatter.md | 2 +- .vscode/extensions.json | 5 + README.md | 32 +++-- package-lock.json | 156 +++++++++++++++++++++++- package.json | 99 +++++++-------- src/common/configuration.ts | 2 +- src/constants.ts | 14 +-- 7 files changed, 232 insertions(+), 78 deletions(-) create mode 100644 .vscode/extensions.json diff --git a/.github/ISSUE_TEMPLATE/xml-formatter.md b/.github/ISSUE_TEMPLATE/xml-formatter.md index 34567af..fe55151 100644 --- a/.github/ISSUE_TEMPLATE/xml-formatter.md +++ b/.github/ISSUE_TEMPLATE/xml-formatter.md @@ -7,7 +7,7 @@ about: Report an issue with the XML formatter. What seems to be the problem? #### Formatter Implementation -Which XML Formatter implementation are you using (the value of your `xmlTools.xmlFormatterImplementation` setting). +Which XML Formatter implementation are you using (the value of your `basexTools.xmlFormatterImplementation` setting). #### XML Tools Version What version of XML Tools are you using? diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..2f6a964 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + + ] +} \ No newline at end of file diff --git a/README.md b/README.md index d84facf..bd73c75 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,6 @@ -# XML Tools for Visual Studio Code -[![Visual Studio Marketplace](https://img.shields.io/vscode-marketplace/v/DotJoshJohnson.xml.svg?style=for-the-badge)](https://marketplace.visualstudio.com/items?itemName=DotJoshJohnson.xml) -[![Visual Studio Marketplace](https://img.shields.io/vscode-marketplace/r/DotJoshJohnson.xml.svg?style=for-the-badge)](https://marketplace.visualstudio.com/items?itemName=DotJoshJohnson.xml) +# BaseX Tools for Visual Studio Code +This project was originally a fork of https://github.com/DotJoshJohnson/vscode-xml -[![](https://img.shields.io/badge/TWITTER-%40DotJohnson-blue.svg?logo=twitter&style=for-the-badge)](https://twitter.com/DotJoshJohnson) -[![](https://img.shields.io/badge/gitter-join_chat-1dce73.svg?style=for-the-badge&logo=gitter-white)](https://gitter.im/vscode-xml/vscode-xml) -[![Beerpay](https://img.shields.io/beerpay/DotJoshJohnson/vscode-xml.svg?style=for-the-badge)](https://beerpay.io/DotJoshJohnson/vscode-xml) ## Features * [XML Formatting](https://github.com/DotJoshJohnson/vscode-xml/wiki/xml-formatting) @@ -18,18 +14,18 @@ * VS Code `1.22.2` or higher ## Extension Settings -* **`xmlTools.enableXmlTreeView`:** Enables the XML Tree View for XML documents. -* **`xmlTools.enableXmlTreeViewMetadata`:** Enables attribute and child element counts in the XML Document view. -* **`xmlTools.enableXmlTreeViewCursorSync`:** Enables auto-reveal of elements in the XML Document view when a start tag is clicked in the editor. -* **`xmlTools.enforcePrettySelfClosingTagOnFormat`:** Ensures a space is added before the forward slash at the end of a self-closing tag. -* **`xmlTools.ignoreDefaultNamespace`:** Ignore default xmlns attributes when evaluating XPath. -* **`xmlTools.persistXPathQuery`:** Remember the last XPath query used. -* **`xmlTools.removeCommentsOnMinify`:** Remove XML comments during minification. -* **`xmlTools.splitAttributesOnFormat`:** Put each attribute on a new line when formatting XML. Overrides `xmlTools.splitXmlnsOnFormat` if set to `true`. (V2 Formatter Only) -* **`xmlTools.splitXmlnsOnFormat`:** Put each xmlns attribute on a new line when formatting XML. -* **`xmlTools.xmlFormatterImplementation`:** Supported XML Formatters: `classic`, `v2`. -* **`xmlTools.xqueryExecutionArguments`:** Arguments to be passed to the XQuery execution engine. -* **`xmlTools.xqueryExecutionEngine`:** The full path to the executable to run when executing XQuery scripts. +* **`basexTools.enableXmlTreeView`:** Enables the XML Tree View for XML documents. +* **`basexTools.enableXmlTreeViewMetadata`:** Enables attribute and child element counts in the XML Document view. +* **`basexTools.enableXmlTreeViewCursorSync`:** Enables auto-reveal of elements in the XML Document view when a start tag is clicked in the editor. +* **`basexTools.enforcePrettySelfClosingTagOnFormat`:** Ensures a space is added before the forward slash at the end of a self-closing tag. +* **`basexTools.ignoreDefaultNamespace`:** Ignore default xmlns attributes when evaluating XPath. +* **`basexTools.persistXPathQuery`:** Remember the last XPath query used. +* **`basexTools.removeCommentsOnMinify`:** Remove XML comments during minification. +* **`basexTools.splitAttributesOnFormat`:** Put each attribute on a new line when formatting XML. Overrides `basexTools.splitXmlnsOnFormat` if set to `true`. (V2 Formatter Only) +* **`basexTools.splitXmlnsOnFormat`:** Put each xmlns attribute on a new line when formatting XML. +* **`basexTools.xmlFormatterImplementation`:** Supported XML Formatters: `classic`, `v2`. +* **`basexTools.xqueryExecutionArguments`:** Arguments to be passed to the XQuery execution engine. +* **`basexTools.xqueryExecutionEngine`:** The full path to the executable to run when executing XQuery scripts. ## Release Notes Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases). diff --git a/package-lock.json b/package-lock.json index b7aace7..9663de4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "xml", - "version": "2.5.2", + "name": "vscode-basex", + "version": "0.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -745,6 +745,158 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "esbuild": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.18.tgz", + "integrity": "sha512-vCUoISSltnX7ax01w70pWOSQT+e55o+2P/a+A9MSTukJAt3T4aDZajcjeG4fnZbkvOEv+dkKgdkvljz6vVQD4A==", + "dev": true, + "requires": { + "esbuild-android-arm64": "0.14.18", + "esbuild-darwin-64": "0.14.18", + "esbuild-darwin-arm64": "0.14.18", + "esbuild-freebsd-64": "0.14.18", + "esbuild-freebsd-arm64": "0.14.18", + "esbuild-linux-32": "0.14.18", + "esbuild-linux-64": "0.14.18", + "esbuild-linux-arm": "0.14.18", + "esbuild-linux-arm64": "0.14.18", + "esbuild-linux-mips64le": "0.14.18", + "esbuild-linux-ppc64le": "0.14.18", + "esbuild-linux-s390x": "0.14.18", + "esbuild-netbsd-64": "0.14.18", + "esbuild-openbsd-64": "0.14.18", + "esbuild-sunos-64": "0.14.18", + "esbuild-windows-32": "0.14.18", + "esbuild-windows-64": "0.14.18", + "esbuild-windows-arm64": "0.14.18" + } + }, + "esbuild-android-arm64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.18.tgz", + "integrity": "sha512-AuE8vIwc6QLquwykyscFk0Ji3RFczoOvjka64FJlcjLLhD6VsS584RYlQrSnPpRkv69PunUvyrBoEF7JFTJijg==", + "dev": true, + "optional": true + }, + "esbuild-darwin-64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.18.tgz", + "integrity": "sha512-nN1XziZtDy8QYOggaXC3zu0vVh8YJpS8Bol7bHaxx0enTLDSFBCXUUJEKYpmAAJ4OZRPgjXv8NzEHHQWQvLzXg==", + "dev": true, + "optional": true + }, + "esbuild-darwin-arm64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.18.tgz", + "integrity": "sha512-v0i2n6TCsbxco/W1fN8RgQt3RW00Q9zJO2eqiAdmLWg6Hx0HNHloZyfhF11i7nMUUgW8r5n++ZweIXjAFPE/gQ==", + "dev": true, + "optional": true + }, + "esbuild-freebsd-64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.18.tgz", + "integrity": "sha512-XLyJZTWbSuQJOqw867tBxvto6GjxULvWZYKs6RFHYQPCqgQ0ODLRtBmp4Fqqpde52yOe45npaaoup9IXNfr32A==", + "dev": true, + "optional": true + }, + "esbuild-freebsd-arm64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.18.tgz", + "integrity": "sha512-0ItfrR8hePnDcUXxUQxY+VfICcBfeMJCdK6mcNUXnXw6LyHjyUYXWpFXF+J18pg1/YUWRWO1HbsJ7FEwELcQIA==", + "dev": true, + "optional": true + }, + "esbuild-linux-32": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.18.tgz", + "integrity": "sha512-mnG84D9NsEsoQdBpBT0IsFjm5iAwnd81SP4tRMXZLl09lPvIWjHHSq6LDlb4+L5H5K5y68WC//X5Dr2MtNY3DQ==", + "dev": true, + "optional": true + }, + "esbuild-linux-64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.18.tgz", + "integrity": "sha512-HvExRtkeA8l/p+7Lf6aBrnLH+jTCFJTUMJxGKExh2RD8lCXGTeDJFyP+BOEetP80fuuH+Syj79+LVQ9MihdBsg==", + "dev": true, + "optional": true + }, + "esbuild-linux-arm": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.18.tgz", + "integrity": "sha512-+ZL8xfXVNaeaZ2Kxqlw2VYZWRDZ7NSK4zOV9GKNAtkkWURLsPUU84aUOBatRe9BH1O5FDo3LLQSlaA04ed6lhA==", + "dev": true, + "optional": true + }, + "esbuild-linux-arm64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.18.tgz", + "integrity": "sha512-CCWmilODE1ckw+M7RVqoqKWA4UB0alCyK2bv0ikEeEAwkzinlJeoe94t9CnT/ECSQ2sL+C16idsr+aUviGp7sg==", + "dev": true, + "optional": true + }, + "esbuild-linux-mips64le": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.18.tgz", + "integrity": "sha512-8LjO4+6Vxz5gbyCHO4OONYMF689nLderCtzb8lG1Bncs4ZXHpo6bjvuWeTMRbGUkvAhp+P6hMTzia7RHOC53wQ==", + "dev": true, + "optional": true + }, + "esbuild-linux-ppc64le": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.18.tgz", + "integrity": "sha512-0OJk/6iYEmF1J7LXY6+cqf6Ga5vG4an7n1nubTKce7kYqaTyNGfYcTjDZce6lnDVlZTJtwntIMszq1+ZX7Kenw==", + "dev": true, + "optional": true + }, + "esbuild-linux-s390x": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.18.tgz", + "integrity": "sha512-UNY7YKZHjY31KcNanJK4QaT2/aoIQyS+jViP3QuDRIoYAogRnc6WydylzIkkEzGMaC4fzaXOmQ8fxwpLAXK4Yg==", + "dev": true, + "optional": true + }, + "esbuild-netbsd-64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.18.tgz", + "integrity": "sha512-wE/2xT9KNzLCfEBw24YbVmMmXH92cFIzrRPUlwWH9dIizjvEYYcyQ+peTMVkqzUum7pdlVLZ2CDDqAaZo/nW/w==", + "dev": true, + "optional": true + }, + "esbuild-openbsd-64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.18.tgz", + "integrity": "sha512-vdymE2jyuH/FRmTvrguCYSrq81/rUwuhMYyvt/6ibv9ac7xQ674c8qTdT+RH73sR9/2WUD/NsYxrBA/wUVTxcg==", + "dev": true, + "optional": true + }, + "esbuild-sunos-64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.18.tgz", + "integrity": "sha512-X/Tesy6K1MdJF1d5cbzFDxrIMMn0ye+VgTQRI8P5Vo2CcKxOdckwsKUwpRAvg+VDZ6MxrSOTYS9OOoggPUjxTg==", + "dev": true, + "optional": true + }, + "esbuild-windows-32": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.18.tgz", + "integrity": "sha512-glG23I/JzCL4lu7DWFUtVwqFwNwlL0g+ks+mcjjUisHcINoSXTeCNToUN0bHhzn6IlXXnggNQ38Ew/idHPM8+g==", + "dev": true, + "optional": true + }, + "esbuild-windows-64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.18.tgz", + "integrity": "sha512-zEiFKHgV/3z14wsVamV98/5mxeOwz+ecyg0pD3fWcBz9j4EOIT1Tg47axypD4QLwiKFvve9mUBYX1cD99qxOyw==", + "dev": true, + "optional": true + }, + "esbuild-windows-arm64": { + "version": "0.14.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.18.tgz", + "integrity": "sha512-Mh8lZFcPLat13dABN7lZThGUOn9YxoH5RYkhBq0U3WqQohHzKRhllYh7ibFixnkpMLnv8OZEbl8bGLMy03MpfA==", + "dev": true, + "optional": true + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", diff --git a/package.json b/package.json index ddb88d2..56fb62a 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "vscode-basex", - "displayName": "XML Tools for BaseX", - "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", - "version": "0.0.2", + "displayName": "BaseX tools", + "description": "BaseX tools: XQuery, XML, XPath Tools for Visual Studio Code", + "version": "0.0.3", "preview": false, "publisher": "quodatum", "author": { @@ -33,12 +33,12 @@ "Other" ], "activationEvents": [ - "onCommand:xmlTools.evaluateXPath", - "onCommand:xmlTools.executeXQuery", - "onCommand:xmlTools.formatAsXml", - "onCommand:xmlTools.textToXml", - "onCommand:xmlTools.xmlToText", - "onCommand:xmlTools.minifyXml", + "onCommand:basexTools.evaluateXPath", + "onCommand:basexTools.executeXQuery", + "onCommand:basexTools.formatAsXml", + "onCommand:basexTools.textToXml", + "onCommand:basexTools.xmlToText", + "onCommand:basexTools.minifyXml", "onLanguage:xml", "onLanguage:xquery", "onLanguage:xsl" @@ -47,93 +47,93 @@ "contributes": { "commands": [ { - "command": "xmlTools.evaluateXPath", - "title": "XML Tools: Evaluate XPath" + "command": "basexTools.evaluateXPath", + "title": "BaseX Tools: Evaluate XPath" }, { - "command": "xmlTools.executeXQuery", - "title": "XML Tools: Execute XQuery" + "command": "basexTools.executeXQuery", + "title": "BaseX Tools: Execute XQuery" }, { - "command": "xmlTools.formatAsXml", - "title": "XML Tools: Format as XML" + "command": "basexTools.formatAsXml", + "title": "BaseX Tools: Format as XML" }, { - "command": "xmlTools.textToXml", - "title": "XML Tools: Convert text to XML (<> -> <>)" + "command": "basexTools.textToXml", + "title": "BaseX Tools: Convert text to XML (<> -> <>)" }, { - "command": "xmlTools.xmlToText", - "title": "XML Tools: Convert XML to text (<> -> <>)" + "command": "basexTools.xmlToText", + "title": "BaseX Tools: Convert XML to text (<> -> <>)" }, { - "command": "xmlTools.getCurrentXPath", - "title": "XML Tools: Get Current XPath" + "command": "basexTools.getCurrentXPath", + "title": "BaseX Tools: Get Current XPath" }, { - "command": "xmlTools.minifyXml", - "title": "XML Tools: Minify XML" + "command": "basexTools.minifyXml", + "title": "BaseX Tools: Minify XML" } ], "configuration": { "title": "XML Tools Configuration", "type": "object", "properties": { - "xmlTools.enableXmlTreeView": { + "basexTools.enableXmlTreeView": { "type": "boolean", "default": true, "description": "Enables the XML Document view in the explorer for XML documents.", "scope": "window" }, - "xmlTools.enableXmlTreeViewMetadata": { + "basexTools.enableXmlTreeViewMetadata": { "type": "boolean", "default": true, "description": "Enables attribute and child element counts in the XML Document view.", "scope": "window" }, - "xmlTools.enableXmlTreeViewCursorSync": { + "basexTools.enableXmlTreeViewCursorSync": { "type": "boolean", "default": false, "description": "Enables auto-reveal of elements in the XML Document view when a start tag is clicked in the editor.", "scope": "window" }, - "xmlTools.enforcePrettySelfClosingTagOnFormat": { + "basexTools.enforcePrettySelfClosingTagOnFormat": { "type": "boolean", "default": false, "description": "Enforces a space before the forward slash at the end of a self-closing XML tag.", "scope": "resource" }, - "xmlTools.ignoreDefaultNamespace": { + "basexTools.ignoreDefaultNamespace": { "type": "boolean", "default": true, "description": "Ignore default xmlns attributes when evaluating XPath.", "scope": "window" }, - "xmlTools.persistXPathQuery": { + "basexTools.persistXPathQuery": { "type": "boolean", "default": true, "description": "Remember the last XPath query used.", "scope": "window" }, - "xmlTools.removeCommentsOnMinify": { + "basexTools.removeCommentsOnMinify": { "type": "boolean", "default": false, "description": "Remove XML comments during minification.", "scope": "resource" }, - "xmlTools.splitAttributesOnFormat": { + "basexTools.splitAttributesOnFormat": { "type": "boolean", "default": false, - "description": "Put each attribute on a new line when formatting XML. Overrides `xmlTools.splitXmlnsOnFormat` if set to `true`.", + "description": "Put each attribute on a new line when formatting XML. Overrides `basexTools.splitXmlnsOnFormat` if set to `true`.", "scope": "resource" }, - "xmlTools.splitXmlnsOnFormat": { + "basexTools.splitXmlnsOnFormat": { "type": "boolean", "default": true, "description": "Put each xmlns attribute on a new line when formatting XML.", "scope": "resource" }, - "xmlTools.xmlFormatterImplementation": { + "basexTools.xmlFormatterImplementation": { "type": "string", "enum": [ "classic", @@ -143,7 +143,7 @@ "description": "Supported XML Formatters: classic", "scope": "window" }, - "xmlTools.xqueryExecutionArguments": { + "basexTools.xqueryExecutionArguments": { "type": "array", "default": [ "-xquery", @@ -156,19 +156,19 @@ "description": "Arguments to be passed to the XQuery execution engine.", "scope": "window" }, - "xmlTools.xqueryExecutionEngine": { + "basexTools.xqueryExecutionEngine": { "type": "string", "default": "", "description": "The full path to the executable to run when executing XQuery scripts.", "scope": "window" }, - "xmlTools.xqueryExecutionInputLimit": { + "basexTools.xqueryExecutionInputLimit": { "type": "integer", "default": 100, "description": "The maximum number of input files to enumerate when executing XQuery scripts.", "scope": "window" }, - "xmlTools.xqueryExecutionInputSearchPattern": { + "basexTools.xqueryExecutionInputSearchPattern": { "type": "string", "default": "**/*.xml", "description": "The pattern used to search for input XML files when executing XQuery scripts.", @@ -186,11 +186,11 @@ "keybindings": [ { "key": "ctrl+shift+alt+x", - "command": "xmlTools.evaluateXPath" + "command": "basexTools.evaluateXPath" }, { "key": "ctrl+shift+alt+b", - "command": "xmlTools.formatAsXml" + "command": "basexTools.formatAsXml" } ], "languages": [ @@ -225,25 +225,25 @@ "menus": { "commandPalette": [ { - "command": "xmlTools.evaluateXPath", + "command": "basexTools.evaluateXPath", "when": "editorLangId == xml" }, { - "command": "xmlTools.executeXQuery", + "command": "basexTools.executeXQuery", "when": "editorLangId == xquery" }, { - "command": "xmlTools.getCurrentXPath", + "command": "basexTools.getCurrentXPath", "when": "editorLangId == xml" }, { - "command": "xmlTools.minifyXml", + "command": "basexTools.minifyXml", "when": "editorLangId == xml" } ], "editor/context": [ { - "command": "xmlTools.minifyXml", + "command": "basexTools.minifyXml", "group": "1_modification@100", "when": "editorLangId == 'xml'" } @@ -268,18 +268,19 @@ "test": "node ./out/test/runTest.js" }, "devDependencies": { - "@types/vscode": "^1.63.0", "@types/glob": "^7.2.0", "@types/mocha": "^9.0.0", "@types/node": "14.x", + "@types/vscode": "^1.63.0", + "@types/xmldom": "^0.1.13", "@typescript-eslint/eslint-plugin": "^5.9.1", "@typescript-eslint/parser": "^5.9.1", - "@types/xmldom": "^0.1.13", + "@vscode/test-electron": "^2.0.3", + "esbuild": "^0.14.18", "eslint": "^8.6.0", "glob": "^7.2.0", "mocha": "^9.1.3", - "typescript": "^4.5.4", - "@vscode/test-electron": "^2.0.3" + "typescript": "^4.5.4" }, "dependencies": { "xmldom": "^0.1.27", diff --git a/src/common/configuration.ts b/src/common/configuration.ts index b1461d0..c8f141e 100644 --- a/src/common/configuration.ts +++ b/src/common/configuration.ts @@ -1,6 +1,6 @@ import { workspace, Uri } from "vscode"; -const ExtensionTopLevelSection = "xmlTools"; +const ExtensionTopLevelSection = "basexTools"; export class Configuration { static get enableXmlTreeView(): boolean { diff --git a/src/constants.ts b/src/constants.ts index 07d969e..9f08f7a 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,11 +1,11 @@ export namespace commands { - export const evaluateXPath = "xmlTools.evaluateXPath"; - export const executeXQuery = "xmlTools.executeXQuery"; - export const formatAsXml = "xmlTools.formatAsXml"; - export const xmlToText = "xmlTools.xmlToText"; - export const textToXml = "xmlTools.textToXml"; - export const getCurrentXPath = "xmlTools.getCurrentXPath"; - export const minifyXml = "xmlTools.minifyXml"; + export const evaluateXPath = "basexTools.evaluateXPath"; + export const executeXQuery = "basexTools.executeXQuery"; + export const formatAsXml = "basexTools.formatAsXml"; + export const xmlToText = "basexTools.xmlToText"; + export const textToXml = "basexTools.textToXml"; + export const getCurrentXPath = "basexTools.getCurrentXPath"; + export const minifyXml = "basexTools.minifyXml"; } export namespace contextKeys { From a208e502ea3870f02167cfe22d1ff24c77df3853 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Sat, 5 Feb 2022 23:26:27 +0000 Subject: [PATCH 6/7] [add] treat schematron (.sch) as XML --- CHANGELOG.md | 4 +++- package.json | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e0befc..2eeb454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,3 @@ -Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases). \ No newline at end of file +Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases). + +0.0.4 [add] treat schematron (.sch) as XML \ No newline at end of file diff --git a/package.json b/package.json index 56fb62a..4cdfda3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-basex", "displayName": "BaseX tools", "description": "BaseX tools: XQuery, XML, XPath Tools for Visual Studio Code", - "version": "0.0.3", + "version": "0.0.4", "preview": false, "publisher": "quodatum", "author": { @@ -203,7 +203,8 @@ ".xsd", ".xsl", ".plist", - ".mobileconfig" + ".mobileconfig", + ".sch" ] }, { From 560628c7deb356775f5b691375ff8be88e117524 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Sun, 6 Feb 2022 12:51:13 +0000 Subject: [PATCH 7/7] [mod] use esbuild --- .vscodeignore | 9 +++------ LICENSE | 2 +- package.json | 8 ++++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.vscodeignore b/.vscodeignore index ea75c67..af62a43 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -1,8 +1,5 @@ -.vscode/** -.vscode-test/** -out/test/** -out/**/*.map -src/** -.gitignore +node_modules +out/ +src/ tsconfig.json vsc-extension-quickstart.md diff --git a/LICENSE b/LICENSE index db94f28..98ce5d9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Josh Johnson +Copyright (c) 2022 Andy Bunce Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/package.json b/package.json index 4cdfda3..86cc5b7 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-basex", "displayName": "BaseX tools", "description": "BaseX tools: XQuery, XML, XPath Tools for Visual Studio Code", - "version": "0.0.4", + "version": "0.0.6", "preview": false, "publisher": "quodatum", "author": { @@ -261,7 +261,11 @@ } }, "scripts": { - "vscode:prepublish": "npm run compile", + "vscode:prepublish": "npm run esbuild-base -- --minify", + "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node", + "esbuild": "npm run esbuild-base -- --sourcemap", + "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch", + "test-compile": "tsc -p ./", "compile": "tsc -p ./", "watch": "tsc -watch -p ./", "pretest": "npm run compile && npm run lint",