From 52237c8267d1f1dc5ed01fbbdac3587fed7e0046 Mon Sep 17 00:00:00 2001 From: andy bunce Date: Thu, 6 Oct 2022 11:42:28 +0100 Subject: [PATCH] [mod] v0.0.63 --- .vscodeignore | 3 ++- azure-pipelines.yml | 32 -------------------------------- package-lock.json | 18 +++++++++--------- package.json | 6 +++--- src/@quodatum/xqlint.d.ts | 9 ++++++++- src/CHANGELOG.md | 2 ++ src/symbols/symbols.ts | 4 +++- 7 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 azure-pipelines.yml diff --git a/.vscodeignore b/.vscodeignore index 87e0e06..91cee3d 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -1,6 +1,7 @@ +node_modules +#out/ src/ tsconfig.json -vsc-extension-quickstart.md .github .gitignore .vscode diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index b9a640a..0000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: "$(Build.SourceBranchName)-$(Build.SourceVersion)$(Rev:.r)" -pr: - - master - -trigger: - - "refs/tags/*" - -pool: - vmImage: "windows-2019" - -steps: -- task: NodeTool@0 - inputs: - versionSpec: "10.x" - displayName: "Install NodeJS" - -- script: | - npm install -g vsce - displayName: "Install VSCE" - -- script: | - npm install - displayName: "NPM Install" - -- script: | - vsce package --out "$(Build.ArtifactStagingDirectory)/xml-$(Build.SourceBranchName)-$(Build.SourceVersion).vsix" - displayName: "VSCE Package" - -- task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: drop diff --git a/package-lock.json b/package-lock.json index 960680c..12c00d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "vscode-basex", - "version": "0.0.58", + "version": "0.0.62", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-basex", - "version": "0.0.58", + "version": "0.0.62", "license": "MIT", "dependencies": { - "@quodatum/xqlint": "^0.0.14", + "@quodatum/xqlint": "^0.0.17", "@xmldom/xmldom": "^0.8.1", "xpath": "0.0.32" }, @@ -150,9 +150,9 @@ } }, "node_modules/@quodatum/xqlint": { - "version": "0.0.14", - "resolved": "https://registry.npmjs.org/@quodatum/xqlint/-/xqlint-0.0.14.tgz", - "integrity": "sha512-ZNvcro3WQvozo7ZTTBWQJg/DinhJ/VYNrs8++oK0H4IjiwOH/AR8gH8vM4wjsTJUL11LyoU54k2KoEvq/xqPdw==", + "version": "0.0.17", + "resolved": "https://registry.npmjs.org/@quodatum/xqlint/-/xqlint-0.0.17.tgz", + "integrity": "sha512-BmqFgnG1J+T6oQYnBGZiRoMOxN4JCNYP1Oq07w1xtIMA+VF9PYiMOV+foFqQMSo1NdBU3NHHySkZPPvn3CHoYA==", "dependencies": { "colors": "1.4.0", "commander": "~2.3.0", @@ -3626,9 +3626,9 @@ } }, "@quodatum/xqlint": { - "version": "0.0.14", - "resolved": "https://registry.npmjs.org/@quodatum/xqlint/-/xqlint-0.0.14.tgz", - "integrity": "sha512-ZNvcro3WQvozo7ZTTBWQJg/DinhJ/VYNrs8++oK0H4IjiwOH/AR8gH8vM4wjsTJUL11LyoU54k2KoEvq/xqPdw==", + "version": "0.0.17", + "resolved": "https://registry.npmjs.org/@quodatum/xqlint/-/xqlint-0.0.17.tgz", + "integrity": "sha512-BmqFgnG1J+T6oQYnBGZiRoMOxN4JCNYP1Oq07w1xtIMA+VF9PYiMOV+foFqQMSo1NdBU3NHHySkZPPvn3CHoYA==", "requires": { "colors": "1.4.0", "commander": "~2.3.0", diff --git a/package.json b/package.json index 0c3d392..6dd526f 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.58", + "version": "0.0.63", "preview": true, "publisher": "quodatum", "author": "Andy Bunce (https://github.com/Quodatum)", @@ -41,7 +41,7 @@ "onLanguage:xquery", "onLanguage:xsl" ], - "main": "./out/extension", + "main": "./out/extension.js", "contributes": { "commands": [ { @@ -316,7 +316,7 @@ "typescript": "^4.7.3" }, "dependencies": { - "@quodatum/xqlint": "^0.0.14", + "@quodatum/xqlint": "^0.0.17", "@xmldom/xmldom": "^0.8.1", "xpath": "0.0.32" } diff --git a/src/@quodatum/xqlint.d.ts b/src/@quodatum/xqlint.d.ts index 0599546..087041e 100644 --- a/src/@quodatum/xqlint.d.ts +++ b/src/@quodatum/xqlint.d.ts @@ -1,7 +1,14 @@ declare module '@quodatum/xqlint'{ export class XQLint{ constructor(source :string, opts? :object); - public getCompletions(pos :object): [object]; + public getCompletions(pos :object): [object]; + public getXQDoc() :XQdoc; + } + export class XQDoc{ + moduleNamespace: string; + description: string; + variables: [object]; + functions: [object]; } export function XQueryLexer() :any; export function createStaticContext(processor :string) :any; diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md index fd3310f..fa8a961 100644 --- a/src/CHANGELOG.md +++ b/src/CHANGELOG.md @@ -1,3 +1,5 @@ +# 0.0.58 +* use xqlint 0.0.14 # 0.0.48 * Fix xmlToText #6 * FIX outline all vars diff --git a/src/symbols/symbols.ts b/src/symbols/symbols.ts index d1c2485..ffc655e 100644 --- a/src/symbols/symbols.ts +++ b/src/symbols/symbols.ts @@ -32,7 +32,7 @@ export class Symbols implements DocumentSymbolProvider { channel.log("Symbols: " + document.uri); const symbols: DocumentSymbol[] = []; const text = document.getText(); - const linter = new (XQLint as any)(text, { "styleCheck": false }); + const linter = new XQLint(text, { "styleCheck": false }); const xqdoc = linter.getXQDoc(); channel.log("got xqdoc"); @@ -44,6 +44,7 @@ export class Symbols implements DocumentSymbolProvider { xqdoc.variables.forEach(function (v: VarType): void { const name = "$" + v.name; const description="about this variable, some doc here"; + channel.log(name + v); const info = makeSymbol(name, description, SymbolKind.Variable, v.pos); symbols.push(info); }); @@ -51,6 +52,7 @@ export class Symbols implements DocumentSymbolProvider { xqdoc.functions.forEach(function (f: FunType) { const name = f.name + "#" + f.params.length; const description="about this function, some doc here"; + channel.log(name + f); const info = makeSymbol(name, description, SymbolKind.Function, f.pos); // info.children=[]; // f.params.forEach(function(paramName: string){