Changed standard inclusion data type

Author: LeBoufty

packages/cli/src/languagePlugins/c/dependencyFormatting/index.ts

@@ -58,12 +58,9 @@ export class CDependencyFormatter {
     return dependencies;
   }
 
-  #formatStandardIncludes(
-    stdincludes: Parser.SyntaxNode[],
-  ): Record<string, CDependency> {
+  #formatStandardIncludes(stdincludes: string[]): Record<string, CDependency> {
     const dependencies: Record<string, CDependency> = {};
-    for (const include of stdincludes) {
-      const id = include.childForFieldName("path").text;
+    for (const id of stdincludes) {
       if (!dependencies[id]) {
         dependencies[id] = {
           id: id,
@@ -114,7 +111,7 @@ export class CDependencyFormatter {
     const fileDependencies =
       this.invocationResolver.getInvocationsForFile(filepath);
     const includes = this.includeResolver.getInclusions().get(filepath);
-    const stdincludes = includes.standard;
+    const stdincludes = Array.from(includes.standard.keys());
     const invokedDependencies = this.#formatDependencies(fileDependencies);
     const stdDependencies = this.#formatStandardIncludes(stdincludes);
     const allDependencies = {

packages/cli/src/languagePlugins/c/includeResolver/index.test.ts

@@ -21,8 +21,8 @@ describe("CIncludeResolver", () => {
     expect(bhinclusions.filepath).toBe(burgersh);
     expect(bhinclusions.symbols.size).toBe(0);
     expect(bhinclusions.internal.length).toBe(0);
-    expect(bhinclusions.standard.length).toBe(1);
-    expect(bhinclusions.standard[0].text.trim()).toBe("#include <stdbool.h>");
+    expect(bhinclusions.standard.size).toBe(1);
+    expect(Array.from(bhinclusions.standard.keys())[0]).toBe("<stdbool.h>");
   });
 
   test("resolves inclusions for burgers.c", () => {
@@ -34,11 +34,11 @@ describe("CIncludeResolver", () => {
     expect(bcinclusions.symbols.size).toBe(16);
     expect(bcinclusions.internal.length).toBe(1);
     expect(bcinclusions.internal[0]).toBe("burgers.h");
-    expect(bcinclusions.standard.length).toBe(3);
-    const stdincludes = bcinclusions.standard.map((node) => node.text.trim());
-    expect(stdincludes).toContain("#include <stdio.h>");
-    expect(stdincludes).toContain("#include <stdlib.h>");
-    expect(stdincludes).toContain("#include <string.h>");
+    expect(bcinclusions.standard.size).toBe(4);
+    const stdincludes = Array.from(bcinclusions.standard.keys());
+    expect(stdincludes).toContain("<stdio.h>");
+    expect(stdincludes).toContain("<stdlib.h>");
+    expect(stdincludes).toContain("<string.h>");
   });
 
   test("resolves inclusions for main.c", () => {
@@ -51,8 +51,8 @@ describe("CIncludeResolver", () => {
     expect(maininclusions.internal.length).toBe(2);
     expect(maininclusions.internal).toContain("burgers.h");
     expect(maininclusions.internal).toContain("personnel.h");
-    expect(maininclusions.standard.length).toBe(1);
-    const stdincludes = maininclusions.standard.map((node) => node.text.trim());
-    expect(stdincludes).toContain("#include <stdio.h>");
+    expect(maininclusions.standard.size).toBe(2);
+    const stdincludes = Array.from(maininclusions.standard.keys());
+    expect(stdincludes).toContain("<stdio.h>");
   });
 });

packages/cli/src/languagePlugins/c/includeResolver/index.ts

@@ -46,7 +46,7 @@ export class CIncludeResolver {
       filepath: file.path,
       symbols: new Map(),
       internal: [],
-      standard: [],
+      standard: new Map(),
     };
 
     // Add the current file to the visited set to prevent infinite recursion
@@ -75,12 +75,17 @@ export class CIncludeResolver {
           inclusions.symbols.set(name, symbol);
         }
         inclusions.internal.push(...nestedInclusions.internal);
-        inclusions.standard.push(...nestedInclusions.standard);
+        for (const node of nestedInclusions.standard) {
+          inclusions.standard.set(node[0], node[1]);
+        }
       }
     }
 
     for (const node of standardIncludeNodes) {
-      inclusions.standard.push(node.node);
+      inclusions.standard.set(
+        node.node.childForFieldName("path").text,
+        node.node,
+      );
     }
 
     return inclusions;

packages/cli/src/languagePlugins/c/includeResolver/types.ts

@@ -10,5 +10,5 @@ export interface Inclusions {
   /** The list of the paths of the internal imports */
   internal: string[];
   /** The list of include directives of the standard imports */
-  standard: Parser.SyntaxNode[];
+  standard: Map<string, Parser.SyntaxNode>;
 }