Fix trailofbits#40

aviggiano · Oct 31, 2024 · 3b19824 · 3b19824
1 parent 6a66dcf
commit 3b19824
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "weaudit",
     "displayName": "weAudit",
     "description": "Bookmark findings and quickly navigate to areas of interest in the codebase",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "publisher": "trailofbits",
     "author": "Trail of Bits",
     "categories": [],

diff --git a/src/codeMarker.ts b/src/codeMarker.ts
@@ -3396,7 +3396,11 @@ export class CodeMarker implements vscode.TreeDataProvider<TreeEntry> {
         const otherNoteDecorations: vscode.Range[] = [];
         const labelDecorations: vscode.DecorationOptions[] = [];
 
-        for (const treeItem of this.treeEntries) {
+        const sortedTreeEntries = this.treeEntries.sort((a, b) =>
+            a.entryType === b.entryType ? a.label.localeCompare(b.label) : a.entryType === EntryType.Finding ? -1 : 1,
+        );
+
+        for (const treeItem of sortedTreeEntries) {
             const isOwnEntry = this.username === treeItem.author;
             const findingDecoration = isOwnEntry ? ownDecorations : otherDecorations;
             const noteDecoration = isOwnEntry ? ownNoteDecorations : otherNoteDecorations;