Fix tests, implement CR

OfekShilon · Jul 13, 2024 · 18a8218 · 18a8218
1 parent b472256
commit 18a8218
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/lib/demangler/base.ts b/lib/demangler/base.ts
@@ -181,10 +181,12 @@ export class BaseDemangler extends AsmRegex {
                 asm.text = newText;
                 // We try to represent in labels.ranges the exact modifications done by replaceAll,
                 // but replaceAll sometimes modifies substrings not recognized as labels :(
-                for (const label of asm.labels!) {
-                    if (mapRanges[label.range.startCol])
-                        label.range = mapRanges[label.range.startCol][label.range.endCol] || label.range;
-                    label.name = mapNames[label.name] || label.name;
+                if (asm.labels) {
+                    for (const label of asm.labels) {
+                        if (mapRanges[label.range.startCol])
+                            label.range = mapRanges[label.range.startCol][label.range.endCol] || label.range;
+                        label.name = mapNames[label.name] || label.name;
+                    }
                 }
             }
 

diff --git a/lib/demangler/prefix-tree.ts b/lib/demangler/prefix-tree.ts
@@ -42,6 +42,12 @@ type charRange = {
     endCol: number;
 };
 
+export type replaceAction = {
+    newText: string;
+    mapRanges: Record<number, Record<number, charRange>>;
+    mapNames: Record<string, string>;
+};
+
 export class PrefixTree {
     root: Node = [];
 
@@ -91,11 +97,7 @@ export class PrefixTree {
     }
 
     // Replace all matches (longest match first) in a line.
-    replaceAll(line: string): {
-        newText: string;
-        mapRanges: Record<number, Record<number, charRange>>;
-        mapNames: Record<string, string>;
-    } {
+    replaceAll(line: string): replaceAction {
         let newText = '';
         let idxInOld = 0;
         let idxInNew = 0;

diff --git a/test/demangler-tests.ts b/test/demangler-tests.ts
@@ -354,27 +354,27 @@ describe('Demangler prefix tree', () => {
     replacements.add('aa', 'long_a');
     replacements.add('aa_shouldnotmatch', 'ERROR');
     it('should replace a short match', () => {
-        expect(replacements.replaceAll('a')).toEqual('short_a');
+        expect(replacements.replaceAll('a').newText).toEqual('short_a');
     });
     it('should replace using the longest match', () => {
-        expect(replacements.replaceAll('aa')).toEqual('long_a');
+        expect(replacements.replaceAll('aa').newText).toEqual('long_a');
     });
     it('should replace using both', () => {
-        expect(replacements.replaceAll('aaa')).toEqual('long_ashort_a');
+        expect(replacements.replaceAll('aaa').newText).toEqual('long_ashort_a');
     });
     it('should replace using both', () => {
-        expect(replacements.replaceAll('a aa a aa')).toEqual('short_a long_a short_a long_a');
+        expect(replacements.replaceAll('a aa a aa').newText).toEqual('short_a long_a short_a long_a');
     });
     it('should work with empty replacements', () => {
-        expect(new PrefixTree([]).replaceAll('Testing 123')).toEqual('Testing 123');
+        expect(new PrefixTree([]).replaceAll('Testing 123').newText).toEqual('Testing 123');
     });
     it('should leave unmatching text alone', () => {
-        expect(replacements.replaceAll('Some text with none of the first letter of the ordered letter list')).toEqual(
-            'Some text with none of the first letter of the ordered letter list',
-        );
+        expect(
+            replacements.replaceAll('Some text with none of the first letter of the ordered letter list').newText,
+        ).toEqual('Some text with none of the first letter of the ordered letter list');
     });
     it('should handle a mixture', () => {
-        expect(replacements.replaceAll('Everyone loves an aardvark')).toEqual(
+        expect(replacements.replaceAll('Everyone loves an aardvark').newText).toEqual(
             'Everyone loves short_an long_ardvshort_ark',
         );
     });