Skip to content

Commit

Permalink
Update dependencies and cdt-gdb-adapter
Browse files Browse the repository at this point in the history
  • Loading branch information
@thegecko
thegecko committed Dec 6, 2019
1 parent fdc2ae1 commit 80a3f55
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 59 deletions.
14 changes: 7 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"lint": "tslint --fix --project tsconfig.json"
},
"dependencies": {
"cdt-gdb-adapter": "0.0.14-next.5638382.0",
"vscode-debugadapter": "^1.26.0",
"vscode-debugprotocol": "^1.26.0"
"@types/node": "^12.12.14",
"cdt-gdb-adapter": "0.0.14-next.921da89.0",
"vscode-debugadapter": "^1.37.0",
"vscode-debugprotocol": "^1.37.0"
},
"devDependencies": {
"@types/node": "~10.3.6",
"tslint": "^5.9.1",
"tslint-eslint-rules": "^4.1.1",
"typescript": "^3.1.6"
"tslint": "^5.20.1",
"tslint-eslint-rules": "^5.4.0",
"typescript": "^3.7.3"
},
"bundledDependencies": [
"cdt-gdb-adapter"
Expand Down
5 changes: 2 additions & 3 deletions src/cmsis-debug-session.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import { CmsisBackend } from './cmsis-backend';
import { PyocdServer } from './pyocd-server';
import { PortScanner } from './port-scanner';
import { SymbolTable } from './symbols';
import * as varMgr from 'cdt-gdb-adapter/dist/varManager';
import * as mi from './mi';

export interface CmsisRequestArguments extends RequestArguments {
Expand Down Expand Up @@ -301,7 +300,7 @@ export class CmsisDebugSession extends GDBDebugSession {
}

private async getVariables(frame: FrameReference, name: string, expression: string, depth: number): Promise<DebugProtocol.Variable> {
let global = varMgr.getVar(frame.frameId, frame.threadId, depth, name);
let global = this.gdb.varManager.getVar(frame.frameId, frame.threadId, depth, name);

if (global) {
// Update value if it is already loaded
Expand All @@ -318,7 +317,7 @@ export class CmsisDebugSession extends GDBDebugSession {
expression,
});

global = varMgr.addVar(frame.frameId, frame.threadId, depth, name, true, false, varCreateResponse);
global = this.gdb.varManager.addVar(frame.frameId, frame.threadId, depth, name, true, false, varCreateResponse);
}

return {
Expand Down
92 changes: 43 additions & 49 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
esutils "^2.0.2"
js-tokens "^4.0.0"

"@types/node@~10.3.6":
version "10.3.6"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.6.tgz#ea8aab9439b59f40d19ec5f13b44642344872b11"
integrity sha512-h7VDRFL8IhdPw1JjiNVvhr+WynfKW09q2BOflIOA0yeuXNeXBP1bIRuBrysSryH4keaJ5bYUNp63aIyQL9YpDQ==
"@types/node@^12.12.14":
version "12.12.14"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==

ansi-styles@^3.2.1:
version "3.2.1"
Expand Down Expand Up @@ -55,10 +55,10 @@ builtin-modules@^1.1.1:
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=

cdt-gdb-adapter@0.0.14-next.5638382.0:
version "0.0.14-next.5638382.0"
resolved "https://registry.yarnpkg.com/cdt-gdb-adapter/-/cdt-gdb-adapter-0.0.14-next.5638382.0.tgz#43454b7907edde5cbb7bab575d23ed1a6d032f54"
integrity sha512-tci+ng6XA0zXWw4C+ML8q2FoiDR//QwF5OBrwNd8HUbYnLTF6SqOILuzHcFijRT/D0ajrIXFHWy5Krgm9zhxPQ==
cdt-gdb-adapter@0.0.14-next.921da89.0:
version "0.0.14-next.921da89.0"
resolved "https://registry.yarnpkg.com/cdt-gdb-adapter/-/cdt-gdb-adapter-0.0.14-next.921da89.0.tgz#c070bc24cb41d0cefda490686917ed8c5c8f82dc"
integrity sha512-AMRpWY2/UgiW1Sntay9DRU+o0pPr1SN7hFnSqhzp8fTIK54Poyz/uxa82TSEvAH5wC5u3/cmNb0ANhYj1f7NJQ==
dependencies:
node-addon-api "^1.6.2"
vscode-debugadapter "^1.37.1"
Expand Down Expand Up @@ -95,12 +95,12 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=

diff@^3.2.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
diff@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==

doctrine@^0.7.2:
doctrine@0.7.2:
version "0.7.2"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=
Expand Down Expand Up @@ -246,30 +246,35 @@ supports-color@^5.3.0:
dependencies:
has-flag "^3.0.0"

tslib@^1.0.0, tslib@^1.8.0, tslib@^1.8.1:
tslib@1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==

tslib@^1.8.0, tslib@^1.8.1:
version "1.10.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==

tslint-eslint-rules@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba"
integrity sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=
tslint-eslint-rules@^5.4.0:
version "5.4.0"
resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz#e488cc9181bf193fe5cd7bfca213a7695f1737b5"
integrity sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==
dependencies:
doctrine "^0.7.2"
tslib "^1.0.0"
tsutils "^1.4.0"

tslint@^5.9.1:
version "5.18.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.18.0.tgz#f61a6ddcf372344ac5e41708095bbf043a147ac6"
integrity sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==
doctrine "0.7.2"
tslib "1.9.0"
tsutils "^3.0.0"

tslint@^5.20.1:
version "5.20.1"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d"
integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==
dependencies:
"@babel/code-frame" "^7.0.0"
builtin-modules "^1.1.1"
chalk "^2.3.0"
commander "^2.12.1"
diff "^3.2.0"
diff "^4.0.1"
glob "^7.1.1"
js-yaml "^3.13.1"
minimatch "^3.0.4"
Expand All @@ -279,44 +284,33 @@ tslint@^5.9.1:
tslib "^1.8.0"
tsutils "^2.29.0"

tsutils@^1.4.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
integrity sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=

tsutils@^2.29.0:
version "2.29.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
dependencies:
tslib "^1.8.1"

typescript@^3.1.6:
version "3.5.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==

vscode-debugadapter@^1.26.0:
version "1.35.0"
resolved "https://registry.yarnpkg.com/vscode-debugadapter/-/vscode-debugadapter-1.35.0.tgz#d16dc32e93920a26ec5d6fe2330ba283600bcddb"
integrity sha512-Au90Iowj6TuD5uDMaTnxOjl/9hQN0Yoky1TV1Cjjr7jPdxTQpALBRW09Y2LzkIXUVICXlAqxWL9zL8BpzI30jg==
tsutils@^3.0.0:
version "3.17.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
dependencies:
mkdirp "^0.5.1"
vscode-debugprotocol "1.35.0"
tslib "^1.8.1"

vscode-debugadapter@^1.37.1:
typescript@^3.7.3:
version "3.7.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69"
integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==

vscode-debugadapter@^1.37.0, vscode-debugadapter@^1.37.1:
version "1.37.1"
resolved "https://registry.yarnpkg.com/vscode-debugadapter/-/vscode-debugadapter-1.37.1.tgz#7d7076e64e9786fe4fcb0c156e1ed24184a9fb2b"
integrity sha512-g/xNsUdkrd0DifaoRJ4+wypSMsMbK47fGpetpmIOnOQiDFjtYKvqxsgyUZ4BOj2jKP2Xa40B4YXfUUJpqreWJg==
dependencies:
mkdirp "^0.5.1"
vscode-debugprotocol "1.37.0"

vscode-debugprotocol@1.35.0, vscode-debugprotocol@^1.26.0:
version "1.35.0"
resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.35.0.tgz#565140cd42945e30c6c85cafb38c631457d4a46c"
integrity sha512-+OMm11R1bGYbpIJ5eQIkwoDGFF4GvBz3Ztl6/VM+/RNNb2Gjk2c0Ku+oMmfhlTmTlPCpgHBsH4JqVCbUYhu5bA==

vscode-debugprotocol@1.37.0, vscode-debugprotocol@^1.37.0:
version "1.37.0"
resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.37.0.tgz#e8c4694a078d18ea1a639553a7a241b35c1e6f6d"
Expand Down

0 comments on commit 80a3f55

Please sign in to comment.