Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use generic debug tracker library #4

Closed
wants to merge 3 commits into from
Closed

Use generic debug tracker library #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c3566f
WiP
thegecko Jan 27, 2023
198a039
Merge branch 'main' into debug-tracker
thegecko Jan 30, 2023
ebfa289
Merge branch 'main' into debug-tracker
thegecko Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"serve": "serve --cors -p 9000"
},
"dependencies": {
"debug-tracker-vscode": "^0.0.12",
"jszip": "^3.10.1",
"node-fetch": "^2.6.7",
"xml2js": "^0.4.23"
Expand Down
5 changes: 2 additions & 3 deletions src/browser/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
*/

import * as vscode from 'vscode';
import { DebugTracker } from 'debug-tracker-vscode';
import { PeripheralTreeProvider } from '../views/peripheral';
import { Commands } from '../commands';
import { DebugTracker } from '../debug-tracker';
import { SvdRegistry } from '../svd-registry';
import { SvdResolver } from '../svd-resolver';

export const activate = async (context: vscode.ExtensionContext): Promise<SvdRegistry> => {
const tracker = new DebugTracker();
const tracker = new DebugTracker(context);
const registry = new SvdRegistry();
const resolver = new SvdResolver(registry);
const peripheralTree = new PeripheralTreeProvider(tracker, resolver);
const commands = new Commands(peripheralTree);

await tracker.activate(context);
await peripheralTree.activate(context);
await commands.activate(context);

Expand Down
37 changes: 0 additions & 37 deletions src/debug-tracker.ts
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions src/desktop/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
*/

import * as vscode from 'vscode';
import { DebugTracker } from 'debug-tracker-vscode';
import { PeripheralTreeProvider } from '../views/peripheral';
import { Commands } from '../commands';
import { DebugTracker } from '../debug-tracker';
import { SvdRegistry } from '../svd-registry';
import { SvdResolver } from '../svd-resolver';

export const activate = async (context: vscode.ExtensionContext): Promise<SvdRegistry> => {
const tracker = new DebugTracker();
const tracker = new DebugTracker(context);
const registry = new SvdRegistry();
const resolver = new SvdResolver(registry);
const peripheralTree = new PeripheralTreeProvider(tracker, resolver);
const commands = new Commands(peripheralTree);

await tracker.activate(context);
await peripheralTree.activate(context);
await commands.activate(context);

Expand Down
22 changes: 18 additions & 4 deletions src/views/peripheral.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@

import * as vscode from 'vscode';
import * as manifest from '../manifest';
import { DebugTracker, DebugSessionStatus } from 'debug-tracker-vscode';
import { parseStringPromise } from 'xml2js';
import { BaseNode, PeripheralBaseNode } from './nodes/basenode';
import { PeripheralNode } from './nodes/peripheralnode';
import { MessageNode } from './nodes/messagenode';
import { NodeSetting } from '../common';
import { SvdData, SVDParser } from '../svd-parser';
import { AddrRange } from '../addrranges';
import { DebugTracker } from '../debug-tracker';
import { SvdResolver } from '../svd-resolver';
import { readFromUrl } from '../utils';
import { uriExists } from '../vscode-utils';
Expand Down Expand Up @@ -253,9 +253,23 @@ export class PeripheralTreeProvider implements vscode.TreeDataProvider<Periphera
protected oldState = new Map <string, vscode.TreeItemCollapsibleState>();

constructor(tracker: DebugTracker, protected resolver: SvdResolver) {
tracker.onWillStartSession(session => this.debugSessionStarted(session));
tracker.onWillStopSession(session => this.debugSessionTerminated(session));
tracker.onDidStopDebug(session => this.debugStopped(session));
tracker.subscribe({
version: 1,
body: {
debuggers: '*',
handler: async event => {
if (event.event === DebugSessionStatus.Initializing && event.session) {
this.debugSessionStarted(event.session);
}
if (event.event === DebugSessionStatus.Terminated && event.session) {
this.debugSessionTerminated(event.session);
}
if (event.event === DebugSessionStatus.Stopped && event.session) {
this.debugStopped(event.session);
}
}
}
});
}

public async activate(context: vscode.ExtensionContext): Promise<void> {
Expand Down
18 changes: 18 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,11 @@
"@typescript-eslint/types" "4.33.0"
eslint-visitor-keys "^2.0.0"

"@vscode/debugprotocol@^1.57.0":
version "1.58.0"
resolved "https://registry.yarnpkg.com/@vscode/debugprotocol/-/debugprotocol-1.58.0.tgz#3416047d72103784daebab27b3834481e2960598"
integrity sha512-64gY3PdU7jmYDwLRJFZ5XL2BC8TK5mdhZ60XLTZn17yfbJPKCcmFDuQAkVfOPsjn7o4f6YWFy3AXSR0V9gY6jA==

"@vscode/test-web@^0.0.24":
version "0.0.24"
resolved "https://registry.yarnpkg.com/@vscode/test-web/-/test-web-0.0.24.tgz#ee9a9249895b5c29f8352e1b13ee01193a795cf8"
Expand Down Expand Up @@ -993,6 +998,14 @@ css-what@^5.0.1, css-what@^5.1.0:
resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==

debug-tracker-vscode@^0.0.12:
version "0.0.12"
resolved "https://registry.yarnpkg.com/debug-tracker-vscode/-/debug-tracker-vscode-0.0.12.tgz#5fef569cd1cdc1a4d4d36512d271081449529b3d"
integrity sha512-PhkWkBgO2z+0M3uuVG/UallZGxKiJ6IDAc0F/DvA6lmsUdn8/RhvudmKN9sVh17nKXPgM9q2kcDzZ5VX2aEwQA==
dependencies:
"@vscode/debugprotocol" "^1.57.0"
pure-uuid "^1.6.2"

debug@2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
Expand Down Expand Up @@ -2586,6 +2599,11 @@ punycode@^2.1.0:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==

pure-uuid@^1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/pure-uuid/-/pure-uuid-1.6.2.tgz#64f3032d54953b93b0585be3263a2629f1d60a04"
integrity sha512-WQ4xz74ApW6s0BToRuuyuMo9g0VHx1HljY0H2gPng+mqqz/K1yLj7sHZonZZQ2++WfHl/ZzruilWvuz+WtmxjQ==

qs@^6.9.1:
version "6.10.3"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
Expand Down