From 26e5dba252f4908e60ebfecbb01d02600554a40a Mon Sep 17 00:00:00 2001 From: Mark Wiemer <7833360+mark-wiemer@users.noreply.github.com> Date: Sun, 21 Feb 2021 16:15:09 -0800 Subject: [PATCH] Hotfix 2.7.0 (#53) - Some pre-release fixes. No feature changes or bugfixes. --- demos/demo_for_ahk_v2.ahk | 94 ++++++++++++++--------------- package-lock.json | 22 +++---- package.json | 6 +- src/debugger/struct/dbgpResponse.ts | 2 +- src/providers/ahkHoverProvider.ts | 2 +- tsconfig.json | 4 +- 6 files changed, 65 insertions(+), 65 deletions(-) diff --git a/demos/demo_for_ahk_v2.ahk b/demos/demo_for_ahk_v2.ahk index b481b1ed..1f229212 100644 --- a/demos/demo_for_ahk_v2.ahk +++ b/demos/demo_for_ahk_v2.ahk @@ -4,59 +4,59 @@ function() return function() { - globalVar := "Local" - SuperGlobalVar := "Local" - bool := true - str := "string" - if (str == "str") { - MsgBox("Overwrite primitive variable!") - } - str_multiline := " - (LTrim - line 1 - line 2 - line 3 - )" - int := 123 - float := 123.456 + globalVar := "Local" + SuperGlobalVar := "Local" + bool := true + str := "string" + if (str == "str") { + MsgBox("Overwrite primitive variable!") + } + str_multiline := " + (LTrim + line 1 + line 2 + line 3 + )" + int := 123 + float := 123.456 - emptyArray := [] - smallArray := [1, 2, { str: "string" }] + emptyArray := [] + smallArray := [1, 2, { str: "string" }] sparseArray := { 1: 1, 3: 3 } - arrayLike := { 1: 1, 2: 2, 3: 3, length: 3 } - bigArray := [] - Loop 150 { - bigArray.push(A_Index) - } - if (bigArray == "str") { - MsgBox("Overwrite object variable!") - } + arrayLike := { 1: 1, 2: 2, 3: 3, length: 3 } + bigArray := [] + Loop 150 { + bigArray.push(A_Index) + } + if (bigArray == "str") { + MsgBox("Overwrite object variable!") + } - obj := { str: str, int: int, float: float } - objobj := { str: str, obj: obj } - objobjobj := { str: str, int: int, obj: { str: str, obj: obj } } + obj := { str: str, int: int, float: float } + objobj := { str: str, obj: obj } + objobjobj := { str: str, int: int, obj: { str: str, obj: obj } } - circular := {} - circular.circular := circular - instance := Cls.new() + circular := {} + circular.circular := circular + instance := Cls.new() - enum := obj.ownProps() + enum := obj.ownProps() } class Cls { - str := "string" - num := 123 - static obj := { str: "string", num: 123 } - propertyName[] { - set { - this.propertyName_ := value - } - get { - return this.propertyName_ - } - } - method() { - } - static staticMethod() { - } + str := "string" + num := 123 + static obj := { str: "string", num: 123 } + propertyName[] { + set { + this.propertyName_ := value + } + get { + return this.propertyName_ + } + } + method() { + } + static staticMethod() { + } } diff --git a/package-lock.json b/package-lock.json index d81aab0d..ac63a086 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,9 +68,9 @@ "dev": true }, "@types/node": { - "version": "8.10.66", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz", - "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==", + "version": "14.14.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz", + "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==", "dev": true }, "@types/vscode": { @@ -1226,18 +1226,18 @@ "dev": true }, "vscode-debugadapter": { - "version": "1.40.0-pre.1", - "resolved": "https://registry.npmjs.org/vscode-debugadapter/-/vscode-debugadapter-1.40.0-pre.1.tgz", - "integrity": "sha512-TdipTiDHfg3/4bXJOSG+mSKWqFARZ7TwQLNEdIvenbwppdjJ1t5VOfhHNQ0l5kkxx8Xs29iK1Yf7uPEXu+2nqg==", + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/vscode-debugadapter/-/vscode-debugadapter-1.44.0.tgz", + "integrity": "sha512-cOYQiDLAdq64rKP1KYcEr7NOlOcNFv13NcW6fCnknX3RR5MKveORKPjgOFFV4HMp04kJ4GtjLm1PFxcrYgg9ZQ==", "requires": { - "mkdirp": "^0.5.1", - "vscode-debugprotocol": "1.40.0-pre.0" + "mkdirp": "^0.5.5", + "vscode-debugprotocol": "1.44.0" } }, "vscode-debugprotocol": { - "version": "1.40.0-pre.0", - "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.40.0-pre.0.tgz", - "integrity": "sha512-2ghen3Pcnxrw2+ZK0HuG/NQqhT0lAHfZodLQinBMWNbApucKva4jjTfUUoU69m39O46J0ENdVQeFTAL2oyy6Zg==" + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.44.0.tgz", + "integrity": "sha512-qf+eBnrDyR2MpP08y1JfzJnFZGHdkk86+SRGRp0XepDGNA6n/Nann5XhtAzdGX/yaZokjTAINK313S2yYhHoPQ==" }, "vscode-test": { "version": "1.5.1", diff --git a/package.json b/package.json index aaafe908..9189fba6 100644 --- a/package.json +++ b/package.json @@ -266,15 +266,15 @@ }, "dependencies": { "get-port": "^5.1.1", - "vscode-debugadapter": "1.40.0-pre.1", + "vscode-debugadapter": "^1.44.0", "xml2js": "^0.4.23" }, "devDependencies": { "@types/fs-extra": "^9.0.7", "@types/glob": "^7.1.3", "@types/mocha": "^8.2.1", - "@types/node": "^8.10.66", - "@types/vscode": "^1.53.0", + "@types/node": "^14.14.31", + "@types/vscode": "^1.30.0", "fs-extra": "^9.1.0", "glob": "^7.1.6", "mocha": "^8.3.0", diff --git a/src/debugger/struct/dbgpResponse.ts b/src/debugger/struct/dbgpResponse.ts index ebe8de98..08493d02 100644 --- a/src/debugger/struct/dbgpResponse.ts +++ b/src/debugger/struct/dbgpResponse.ts @@ -35,7 +35,7 @@ export interface DbgpProperty { pagesize?: string; children?: string; numchildren?: string; - encoding?: string; + encoding?: BufferEncoding; }; content?: string; property?: DbgpProperty | DbgpProperty[]; diff --git a/src/providers/ahkHoverProvider.ts b/src/providers/ahkHoverProvider.ts index 2dc25e76..60b3364d 100644 --- a/src/providers/ahkHoverProvider.ts +++ b/src/providers/ahkHoverProvider.ts @@ -108,7 +108,7 @@ export class AhkHoverProvider implements HoverProvider { const ahk = JSON.parse( readFileSync( join(context.extensionPath, 'snippets', 'ahk.json'), - 'UTF8', + 'utf8', ), ); this.snippetCache = new Map(); diff --git a/tsconfig.json b/tsconfig.json index 6a08fc86..a7e9e078 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,9 +1,9 @@ { "compilerOptions": { "module": "commonjs", - "target": "es6", + "target": "es2016", "outDir": "out", - "lib": ["es6"], + "lib": ["es2016"], "sourceMap": true, "rootDir": "src" },